Test ATEZ, Plose Curr, SpedBuch Pkst

2025-01-09 09:29:57 +01:00
parent 955ae80d62
commit 330ffd108e
6 changed files with 37 additions and 17 deletions
--- a/DAKOSY_Worker/cZOLL_IMPORT.vb
+++ b/DAKOSY_Worker/cZOLL_IMPORT.vb
@@ -1,4 +1,5 @@
-Imports VERAG_PROG_ALLGEMEIN
+Imports com.sun.tools.corba.se
+Imports VERAG_PROG_ALLGEMEIN
 Public Class cZOLL_IMPORT
    Public Aviso As cAviso
    'Public SendungId As Integer = -1
@@ -611,7 +612,7 @@ Public Class cZOLL_IMPORT

        If SENDUNG IsNot Nothing Then
            ' Dim r As DataRow = dt.Rows(0)
-            If SENDUNG.tblSnd_Warenbezeichnung <> "" Then
+            If SENDUNG.tblSnd_Warenbezeichnung <> "" Or SENDUNG.tblSnd_Abfertigungsart_ID = 23 Then
                packstueckeAVISO_TMP = IIf(SENDUNG.tblSnd_Colli <> "", SENDUNG.tblSnd_Colli & " Pk. ", "")
                packstueckeAVISO_TMP &= IIf(SENDUNG.tblSnd_Warenbezeichnung <> "", SENDUNG.tblSnd_Warenbezeichnung, "")
                packstueckeAVISO_TMP &= IIf(SENDUNG.tblSnd_Gewicht <> "", ", " & SENDUNG.tblSnd_Gewicht & " kg ", "")
@@ -786,6 +787,16 @@ Public Class cZOLL_IMPORT
                    SPEDITIONSBUCH.Abfertigungsanzahl = 0
                End If

+
+                SENDUNG.LOAD_HANDLING()
+                Dim ataStr = ""
+                'For Each HDL In SENDUNG.HANDLING
+                '    ataStr &= HDL.sndhdg_nr & ";"
+                'Next
+                If SENDUNG.HANDLING.Count > 0 Then ataStr &= SENDUNG.HANDLING(0).sndhdg_nr
+                If SENDUNG.HANDLING.Count > 1 Then ataStr &= ",etc."
+                SPEDITIONSBUCH.BelegNr = ataStr
+                If SPEDITIONSBUCH.BelegNr.Length > 27 Then SPEDITIONSBUCH.BelegNr = SPEDITIONSBUCH.BelegNr.Substring(0, 27)
            End If

            If SENDUNG.tblSnd_Abfertigungsart_ID = 67 Or SENDUNG.tblSnd_Abfertigungsart_ID = 68 Then
--- a/MDM_Worker/cPLOSE_Inv_Data.vb
+++ b/MDM_Worker/cPLOSE_Inv_Data.vb
@@ -21,6 +21,7 @@ Public Class cPLOSE_Inv_Data
    Property plInv_Bruttobetrag As Object = Nothing
    Property plInv_Services As Object = Nothing
    Property plInv_PdfFileName As Object = Nothing
+    Property plInv_Currency As Object = Nothing
    Property plInv_daId As Object = Nothing
    Property plInv_tstmp As DateTime = Now

@@ -61,6 +62,7 @@ Public Class cPLOSE_Inv_Data
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Bruttobetrag", plInv_Bruttobetrag))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Services", plInv_Services))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_PdfFileName", plInv_PdfFileName))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Currency", plInv_Currency))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_daId", plInv_daId))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_tstmp", plInv_tstmp))

--- a/MailSender/MAILSender.vb
+++ b/MailSender/MAILSender.vb
@@ -169,7 +169,7 @@ Module Mail
                        Else

                            System.Console.WriteLine("OPTION erkannt: VW_DHL _ Erstellt eine Liste der LKWs auf Ankunft und Freigabe des Tages.")
-                            If SendEmail_VW_DHL_updateList({"volkswagen@verag.ag"}, {}, {"al@verag.ag"}, "VW/DHL - aktuelle LKW Liste") Then
+                            If SendEmail_VW_DHL_updateList({"volkswagen@verag.ag"}, {}, {}, "VW/DHL - aktuelle LKW Liste") Then
                                System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
                            End If
                        End If
--- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
@@ -795,6 +795,13 @@ Public Class frmMDMNachrichtenVerarbeitung
                                If If(PLOSE_INV.plInv_PdfFileName, "") <> "" Then
                                    If Not PLOSE_INV.plInv_PdfFileName.ToString.ToLower.EndsWith(".pdf") Then PLOSE_INV.plInv_PdfFileName += ".pdf" ' Falls Endung nciht .pdf --> anfügen
                                End If
+
+
+                                If currentRow.Length >= 16 Then
+                                    PLOSE_INV.plInv_Currency = SQL.isleernothing(currentRow(15))
+                                End If
+
+
                                PLOSE_INV.plInv_Einlesedatum = Now.ToShortDateString
                                PLOSE_INV.plInv_Datensatztyp = "PDF"
                                PLOSE_INV.plInv_PLOSEKundennummer = SQL.isleernothing(currentRow(0))
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -25,7 +25,7 @@ Partial Class frmStartOptions
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.Button27 = New System.Windows.Forms.Button()
+        Me.btnTestATEZ = New System.Windows.Forms.Button()
        Me.Button26 = New System.Windows.Forms.Button()
        Me.txtMRNPrefix = New System.Windows.Forms.TextBox()
        Me.LinkLabel66 = New System.Windows.Forms.LinkLabel()
@@ -327,7 +327,7 @@ Partial Class frmStartOptions
        '
        Me.pnl.BackColor = System.Drawing.Color.White
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnl.Controls.Add(Me.Button27)
+        Me.pnl.Controls.Add(Me.btnTestATEZ)
        Me.pnl.Controls.Add(Me.Button26)
        Me.pnl.Controls.Add(Me.txtMRNPrefix)
        Me.pnl.Controls.Add(Me.LinkLabel66)
@@ -411,17 +411,17 @@ Partial Class frmStartOptions
        Me.pnl.Size = New System.Drawing.Size(1229, 1007)
        Me.pnl.TabIndex = 0
        '
-        'Button27
+        'btnTestATEZ
        '
-        Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button27.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button27.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button27.Location = New System.Drawing.Point(1062, 459)
-        Me.Button27.Name = "Button27"
-        Me.Button27.Size = New System.Drawing.Size(123, 24)
-        Me.Button27.TabIndex = 140
-        Me.Button27.Text = "test ATEZ"
-        Me.Button27.UseVisualStyleBackColor = True
+        Me.btnTestATEZ.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnTestATEZ.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnTestATEZ.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnTestATEZ.Location = New System.Drawing.Point(1062, 459)
+        Me.btnTestATEZ.Name = "btnTestATEZ"
+        Me.btnTestATEZ.Size = New System.Drawing.Size(123, 24)
+        Me.btnTestATEZ.TabIndex = 140
+        Me.btnTestATEZ.Text = "test ATEZ"
+        Me.btnTestATEZ.UseVisualStyleBackColor = True
        '
        'Button26
        '
@@ -4024,5 +4024,5 @@ Partial Class frmStartOptions
    Friend WithEvents LinkLabel68 As LinkLabel
    Friend WithEvents PictureBox26 As PictureBox
    Friend WithEvents Button26 As Button
-    Friend WithEvents Button27 As Button
+    Friend WithEvents btnTestATEZ As Button
 End Class
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -5433,7 +5433,7 @@ Public Class frmStartOptions
        VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.query_declarations("01.12.2024", "31.12.2024")
    End Sub

-    Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click
+    Private Sub Button27_Click(sender As Object, e As EventArgs) Handles btnTestATEZ.Click
        VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.get_ie015_xml_by_mrn("24TR34340000000145")

    End Sub