neu

2020-10-02 10:37:26 +02:00
parent ce31c2c398
commit 75b12f314d
42 changed files with 1131 additions and 510 deletions
--- a/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb
+++ b/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb
@@ -258,7 +258,7 @@ Public Class frmSDLAbholungEintrag
                                 "       WHEN '210'      THEN cast([SERIE-Nr] as VARCHAR(200)) " &
                                 "       WHEN '212'      THEN cast(KartenNr as VARCHAR(200)) " &
                                 "       WHEN '213'      THEN cast(OBUID as VARCHAR(200)) " &
-                                 "       WHEN '214'     THEN cast(KartenNr as VARCHAR(200)) " &
+                                 "       WHEN '214'     THEN cast(OBUID as VARCHAR(200)) " &
                                 "       WHEN '215'      THEN cast([TELEPASS-Nr] as VARCHAR(200)) " &
                                 "       WHEN '216'      THEN cast(KartenNr as VARCHAR(200)) " &
                                 "       WHEN '203'      THEN cast(KartenNr as VARCHAR(200)) " &
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.Designer.vb
@@ -50,11 +50,11 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.UsrCntlDetails = New SDL.usrCntlAllg()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.scanPIN = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
        Me.scanRetourniert = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
-        Me.scanPIN = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.Panel2.SuspendLayout()
        Me.tbcntr.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -109,14 +109,15 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.txtKartenNr._Waehrung = False
        Me.txtKartenNr._WaehrungZeichen = True
        Me.txtKartenNr.ForeColor = System.Drawing.Color.Black
-        Me.txtKartenNr.Location = New System.Drawing.Point(106, 96)
+        Me.txtKartenNr.Location = New System.Drawing.Point(196, 181)
        Me.txtKartenNr.MaxLength = 22
        Me.txtKartenNr.MaxLineLength = -1
        Me.txtKartenNr.MaxLines_Warning = ""
        Me.txtKartenNr.MaxLines_Warning_Label = Nothing
        Me.txtKartenNr.Name = "txtKartenNr"
-        Me.txtKartenNr.Size = New System.Drawing.Size(183, 20)
+        Me.txtKartenNr.Size = New System.Drawing.Size(93, 20)
        Me.txtKartenNr.TabIndex = 2
+        Me.txtKartenNr.Visible = False
        '
        'txtOBUID
        '
@@ -131,7 +132,7 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.txtOBUID._Waehrung = False
        Me.txtOBUID._WaehrungZeichen = True
        Me.txtOBUID.ForeColor = System.Drawing.Color.Black
-        Me.txtOBUID.Location = New System.Drawing.Point(106, 140)
+        Me.txtOBUID.Location = New System.Drawing.Point(106, 96)
        Me.txtOBUID.MaxLength = 18
        Me.txtOBUID.MaxLineLength = -1
        Me.txtOBUID.MaxLines_Warning = ""
@@ -154,17 +155,18 @@ Partial Class usrCntlSDLLeistungPLOSE
        '
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(3, 99)
+        Me.Label1.Location = New System.Drawing.Point(121, 184)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(69, 13)
        Me.Label1.TabIndex = 9
        Me.Label1.Text = "Karten-Nr.:"
+        Me.Label1.Visible = False
        '
        'Label9
        '
        Me.Label9.AutoSize = True
        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.Location = New System.Drawing.Point(3, 143)
+        Me.Label9.Location = New System.Drawing.Point(3, 99)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(52, 13)
        Me.Label9.TabIndex = 12
@@ -448,6 +450,25 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.TabPage2.Text = "Dokumente"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'scanPIN
+        '
+        Me.scanPIN._ARCHIV = True
+        Me.scanPIN._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanPIN._DATENSERVER_ORDNER = "MDM"
+        Me.scanPIN._DATENSERVER_UOrdner1 = Nothing
+        Me.scanPIN._DATENSERVER_UOrdner2 = Nothing
+        Me.scanPIN._DATENSERVER_UOrdner3 = Nothing
+        Me.scanPIN._MULTI_FILES = True
+        Me.scanPIN._TEXT_PDF = "PIN"
+        Me.scanPIN.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanPIN.BackColor = System.Drawing.Color.White
+        Me.scanPIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanPIN.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanPIN.Location = New System.Drawing.Point(192, 4)
+        Me.scanPIN.Name = "scanPIN"
+        Me.scanPIN.Size = New System.Drawing.Size(58, 24)
+        Me.scanPIN.TabIndex = 24
+        '
        'scanLieferschein
        '
        Me.scanLieferschein._ARCHIV = True
@@ -475,6 +496,7 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.scanSonstiges._DATENSERVER_UOrdner2 = ""
        Me.scanSonstiges._DATENSERVER_UOrdner3 = ""
        Me.scanSonstiges._OPEN_ORIGINAL = False
+        Me.scanSonstiges._TYPE = "PDF"
        Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
        Me.scanSonstiges.BackColor = System.Drawing.Color.White
        Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -517,25 +539,6 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.cbxArchiviert.Text = "ARCHIVIERT"
        Me.cbxArchiviert.UseVisualStyleBackColor = True
        '
-        'scanPIN
-        '
-        Me.scanPIN._ARCHIV = True
-        Me.scanPIN._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanPIN._DATENSERVER_ORDNER = "MDM"
-        Me.scanPIN._DATENSERVER_UOrdner1 = Nothing
-        Me.scanPIN._DATENSERVER_UOrdner2 = Nothing
-        Me.scanPIN._DATENSERVER_UOrdner3 = Nothing
-        Me.scanPIN._MULTI_FILES = True
-        Me.scanPIN._TEXT_PDF = "PIN"
-        Me.scanPIN.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanPIN.BackColor = System.Drawing.Color.White
-        Me.scanPIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanPIN.Cursor = System.Windows.Forms.Cursors.Default
-        Me.scanPIN.Location = New System.Drawing.Point(192, 4)
-        Me.scanPIN.Name = "scanPIN"
-        Me.scanPIN.Size = New System.Drawing.Size(58, 24)
-        Me.scanPIN.TabIndex = 24
-        '
        'usrCntlSDLLeistungPLOSE
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -549,7 +552,6 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.Label7)
        Me.Controls.Add(Me.Label11)
-        Me.Controls.Add(Me.txtVermerk)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.cbxGestohlen)
        Me.Controls.Add(Me.cbxVerloren)
@@ -563,6 +565,7 @@ Partial Class usrCntlSDLLeistungPLOSE
        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.txtVermerk)
        Me.Name = "usrCntlSDLLeistungPLOSE"
        Me.Size = New System.Drawing.Size(760, 220)
        Me.Panel2.ResumeLayout(False)
--- a/SDL/mdm/usrCntlKartenDaten.Designer.vb
+++ b/SDL/mdm/usrCntlKartenDaten.Designer.vb
@@ -74,13 +74,13 @@ Partial Class usrCntlKartenDaten
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
        Me.dgvSDL = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.UsrCntlDatenDetails1 = New SDL.usrCntlDatenDetails()
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.pnlTest = New System.Windows.Forms.Panel()
        Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UsrCntlDatenDetails1 = New SDL.usrCntlDatenDetails()
        Me.FlowLayoutPanel.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -473,14 +473,14 @@ Partial Class usrCntlKartenDaten
        Me.btnSDL_PLOSE.FlatAppearance.BorderSize = 0
        Me.btnSDL_PLOSE.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSDL_PLOSE.ForeColor = System.Drawing.Color.Black
-        Me.btnSDL_PLOSE.Image = Global.SDL.My.Resources.Resources.plose
+        Me.btnSDL_PLOSE.Image = Global.SDL.My.Resources.Resources.plose_1
        Me.btnSDL_PLOSE.ImageAlign = System.Drawing.ContentAlignment.TopCenter
        Me.btnSDL_PLOSE.Location = New System.Drawing.Point(156, 64)
        Me.btnSDL_PLOSE.Margin = New System.Windows.Forms.Padding(0)
        Me.btnSDL_PLOSE.Name = "btnSDL_PLOSE"
-        Me.btnSDL_PLOSE.Size = New System.Drawing.Size(78, 64)
+        Me.btnSDL_PLOSE.Size = New System.Drawing.Size(92, 64)
        Me.btnSDL_PLOSE.TabIndex = 41
-        Me.btnSDL_PLOSE.Text = "PLOSE"
+        Me.btnSDL_PLOSE.Text = "RoadMaster" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "PLOSE"
        Me.btnSDL_PLOSE.TextAlign = System.Drawing.ContentAlignment.BottomCenter
        Me.btnSDL_PLOSE.UseVisualStyleBackColor = True
        '
@@ -492,7 +492,7 @@ Partial Class usrCntlKartenDaten
        Me.btnSDL_PLOSE_IT.ForeColor = System.Drawing.Color.Black
        Me.btnSDL_PLOSE_IT.Image = Global.SDL.My.Resources.Resources.plose_it
        Me.btnSDL_PLOSE_IT.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnSDL_PLOSE_IT.Location = New System.Drawing.Point(234, 64)
+        Me.btnSDL_PLOSE_IT.Location = New System.Drawing.Point(248, 64)
        Me.btnSDL_PLOSE_IT.Margin = New System.Windows.Forms.Padding(0)
        Me.btnSDL_PLOSE_IT.Name = "btnSDL_PLOSE_IT"
        Me.btnSDL_PLOSE_IT.Size = New System.Drawing.Size(78, 64)
@@ -509,7 +509,7 @@ Partial Class usrCntlKartenDaten
        Me.btnSDL_PLOSE_CZ.ForeColor = System.Drawing.Color.Black
        Me.btnSDL_PLOSE_CZ.Image = Global.SDL.My.Resources.Resources.plose_cz
        Me.btnSDL_PLOSE_CZ.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.btnSDL_PLOSE_CZ.Location = New System.Drawing.Point(312, 64)
+        Me.btnSDL_PLOSE_CZ.Location = New System.Drawing.Point(326, 64)
        Me.btnSDL_PLOSE_CZ.Margin = New System.Windows.Forms.Padding(0)
        Me.btnSDL_PLOSE_CZ.Name = "btnSDL_PLOSE_CZ"
        Me.btnSDL_PLOSE_CZ.Size = New System.Drawing.Size(78, 64)
@@ -855,15 +855,6 @@ Partial Class usrCntlKartenDaten
        Me.dgvSDL.Size = New System.Drawing.Size(1354, 599)
        Me.dgvSDL.TabIndex = 29
        '
-        'UsrCntlDatenDetails1
-        '
-        Me.UsrCntlDatenDetails1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlDatenDetails1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlDatenDetails1.Name = "UsrCntlDatenDetails1"
-        Me.UsrCntlDatenDetails1.Size = New System.Drawing.Size(1354, 234)
-        Me.UsrCntlDatenDetails1.TabIndex = 0
-        Me.UsrCntlDatenDetails1.Visible = False
-        '
        'Panel4
        '
        Me.Panel4.BackColor = System.Drawing.Color.White
@@ -922,6 +913,15 @@ Partial Class usrCntlKartenDaten
        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
        Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
        '
+        'UsrCntlDatenDetails1
+        '
+        Me.UsrCntlDatenDetails1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlDatenDetails1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlDatenDetails1.Name = "UsrCntlDatenDetails1"
+        Me.UsrCntlDatenDetails1.Size = New System.Drawing.Size(1354, 234)
+        Me.UsrCntlDatenDetails1.TabIndex = 0
+        Me.UsrCntlDatenDetails1.Visible = False
+        '
        'usrCntlKartenDaten
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/SDL/mdm/usrCntlKartenDaten.vb
+++ b/SDL/mdm/usrCntlKartenDaten.vb
@@ -465,7 +465,7 @@ Public Class usrCntlKartenDaten
            Case 202 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [TELEPASS-Kd-Nr], VIACARD,[TELEPASS-Nr], Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert,TelepassErsatzkarte,  SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=202"
            Case 203 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=203"
            Case 213 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=213"
-            Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr  WHERE SDLNr=214"
+            Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, /*KartenNr,*/ OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr  WHERE SDLNr=214"
            Case 215 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, VIACARD, [TELEPASS-Nr], PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr   WHERE SDLNr=215"
            Case 216 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr   WHERE SDLNr=216"
            Case 209 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert,  SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=209"