neu

2020-09-23 07:24:25 +02:00
parent 89d8e0a3a8
commit ce31c2c398
84 changed files with 4953 additions and 554 deletions
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.Designer.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class usrCntlSDLLeistungHUGO
    Inherits System.Windows.Forms.UserControl

    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrCntlSDLLeistungHUGO
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.cbxRetourniert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
@@ -472,6 +472,8 @@ Partial Class usrCntlSDLLeistungHUGO
        Me.scanSonstiges._DATENSERVER_UOrdner1 = ""
        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
@@ -583,5 +585,4 @@ Partial Class usrCntlSDLLeistungHUGO
    Friend WithEvents scanRetourniert As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
    Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
    Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue
-
 End Class
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.vb
@@ -118,7 +118,7 @@ Public Class usrCntlSDLLeistungHUGO
            txtOBUID.Text = SDL.OBUID
            txtKartenNr.Text = SDL.KartenNr
            txtPin.Text = SDL.PIN
-
+            PROG.initPIN(txtPin)

        Catch ex As Exception
            MsgBox(ex.Message)
@@ -207,4 +207,6 @@ Public Class usrCntlSDLLeistungHUGO
        If tmp.Length > txtVermerk.MaxLength Then tmp = tmp.Substring(0, txtVermerk.MaxLength)
        Return tmp
    End Function
+
+
 End Class
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb
@@ -117,6 +117,7 @@ Public Class usrCntlSDLLeistungPLOSE
            txtOBUID.Text = SDL.OBUID
            txtKartenNr.Text = SDL.KartenNr
            txtPin.Text = SDL.PIN
+            PROG.initPIN(txtPin)

        Catch ex As Exception
            MsgBox(ex.Message)
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIDS.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIDS.vb
@@ -120,6 +120,7 @@ Public Class usrCntlSDLLeistungenIDS
            ' UsrCntlDetails.lblSachbearb.DataBindings.Add(New Binding("Text", s.bindingSource, "Sachbearbeiter", True, DataSourceUpdateMode.OnPropertyChanged, ""))

            txtPIN.Text = SDL.PIN
+            PROG.initPIN(txtPIN)
            txtKartenNr.Text = SDL.KartenNr
            'txtPIN.DataBindings.Add(New Binding("Text", s.bindingSource, "PIN", True, DataSourceUpdateMode.OnPropertyChanged, ""))
            'txtKartenNr.DataBindings.Add(New Binding("Text", s.bindingSource, "KartenNr", True, DataSourceUpdateMode.OnPropertyChanged, ""))
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb
@@ -105,6 +105,7 @@ Public Class usrCntlSDLLeistungenUTA


            txtPIN.Text = SDL.PIN
+            PROG.initPIN(txtPIN)
            txtKartenNr.Text = SDL.KartenNr
            txtClientNr.Text = SDL.CLIENT_Nr
            txtCardNr.Text = SDL.CARD_Nr
--- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenWOELFL.vb
+++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenWOELFL.vb
@@ -103,6 +103,7 @@ Public Class usrCntlSDLLeistungenWOELFL


            txtPIN.Text = SDL.PIN
+            PROG.initPIN(txtPIN)
            txtKartenschluesselNummer.Text = SDL.KartenSchlüsselNr


--- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb
@@ -35,6 +35,7 @@ Partial Class frmMDMDatenverarbetiung
        Me.dat_Sum_Bis = New System.Windows.Forms.DateTimePicker()
        Me.lbl = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button1 = New System.Windows.Forms.Button()
        Me.btnKunde = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -54,7 +55,7 @@ Partial Class frmMDMDatenverarbetiung
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button5 = New System.Windows.Forms.Button()
        Me.pnl.SuspendLayout()
        Me.FlowLayoutPanel.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -168,6 +169,7 @@ Partial Class frmMDMDatenverarbetiung
        '
        'Panel1
        '
+        Me.Panel1.Controls.Add(Me.Button5)
        Me.Panel1.Controls.Add(Me.Button1)
        Me.Panel1.Controls.Add(Me.btnKunde)
        Me.Panel1.Controls.Add(Me.Label4)
@@ -186,6 +188,16 @@ Partial Class frmMDMDatenverarbetiung
        Me.Panel1.Size = New System.Drawing.Size(1163, 114)
        Me.Panel1.TabIndex = 2
        '
+        'Button1
+        '
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Location = New System.Drawing.Point(461, 43)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(136, 23)
+        Me.Button1.TabIndex = 46
+        Me.Button1.Text = "MautD einfügen"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
        'btnKunde
        '
        Me.btnKunde.Enabled = False
@@ -422,15 +434,15 @@ Partial Class frmMDMDatenverarbetiung
        Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577)
        Me.MyDatagridview1.TabIndex = 0
        '
-        'Button1
+        'Button5
        '
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(461, 43)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(136, 23)
-        Me.Button1.TabIndex = 46
-        Me.Button1.Text = "MautD einfügen"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button5.Location = New System.Drawing.Point(461, 69)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(136, 23)
+        Me.Button5.TabIndex = 47
+        Me.Button5.Text = "Fakturiert"
+        Me.Button5.UseVisualStyleBackColor = True
        '
        'frmMDMDatenverarbetiung
        '
@@ -488,4 +500,5 @@ Partial Class frmMDMDatenverarbetiung
    Friend WithEvents txtPruefsummeBrutto As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents btnKunde As Button
    Friend WithEvents Button1 As Button
+    Friend WithEvents Button5 As Button
 End Class
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -282,10 +282,16 @@ Public Class frmMDMDatenverarbetiung
            For Each R_PLOSE In dt_Main.Rows

                Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
-                genPLOSE_SPEDBUCH_ByKdNr(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString, SPEDBUCH)
-                genPLOSE_RECHNUNG_BySPEDBUCH(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), SPEDBUCH, dat_Sum_Von.Value, dat_Sum_Bis.Value)
+                Dim verarbOK = True
+                If Not genPLOSE_SPEDBUCH_ByKdNr(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString, SPEDBUCH) Then verarbOK = False
+                If Not genPLOSE_RECHNUNG_BySPEDBUCH(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), SPEDBUCH, dat_Sum_Von.Value, dat_Sum_Bis.Value) Then verarbOK = False
                genPLOSEAttachmentByKdNr(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString, dir)

+                If verarbOK Then
+                    'UPDATE Fakturiert
+                    SQL.doSQL("UPDATE tblPLOSE_Details SET plose_FakturiertDatum=GETDATE() WHERE plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' AND plose_POLSEKundennummer='" & R_PLOSE("PLOSEKundenNr") & "'  ", "FMZOLL")
+                End If
+
                If True Then 'cnt Mod 10 = 0 Then
                    txtPloseAnh_Einarbeitung.Text = cnt & " / " & dt_Main.Rows.Count
                    Dim proz As Double = (cnt / dt_Main.Rows.Count) * 100
@@ -464,6 +470,53 @@ Public Class frmMDMDatenverarbetiung

    End Function

+
+    Function deleteMautD(Datenquelle As String) As Boolean
+        Try
+            Dim connectionString = ""
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+                connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\DEVELOPER\f\FMZoll\MautD.accdb"
+            Else
+                connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
+            End If
+
+            Dim con As New OleDbConnection(connectionString)
+            Dim cmd As New OleDbCommand
+            Dim var1 As String
+
+            Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
+            Dim reader As OleDbDataReader = Nothing
+
+
+            Try
+                con.Open()
+
+                'Zeitstempel  
+                Dim SQLQuery = "DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' "
+                Using Command As New OleDbCommand(SQLQuery, con)
+
+                    Command.ExecuteNonQuery()
+                    Command.Dispose()
+                End Using
+
+            Catch ex2 As System.Exception
+                MsgBox("err: " & ex2.Message & ex2.StackTrace)
+
+            Finally
+                If reader IsNot Nothing Then reader.Close()
+            End Try
+
+            con.Close()
+
+            Return True
+
+        Catch ex As System.Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return False
+
+    End Function
+
    Function genPLOSEAttachmentByKdNr(KdNr As String, PLOSEKundenNr As String, von As Date, bis As Date, dir As String)
        Try

@@ -1000,7 +1053,17 @@ Public Class frmMDMDatenverarbetiung

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
        Select Case LIEFERANT
-            Case "PLOSE" : genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
+            Case "PLOSE" : deleteMautD("PLOSE") : genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
+        End Select
+    End Sub
+    Sub setFakturiertPLOSE()
+        SQL.doSQL("UPDATE tblPLOSE_Details SET plose_Fakturiert=1 WHERE plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'   ", "FMZOLL")
+
+    End Sub
+
+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+        Select Case LIEFERANT
+            Case "PLOSE" : setFakturiertPLOSE()
        End Select
    End Sub
 End Class