neu

2020-03-12 14:49:31 +01:00
parent f4c1a74870
commit cc28d5a6cf
197 changed files with 37402 additions and 4503 deletions
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -32,6 +32,7 @@ Public Class KdSearchBox
    Public Property dgvpos As String = "LEFT"
    Public Property _autoSizeGross As Boolean = False
    Public Property _AlleFirmenCLUSTER As Boolean = False
+    Public Property _UseFIRMA As String = ""

    Public usrcntlWIDTH = 600
    Public usrcntlHEIGHT = 380
@@ -278,7 +279,7 @@ Public Class KdSearchBox
                    AvisoEmail = ", (SELECT CASE WHEN Count(*)>0 Then 'JA' ELSE '' END [Adressen] FROM [tblEmailBenachrichtigung] WHERE [eb_KundenNr]=AdressenNr) as [E-Mail] "
                End If
                Dim SQLstr As String = " SELECT top " & topAnz & " Ordnungsbegriff as Firma, AdressenNr as KdNr,Adressen.[LandKz] + ' ' + Adressen.[PLZ] + ' - ' + Adressen.[Ort] + ' ' + Adressen.[Straße] as Adresse " & AvisoEmail & "    "
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or _AlleFirmenCLUSTER Then SQLstr &= ",  Filialen.Firma as Firma_Intern "
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or _AlleFirmenCLUSTER Or _UseFIRMA <> "" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then SQLstr &= ",  Filialen.Firma as Firma_Intern "
                SQLstr &= " FROM [Adressen] "
                SQLstr &= "  INNER JOIN Kunden on KundenNr=AdressenNr  "
                SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
@@ -295,8 +296,14 @@ Public Class KdSearchBox

                If _AlleFirmenCLUSTER Then
                    SQLstr &= "  AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                ElseIf _UseFIRMA <> "" Then
+                    SQLstr &= "  AND '" & _UseFIRMA & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
                Else
-                    SQLstr &= "  AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                    SQLstr &= "  AND ( '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                    If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then
+                        SQLstr &= "  OR  Filialen.Firma IN ('IMEX') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                    End If
+                    SQLstr &= "  ) "
                End If


@@ -339,7 +346,7 @@ Public Class KdSearchBox
                If srch2.StartsWith("*") Then srch2 = Replace(srch2, "*", "%", , 1) ' Suche mit beginnenden *

                Dim SQLstr As String = " SELECT top 4 Ordnungsbegriff as Firma, AdressenNr as KdNr,Adressen.[LandKz] + ' ' + Adressen.[PLZ] + ' - ' + Adressen.[Ort] + ' ' + Adressen.[Straße] as Adresse   "
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or _AlleFirmenCLUSTER Then SQLstr &= ",  Filialen.Firma as Firma_Intern  "
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or _AlleFirmenCLUSTER Or _UseFIRMA <> "" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then SQLstr &= ",  Filialen.Firma as Firma_Intern  "
                SQLstr &= " FROM [Adressen] "
                SQLstr &= "  INNER JOIN Kunden on KundenNr=AdressenNr  "
                SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
@@ -362,12 +369,21 @@ Public Class KdSearchBox
                '    SQLstr &= "  AND Filialen.Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  "
                'End If

+
                If _AlleFirmenCLUSTER Then
                    SQLstr &= "  AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                ElseIf _UseFIRMA <> "" Then
+                    SQLstr &= "  AND '" & _UseFIRMA & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
                Else
-                    SQLstr &= "  AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                    SQLstr &= "  AND ( '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                    If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then
+                        SQLstr &= "  OR  Filialen.Firma IN ('IMEX') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                    End If
+                    SQLstr &= "  ) "
                End If

+
+
                If Not _displayWoelflKd Then SQLstr &= "  AND AdressenNr NOT LIKE '15%'"
                SQLstr &= " order by Ordnungsbegriff "

--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -1,5 +1,6 @@
 Imports System.ComponentModel
 Imports System.Drawing
+Imports System.Globalization
 Imports System.Windows.Forms

 Public Class MyTextBox
@@ -46,7 +47,7 @@ Public Class MyTextBox

    Sub fillWithSQL(sql As String, Optional conn As String = "SDL")
        ' MsgBox((New SQL).getValueTxtBySql(sql, conn))
-        Me._value = (New Sql).getValueTxtBySql(sql, conn)
+        Me._value = (New SQL).getValueTxtBySql(sql, conn)
        '  MsgBox(Me._value)
        'Me.Text = Me._value
    End Sub
@@ -236,11 +237,20 @@ Public Class MyTextBox
        Dim pruefungHandled = False

        If _numbersOnly Then
-            sender.text = sender.text.ToString.Replace(" ", "")
+            'If sender.text.ToString.StartsWith("21") Then
+            '    For Each s In sender.text.ToString
+            '        MsgBox(s & " - " & Convert.ToByte(s))
+            '    Next
+
+            '    '    MsgBox(CInt(sender.text.ToString.Chars(3)))
+            'End If
+
+
+            sender.text = sender.text.ToString.Replace(" ", "").Replace(Chr(160), "") ' 160: irgend ein Sonder-Leerzeichen
            pruefungHandled = True
            Try
                If IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then
-                    sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen)
+                    sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
                    Me._value = CDbl(sender.text)
                    '  Else
                    '     sender.text = CDbl(sender.text)
@@ -280,12 +290,24 @@ Public Class MyTextBox
        If _ShortDateNew Then
            pruefungHandled = True
            Me.ForeColor = Color.Black
-            If (Me.Text.Length >= 6 And Me.Text.Length <= 10) AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1990") Then
-                '------ falls Jahr zweistellig:
-                Dim split = Me.Text.Replace(",", ".").Split
+
+            '------ falls Jahr zweistellig:
+            Me.Text = Me.Text.Replace(",", ".")
+            If Me.Text.Length = 8 Then
+                Dim split = Me.Text.Split(".")
                If split.Count = 3 Then
                    Me.Text = split(0) & "." & split(1) & ".20" & split(2)
                End If
+            End If
+
+            If (Me.Text.Length >= 6 And Me.Text.Length <= 10) AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1900") Then
+                'MsgBox(Me.Text)
+                ''------ falls Jahr zweistellig:
+                'Dim split = Me.Text.Replace(",", ".").Split
+                'If split.Count = 3 Then
+                '    Me.Text = split(0) & "." & split(1) & ".20" & split(2)
+                'End If
+                'MsgBox(Me.Text)
                '------
                Me._value = CDate(Me.Text).ToShortDateString 'Nur wenns Passt
                Me.Text = CDate(Me.Text).ToShortDateString
@@ -301,7 +323,7 @@ Public Class MyTextBox
            pruefungHandled = True
            Me.ForeColor = Color.Black
            If Me.Text.Length > 16 Then Me.Text = Me.Text.Substring(0, 16)
-            If (Me.Text.Length >= 6 And Me.Text.Length <= 16) AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1990") Then
+            If (Me.Text.Length >= 6 And Me.Text.Length <= 16) AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1900") Then
                '------ falls Jahr zweistellig:
                Dim split = Me.Text.Replace(",", ".").Split
                If split.Count = 3 Then
@@ -387,7 +409,7 @@ Public Class MyTextBox
        If _ShortDateNew Then
            pruefungHandled = True
            Me.ForeColor = Color.Black
-            If Me.Text.Length = 10 AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1990") Then
+            If Me.Text.Length = 10 AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1900") Then
                Me._value = CDate(Me.Text).ToShortDateString 'Nur wenns Passt
                Me.Text = CDate(Me.Text).ToShortDateString
            ElseIf Me.Text = "" Then
@@ -409,7 +431,7 @@ Public Class MyTextBox
        If _DateTimeOnly Then
            pruefungHandled = True
            Me.ForeColor = Color.Black
-            If Me.Text.Length = 16 AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1990 00:00") Then
+            If Me.Text.Length = 16 AndAlso IsDate(Me.Text.Replace(",", ".")) AndAlso CDate(Me.Text) > CDate("01.01.1900 00:00") Then
                Me._value = CDate(Me.Text).ToString("dd.MM.yyyy HH:mm")  'Nur wenns Passt
                Me.Text = CDate(Me.Text).ToString("dd.MM.yyyy HH:mm")
            ElseIf Me.Text = "" Then
@@ -433,7 +455,7 @@ Public Class MyTextBox
        If Me.Multiline And IsNumeric(MaxLines_Warning) Then
            ' If Me.Lines.Length > MaxLines Then
            If MaxLines_Warning_Label IsNot Nothing Then
-                MaxLines_Warning_Label.visible = CBool(Me.Lines.Length > MaxLines_Warning)
+                MaxLines_Warning_Label.Visible = CBool(Me.Lines.Length > MaxLines_Warning)
            End If
            'End If
        End If
@@ -497,7 +519,7 @@ Public Class MyTextBox

                If IsNumeric(Me._numbersOnlyKommastellen) And IsNumeric(v) Then
                    Propvalue = CDbl(v)
-                    Me.Text = CDbl(v).ToString("N" & Me._numbersOnlyKommastellen)
+                    Me.Text = CDbl(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
                ElseIf IsNumeric(v) Then
                    Propvalue = CDbl(v)
                    Me.Text = v
@@ -537,7 +559,7 @@ Public Class MyTextBox
            Try
                'String.Format("{0:N2}", CDbl(sender.text))
                If IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then
-                    sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen)
+                    sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
                Else
                    sender.text = CDbl(sender.text)
                End If
--- a/Steuerelemente/frmPDFScanList.Designer.vb
+++ b/Steuerelemente/frmPDFScanList.Designer.vb
@@ -22,8 +22,9 @@ Partial Class frmPDFScanList
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
-        Me.cntxtMulti = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxtMulti = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -8,9 +8,12 @@ Public Class usrcntlPDFScanList
    Public Property _DATENSERVER_UOrdner1 As String = ""
    Public Property _DATENSERVER_UOrdner2 As String = ""
    Public Property _DATENSERVER_UOrdner3 As String = ""
+    Public Property _OPEN_ORIGINAL As Boolean = False
+
    Private Property _TEXT_PDF As String = "SONSTIGE"
    Private Property _MULTI_FILES As Boolean = True

+    Public Property _TYPE As String = "PDF"
    ' Public pdf_Path As String = ""
    Dim KdNr As Integer = -1

@@ -18,7 +21,7 @@ Public Class usrcntlPDFScanList
    ' Public ScanID As Integer = -1
    Public COLL_ID As Integer = -1
    'Dim DatenserverIDCollection As New cDatenserverIDCollectionList
-    Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER
+    Public DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER


    Public Event FileAdded(id As String, path As String, name As String)
@@ -82,7 +85,7 @@ Public Class usrcntlPDFScanList
    '       initPdf()
    '    End If
    '  End Sub
-    Sub initPdf()
+    Public Sub initPdf()
        MyListBox1.Items.Clear()

        KopierenZwischenablageToolStripMenuItem.Enabled = False
@@ -144,7 +147,7 @@ Public Class usrcntlPDFScanList
    End Sub

    Private Sub DateiHochladenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem2.Click
-        If DS.uploadDataToDATENSERVERFileDialog_MULTI(, ".pdf", , "PDF") Then
+        If DS.uploadDataToDATENSERVERFileDialog_MULTI(, , , _TYPE) Then
            initPdf()
        End If
        'If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") <> "" Then
@@ -191,8 +194,18 @@ Public Class usrcntlPDFScanList

    Private Sub MyListBox1_DoubleClick(sender As Object, e As EventArgs) Handles MyListBox1.DoubleClick
        Try
+            If _OPEN_ORIGINAL Then
+                Dim collId = DirectCast(MyListBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value
+                For Each i In DS.DATA_LIST.LIST
+                    If i.coll_id = collId Then
+                        Process.Start(i.coll_pfad)
+                        Exit Sub
+                    End If
+                Next
+            Else
+                DS.OPEN(DirectCast(MyListBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value,, True)
+            End If

-            DS.OPEN(DirectCast(MyListBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value,, True)

            '  VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.copyToTmp_KeepFilename(ii.coll_pfad, ii.coll_bezeichnung)