merge

2026-01-30 16:44:08 +01:00
parent f7bde33bb4 2304bf098b
commit 9cb9133c80
4 changed files with 58 additions and 30 deletions
--- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb
@@ -1,5 +1,6 @@
 Imports System.Globalization
 Imports io.konik.zugferd
+Imports javax.management.relation
 Imports Newtonsoft.Json
 Imports VERAG_PROG_ALLGEMEIN

@@ -12,9 +13,9 @@ Public Class cDakosyEZA_Greenpulse
        If eza Is Nothing Then Throw New ArgumentNullException(NameOf(eza))

        ' --- Adressen (Heuristik: CN=Importer, CZ=Exporter, DT=Declarant) ---
-        Dim importer = GuessAddressByType(eza.eza_ADRESSEN, {"CN", "IM", "IMP", "IMPORTER"})
-        Dim exporter = GuessAddressByType(eza.eza_ADRESSEN, {"CZ", "EX", "EXP", "EXPORTER"})
-        Dim declarant = GuessAddressByType(eza.eza_ADRESSEN, {"DT", "DEC", "ANM", "DECLARANT"})
+        Dim importer = GuessAddressByType(eza.eza_ADRESSEN, cVERAG_CustomsDeclarations.IMPORTER_ROLES)
+        Dim exporter = GuessAddressByType(eza.eza_ADRESSEN, cVERAG_CustomsDeclarations.EXPORTER_ROLES)
+        Dim declarant = GuessAddressByType(eza.eza_ADRESSEN, cVERAG_CustomsDeclarations.DECLARANT_ROLES)

        ' --- Rechnungsdaten (Unterlagen N380) ---
        Dim inv = If(eza.eza_UNTERLAGEN IsNot Nothing,
@@ -236,9 +237,9 @@ Public Class cDakosyEZA_Greenpulse
        If za Is Nothing Then Throw New ArgumentNullException(NameOf(za))

        ' --- Parties (Heuristik über zaParty_Role) ---
-        Dim importer = GuessPartyByRole(za.Parties, {"CN", "IMPORTER", "IM"})
-        Dim exporter = GuessPartyByRole(za.Parties, {"CZ", "EXPORTER", "EX"})
-        Dim declarant = GuessPartyByRole(za.Parties, {"CB", "DECLARANT", "DEC"})
+        Dim importer = GuessPartyByRole(za.Parties, cVERAG_CustomsDeclarations.IMPORTER_ROLES)
+        Dim exporter = GuessPartyByRole(za.Parties, cVERAG_CustomsDeclarations.EXPORTER_ROLES)
+        Dim declarant = GuessPartyByRole(za.Parties, cVERAG_CustomsDeclarations.DECLARANT_ROLES)

        ' --- Rechnungsdaten (Header-Dokument N380) ---
        Dim inv = If(za.Documents IsNot Nothing,
--- a/DAKOSY_Worker/cImporter_DHFToVERAG.vb
+++ b/DAKOSY_Worker/cImporter_DHFToVERAG.vb
@@ -357,11 +357,11 @@ Public Class cImporter_DHFToVERAG
            ZA.za_RepresentationCode = ToStringSafe(r("DecRep"))
        End If

-        If role = "IMPORTER" Then
+        If role = "IMPORTER" Or role = "CONSINEE" Then
            ZA.za_CountryDestination = p.zaParty_Country
        End If

-        If role = "EXPORTER" Then
+        If role = "EXPORTER" Or role = "CONSINOR" Then
            ZA.za_CountryDispatch = p.zaParty_Country
        End If

--- a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
+++ b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
@@ -164,16 +164,26 @@ Public Class cImporter_TelotecToVERAG
                ' ------------------------------------------------------------
                ' DOKUMENTE
                ' ------------------------------------------------------------
-                For Each doc In p.DOC_CERTS
-                    Dim dd As New cVERAG_CustomsDeclarations_Document With {
-                        .zaDoc_ItemId = Nothing,
-                        .zaDoc_Code = ToStringSafe(doc.DocCerts_DocCd),
-                        .zaDoc_Reference = ToStringSafe(doc.DocCerts_DRef),
-                        .zaDoc_Date = ToNullableDate(doc.DocCerts_IssD)
-                    }
-                    it.Documents.Add(dd)
+
+                If p.DOC_CERTS IsNot Nothing Then
+
+                    For Each doc In p.DOC_CERTS
+                    Try
+
+                        Dim dd As New cVERAG_CustomsDeclarations_Document With {
+                                .zaDoc_ItemId = Nothing,
+                                .zaDoc_Code = ToStringSafe(doc.DocCerts_DocCd),
+                                .zaDoc_Reference = ToStringSafe(doc.DocCerts_DRef),
+                                .zaDoc_Date = ToNullableDate(doc.DocCerts_IssD)
+                            }
+                        it.Documents.Add(dd)
+                    Catch ex As Exception
+                        cErrorHandler.ERR(ex.Message, ex.StackTrace, MethodInfo.GetCurrentMethod.Name)
+                    End Try
                Next

+                End If
+
                ZA.Items.Add(it)
            Next

@@ -220,14 +230,14 @@ Public Class cImporter_TelotecToVERAG
    ' PARTY HELPER
    ' =====================================================================
    Private Sub AddParty(za As cVERAG_CustomsDeclarations,
-                         eori As String,
-                         role As String,
-                         name As Object,
-                         street As Object,
-                         plz As Object,
-                         city As Object,
-                         country As Object,
-                         uid As Object)
+                               role As String,
+                             eori As String,
+                           name As Object,
+                             street As Object,
+                             plz As Object,
+                             city As Object,
+                             country As Object,
+                             uid As Object)

        If String.IsNullOrWhiteSpace(ToStringSafe(name)) Then Exit Sub

@@ -261,7 +271,7 @@ Public Class cImporter_TelotecToVERAG
    '  Small helpers (falls du sie schon hast, kannst du diese entfernen)
    ' =========================================================================
    Private Function ToStringSafe(v As Object) As String
-        If v Is Nothing Then Return Nothing
+        If v Is Nothing Then Return ""
        Dim s As String = TryCast(v, String)
        If s IsNot Nothing Then Return s
        Return Convert.ToString(v, Globalization.CultureInfo.InvariantCulture)
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -10,6 +10,7 @@ Imports com.sun.org.apache.bcel.internal.generic
 Imports com.sun.tools.javadoc
 Imports DAKOSY_Worker
 Imports javax
+Imports DocumentFormat.OpenXml.Wordprocessing
 Imports MDM_Worker
 Imports Renci.SshNet
 Imports VERAG_PROG_ALLGEMEIN
@@ -50,6 +51,7 @@ Public Class frmStartOptions
    Private Sub frmStartOptions_Load(sender As Object, e As EventArgs) Handles Me.Load
        timer.Interval = 2500

+
        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "ROUTINE_MANAGER"
        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = 17

@@ -1123,10 +1125,10 @@ Public Class frmStartOptions
                Dim list As New List(Of Integer)

                sendMailZollbeleg(pfad, SND.tblSnd_EmpfaengerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("EMPFAENGER"), "EMPFAENGER")
-                sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND, "", "ABSENDER")
                sendMailZollbeleg(pfad, SND.tblSnd_FrachtfuehrerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("FRAECHTER"), "FRAECHTER")
                sendMailZollbeleg(pfad, SND.tblSnd_AvisiererKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AVISIERER"), "AVISIERER")
                sendMailZollbeleg(pfad, SND.tblSnd_AuftraggeberKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AUFTRAGGEBER"), "AUFTRAGGEBER")
+                sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND, "", "ABSENDER")
                sendMailZollbelegGESTELLUNGSADRESSE(pfad, SND.NCTS_ngaId, art, list, BezugsNr, SND)
            End If

@@ -1247,6 +1249,12 @@ Public Class frmStartOptions
                            'Wenn ein fixer BEtreff verwendet werden sollte:
                            If KD_ERW.EmailFreigabeBeleg_Betreff Then
                                betreff = If(KD_ERW.EmailFreigabeBeleg_BetreffText, "")
+                                betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr, ""))
+
+                            Else
+
+                                betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
+
                            End If

                            betreff = betreff.Replace("%LKW%", AVISO.LKW_Nr)
@@ -1324,7 +1332,7 @@ Public Class frmStartOptions
                            ''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

                            '!!!!!!!!!!!!!!!!!!!!!!!!!!
-                            'EMails = "luxbauer@gmail.com"
+                            'EMails = "al@verag.ag"
                            'EMails_CC = ""
                            'EMails_BCC = ""
                            '!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -7238,9 +7246,18 @@ repeatRequest:
    End Sub

    Private Sub Button29_Click_1(sender As Object, e As EventArgs) Handles Button29.Click
-        'Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True)
-        Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7701ACA0024DR0", True)
-        ZA.checkfreshCBAMWarning()
+
+        ' doMailZollbeleg("", "STB", 725002)
+
+        'Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(1956266)
+        'Dim list As New List(Of Integer)
+
+        'sendMailZollbeleg("", SND.tblSnd_AuftraggeberKdNr, "STB", list, "4803/26002277A", SND, SND.getKdAtrNr("AUFTRAGGEBER"), "AUFTRAGGEBER")
+
+
+        ''Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True)
+        'Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7701ACA0024DR0", True)
+        'ZA.checkfreshCBAMWarning()

    End Sub