EXG Änderugnen

2025-01-28 13:42:30 +01:00
parent 946c8c165a
commit 745dd0bea2
3 changed files with 64 additions and 16 deletions
--- a/DAKOSY_Worker/DAKOSY/ATLAS/EXG/InformationenZumAusgang/InformationEXITDE_003.Designer.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/EXG/InformationenZumAusgang/InformationEXITDE_003.Designer.vb
@@ -1,7 +1,7 @@
 '' ------------------------------------------------------------------------------
 ''  <auto-generated>
 ''    Generated by Xsd2Code++. Version 6.0.0.0. www.xsd2code.com
-''    {"TargetFramework":"Net48","NameSpace":"InformationEXITDE","Language":"VisualBasic","Properties":{},"XmlAttribute":{"Enabled":true},"ClassParams":{},"Serialization":{"ShouldSerialize":{},"AdditionalSerializers":{},"XmlSerializerEvent":{},"XmlOutput":{},"JsonOutput":{},"Enabled":true},"Miscellaneous":{}}
+''    {"TargetFramework":"Net48","NameSpace":"InformationEXITDE","Language":"VisualBasic","Properties":{},"XmlAttribute":{"Enabled":true},"ClassParams":{},"Serialization":{"ShouldSerialize":{},"AdditionalSerializers":{},"XmlSerializerEvent":{},"XmlOutput":{"Formating":true,"NewLineOnAttributes":true},"JsonOutput":{},"Enabled":true},"Miscellaneous":{}}
 ''  </auto-generated>
 '' ------------------------------------------------------------------------------
 #Disable Warning
@@ -68,6 +68,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -274,6 +277,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -490,6 +496,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -718,6 +727,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -946,6 +958,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -1174,6 +1189,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -1440,6 +1458,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -1621,6 +1642,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -1808,6 +1832,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -2025,6 +2052,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -2212,6 +2242,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -2435,6 +2468,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -2714,6 +2750,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -2961,6 +3000,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
@@ -3142,6 +3184,9 @@ Namespace InformationEXITDE
            Try
                memoryStream = New MemoryStream()
                Dim xmlWriterSettings As System.Xml.XmlWriterSettings = New System.Xml.XmlWriterSettings()
+                xmlWriterSettings.Indent = True
+                xmlWriterSettings.IndentChars = "  "
+                xmlWriterSettings.NewLineOnAttributes = True
                Dim xmlWriter As System.Xml.XmlWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)
                SerializerXml.Serialize(xmlWriter, Me)
                memoryStream.Seek(0, SeekOrigin.Begin)
--- a/DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb
@@ -9,7 +9,7 @@ Public Class cDakosyEXG
    Property exg_dyaArt As String = ""
    Property exg_dyaAnmID As Integer

-    Property exg_Partnersystem As Object = Nothing
+    Property exg_Partnersystem As String = "DAKOSY"
    Property exg_ANR As Object = Nothing
    Property exg_MRN As Object = Nothing

--- a/initATLASAufschubkonten/cWorker_AES_EXG.vb
+++ b/initATLASAufschubkonten/cWorker_AES_EXG.vb
@@ -64,8 +64,6 @@ Public Class cWorker_AES_EXG

                                frmDYNachrichtenVerarbeitung.setFirmaNL(VWI.Transaktion.IOPartner, VWI.Transaktion.IODivision3, EXG.exg_firma, EXG.exg_niederlassung)

-
-
                                If RESP.HeaderData.Consignee IsNot Nothing Then
                                    EXG.exg_Consignee_Name = RESP.HeaderData.Consignee.Name

@@ -226,21 +224,26 @@ Public Class cWorker_AES_EXG
                                                    NCTS_OUT.ncts_Erstellung_SB = DY_ANM.dy_Erstellung_SB
                                                    NCTS_OUT.ncts_LetzteBearbeitung = Now
                                                    NCTS_OUT.ncts_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
-                                                    NCTS_OUT.ncts_firma = FIRMA_DY
+                                                    NCTS_OUT.ncts_firma = EXG.exg_firma
+                                                    NCTS_OUT.ncts_niederlassung = EXG.exg_niederlassung
                                                    '  DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_004(NCTS_OUT, Me, DY_ANM, Me.FIRMA_DY)

                                                    If NCTS_OUT.SAVE_ALL() Then

                                                        Dim saveFile = ""
-
+                                                        Dim testDY = True
                                                        If cDakosyNCTSOut004.generateVersandanmeldungNCTSDE_004(NCTS_OUT, saveFile, "CREATE", Application.StartupPath) Then
                                                            If saveFile <> "" Then
-                                                                If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, NCTS_OUT.ncts_ObjectName, DY_ANM.dy_Id, Me.FIRMA_DY) Then
-                                                                    DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
-                                                                    'If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen.
+                                                                If testDY Then
+                                                                    frmStartOptions.copyFile(saveFile, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\upl\NCTS\")
                                                                Else
-                                                                    DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
-                                                                    MsgBox("Sendefehler!")
+                                                                    If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, NCTS_OUT.ncts_ObjectName, DY_ANM.dy_Id, NCTS_OUT.ncts_firma) Then
+                                                                        DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
+                                                                        'If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen.
+                                                                    Else
+                                                                        DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
+                                                                        MsgBox("Sendefehler!")
+                                                                    End If
                                                                End If
                                                            End If
                                                        End If
@@ -264,7 +267,7 @@ Public Class cWorker_AES_EXG

                                    '----------------------------------------------------------------------
                                    'Es wird bei Daten zum AUsgang und "_EXG"  automaitsch die Qualifizierung aufgerufen...
-                                    Dim test = True
+                                    Dim test = False
                                    If readEZA_DatenZumAusgang_DataEXITDE_005.Contains("_EXG") Or test Then
                                        Dim IOPARTNER = VWI.Transaktion.IOPartner
                                        Dim DIVISION3 = VWI.Transaktion.IODivision3
@@ -278,7 +281,7 @@ Public Class cWorker_AES_EXG
                                        Dim saveFile = ""

                                        DY_ACTIONS.Add("CHANGE")
-                                        '  DY_ACTIONS.Add("SEND")
+                                        DY_ACTIONS.Add("SEND")

                                        If generateInformationenZumAusgang003(EXG, readEZA_DatenZumAusgang_DataEXITDE_005, saveFile, DY_ACTIONS, IOPARTNER, DIVISION3, DAKOSY_SB) Then
                                            If saveFile <> "" Then
@@ -358,7 +361,7 @@ Public Class cWorker_AES_EXG
        'TransitOperation:
        XML_EG.HeaderData.InformationType = "NV"
        'XML_EG.HeaderData.ActiveBorderTransportMeans.DepartureDateAndTime = Now '_Nicht, sonst fehler
-        XML_EG.HeaderData.Finalization = True
+        XML_EG.HeaderData.Finalization = 1
        XML_EG.HeaderData.ModeOfTransportAtTheBorder = 3

        'XML_EG.HeaderData.MRN = MRN
@@ -376,7 +379,7 @@ Public Class cWorker_AES_EXG
            System.IO.Directory.CreateDirectory(saveDir)
        End If

-        saveFile = saveDir & "DY_EXP_" & Now.ToString("yyMMdd_HHmmss_fff") & ".xml"
+        saveFile = saveDir & "DY_EXG_" & Now.ToString("yyMMdd_HHmmss_fff") & ".xml"

        XML.SaveToFile(saveFile)

@@ -392,7 +395,7 @@ Public Class cWorker_AES_EXG
        STATUS.SAVE()
        '-------------------------------------------

-        'SDL.DAKOSY_Interface_SEND.replaceNullDateXML(saveFile)
+        DAKOSY_Worker.cDakosyFunftions.replaceNullDateXML(saveFile)


        Return True