NEU

2020-01-08 13:18:12 +01:00
parent de1d935624
commit a6964d7082
28 changed files with 3853 additions and 1086 deletions
--- a/initATLASAufschubkonten/cWorker_NCTS.vb
+++ b/initATLASAufschubkonten/cWorker_NCTS.vb
@@ -26,7 +26,7 @@ Public Class cWorker_NCTS
                    outputFile.Close()


-
+                    Dim AnsprechpTMP_Email = ""
                    Dim DETUDC As DAKOSY_Worker.DETUDC.DETUDC = DAKOSY_Worker.DETUDC.DETUDC.LoadFromFile(p)
                    '  Dim NCTS As New DAKOSY_Worker.cDakosyNCTS

@@ -162,26 +162,32 @@ Public Class cWorker_NCTS
                                        End If
                                    End If
                                    If DETUDC.ProcedureOwner.ContactPerson.MailAddress IsNot Nothing Then
-                                        Dim AnsprechpTMP_Email = DETUDC.ProcedureOwner.ContactPerson.MailAddress
-                                        If AnsprechpTMP_Email.Contains("@imex") Then
-                                            NCTS.ncts_firma = "IMEX"
-                                            NCTS.ncts_niederlassung = "IMEX"
-                                            'GLOBAL--> EORI
-                                        ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
-                                            NCTS.ncts_firma = "AMBAR"
-                                            NCTS.ncts_niederlassung = "AMBAR"
-                                        ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
-                                            NCTS.ncts_firma = "ATILLA"
-                                            NCTS.ncts_niederlassung = "SUB"
-                                        ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
-                                            NCTS.ncts_firma = "DURMAZ"
-                                            NCTS.ncts_niederlassung = "SBG"
-                                            'GLOBAL--> EORI
-                                        ElseIf AnsprechpTMP_Email.Contains("@verag") Then
-                                            NCTS.ncts_firma = "VERAG"
-                                            '   EZA.eza_niederlassung = "IMEX"
-                                            'GLOBAL--> EORI
-                                        End If
+                                        AnsprechpTMP_Email = DETUDC.ProcedureOwner.ContactPerson.MailAddress
+
+
+                                        'If AnsprechpTMP_Email.Contains("@imex") Then
+                                        '    NCTS.ncts_firma = "IMEX"
+                                        '    NCTS.ncts_niederlassung = "IMEX"
+                                        '    'GLOBAL--> EORI
+                                        'ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
+                                        '    NCTS.ncts_firma = "AMBAR"
+                                        '    NCTS.ncts_niederlassung = "AMBAR"
+                                        'ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
+                                        '    NCTS.ncts_firma = "ATILLA"
+                                        '    NCTS.ncts_niederlassung = "SUB"
+                                        'ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
+                                        '    NCTS.ncts_firma = "DURMAZ"
+                                        '    NCTS.ncts_niederlassung = "SBG"
+                                        '    'GLOBAL--> EORI
+                                        'ElseIf AnsprechpTMP_Email.Contains("@verag") Then
+                                        '    NCTS.ncts_firma = "VERAG"
+                                        '    '   EZA.eza_niederlassung = "IMEX"
+                                        '    'GLOBAL--> EORI
+                                        'ElseIf AnsprechpTMP_Email.Contains("@unisped") Then
+                                        '    NCTS.ncts_firma = "UNISPED"
+                                        '    NCTS.ncts_niederlassung = "ATSP"
+                                        '    'GLOBAL--> EORI
+                                        'End If
                                    End If
                                End If
                            End If
@@ -371,6 +377,8 @@ Public Class cWorker_NCTS
                        End If
                    End If

+                    frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, If(AnsprechpTMP_Email, "").ToString, readNCTS_VersandanmeldungXML)
+
                    If If(NCTS.ncts_Status, 0) <= 5 Then NCTS.ncts_Status = DAKOSY_Worker.cDY_Statusliste.S_05
                    ' If If(NCTS.ncts_Status_KEWILL_Equivalent, 0) <= 5 Then NCTS.ncts_Status_KEWILL_Equivalent = DAKOSY_Worker.cDY_Statusliste.S_05
                    NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status
@@ -842,29 +850,34 @@ Public Class cWorker_NCTS
            For Each l In lines
                If l.StartsWith("COM+") Then

-                    If l.Contains("@imex") Then
-                        NCTS.ncts_firma = "IMEX"
-                        NCTS.ncts_niederlassung = "IMEX"
-                        'GLOBAL--> EORI
-                    ElseIf l.Contains("@ambar") Then
-                        NCTS.ncts_firma = "AMBAR"
-                        NCTS.ncts_niederlassung = "AMBAR"
+                    frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, l, "")

-                    ElseIf l.Contains("atilla@verag.ag") Or l.Contains("@atilla") Then
-                        NCTS.ncts_firma = "ATILLA"
-                        NCTS.ncts_niederlassung = "SUB"
-                    ElseIf l.Contains("@durmaz") Then
-                        NCTS.ncts_firma = "DURMAZ"
-                        NCTS.ncts_niederlassung = "SBG"
+                    'If l.Contains("@imex") Then
+                    '    NCTS.ncts_firma = "IMEX"
+                    '    NCTS.ncts_niederlassung = "IMEX"
+                    '    'GLOBAL--> EORI
+                    'ElseIf l.Contains("@ambar") Then
+                    '    NCTS.ncts_firma = "AMBAR"
+                    '    NCTS.ncts_niederlassung = "AMBAR"
+
+                    'ElseIf l.Contains("atilla@verag.ag") Or l.Contains("@atilla") Then
+                    '    NCTS.ncts_firma = "ATILLA"
+                    '    NCTS.ncts_niederlassung = "SUB"
+                    'ElseIf l.Contains("@durmaz") Then
+                    '    NCTS.ncts_firma = "DURMAZ"
+                    '    NCTS.ncts_niederlassung = "SBG"


-                        'GLOBAL--> EORI
-                    ElseIf l.Contains("@verag") Then
-                        NCTS.ncts_firma = "VERAG"
-                        '   EZA.eza_niederlassung = "IMEX"
-                        'GLOBAL--> EORI
+                    '    'GLOBAL--> EORI
+                    'ElseIf l.Contains("@verag") Then
+                    '    NCTS.ncts_firma = "VERAG"
+                    '    '   EZA.eza_niederlassung = "IMEX"
+                    '    'GLOBAL--> EORI

-                    End If
+                    'ElseIf l.Contains("@unisped") Then
+                    '    NCTS.ncts_firma = "UNISPED"
+                    '    NCTS.ncts_niederlassung = "ATSP"
+                    'End If
                End If
            Next

@@ -944,28 +957,35 @@ Public Class cWorker_NCTS

                            If DETBAE.AuthorisedConsignee.ContactPerson.MailAddress IsNot Nothing Then
                                AnsprechpTMP_Email = DETBAE.AuthorisedConsignee.ContactPerson.MailAddress
-                                If AnsprechpTMP_Email.Contains("@imex") Then
-                                    NCTS.ncts_firma = "IMEX"
-                                    NCTS.ncts_niederlassung = "IMEX"
-                                    'GLOBAL--> EORI
-                                ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
-                                    NCTS.ncts_firma = "AMBAR"
-                                    NCTS.ncts_niederlassung = "AMBAR"
-                                ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
-                                    NCTS.ncts_firma = "ATILLA"
-                                    NCTS.ncts_niederlassung = "SUB"
-                                ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
-                                    NCTS.ncts_firma = "DURMAZ"
-                                    NCTS.ncts_niederlassung = "SBG"
-                                    'GLOBAL--> EORI
-                                ElseIf AnsprechpTMP_Email.Contains("@verag") Then
-                                    NCTS.ncts_firma = "VERAG"
-                                    '   EZA.eza_niederlassung = "IMEX"
-                                    'GLOBAL--> EORI
-                                End If
+
+                                'If AnsprechpTMP_Email.Contains("@imex") Then
+                                '    NCTS.ncts_firma = "IMEX"
+                                '    NCTS.ncts_niederlassung = "IMEX"
+                                '    'GLOBAL--> EORI
+                                'ElseIf AnsprechpTMP_Email.Contains("@ambar") Then
+                                '    NCTS.ncts_firma = "AMBAR"
+                                '    NCTS.ncts_niederlassung = "AMBAR"
+                                'ElseIf AnsprechpTMP_Email.Contains("atilla@verag.ag") Or AnsprechpTMP_Email.Contains("@atilla") Then
+                                '    NCTS.ncts_firma = "ATILLA"
+                                '    NCTS.ncts_niederlassung = "SUB"
+                                'ElseIf AnsprechpTMP_Email.Contains("@durmaz") Then
+                                '    NCTS.ncts_firma = "DURMAZ"
+                                '    NCTS.ncts_niederlassung = "SBG"
+                                '    'GLOBAL--> EORI
+                                'ElseIf AnsprechpTMP_Email.Contains("@verag") Then
+                                '    NCTS.ncts_firma = "VERAG"
+                                '    '   EZA.eza_niederlassung = "IMEX"
+                                'ElseIf AnsprechpTMP_Email.Contains("@unisped") Then
+                                '    NCTS.ncts_firma = "UNISPED"
+                                '    NCTS.ncts_niederlassung = "ATSP"
+                                '    'GLOBAL--> EORIAnsprechpTMP_Email
+                                'End If
                            End If
+
+                            frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, If(AnsprechpTMP_Email, "").ToString, "")
+
                        Else
-                                Return "" 'Keine Bezugsnummer
+                            'Return "" 'Keine Bezugsnummer
                        End If
                    End If

@@ -1220,20 +1240,21 @@ Public Class cWorker_NCTS
                NCTS_TMP.ncts_Status_KEWILL_Equivalent = DY_TMP.dy_Status 'weil der Status bereit überprüft wurde --> neuste TransaktionsID
            End If
            'NCTS_TMP.ncts_Status_KEWILL_Equivalent = STATUS.dySt_status
-
-            If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR
-            If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN
+            If ANR <> "" Or MRN <> "" Then
+                If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR
+                If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN
+            End If
            NCTS_TMP.SAVE()
            'Eintragen
        Else
            'Update     
            NCTS_TMP.UPDATE_Status(DY_TMP.dy_Status) 'weil der Status bereit überprüft wurde --> neuste TransaktionsID
-
-            If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR : NCTS_TMP.SAVE()
-            If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN : NCTS_TMP.SAVE()
-
+            If ANR <> "" Or MRN <> "" Then
+                If ANR <> "" Then NCTS_TMP.ncts_ANR = ANR : NCTS_TMP.SAVE()
+                If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN : NCTS_TMP.SAVE()
+            End If
        End If
-        saveDY_NCTS = NCTS_TMP
+            saveDY_NCTS = NCTS_TMP
    End Function

    Shared Sub SaveNCTS_FirmaNL(ByRef NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, division As String)
@@ -1271,6 +1292,9 @@ Public Class cWorker_NCTS
                    Case "NEU"
                        NCTS_TMP.ncts_firma = "VERAG"
                        NCTS_TMP.ncts_niederlassung = "NEU"
+                    Case "ATSP", "ATSPED"
+                        NCTS_TMP.ncts_firma = "UNISPED"
+                        NCTS_TMP.ncts_niederlassung = "ATSP"
                End Select
                NCTS_TMP.SAVE()
            End If
@@ -1388,11 +1412,11 @@ Public Class cWorker_NCTS
                        'UNBEKANNT ?????
                End Select
                STATUS.dySt_ergCode = "DY_" & status_DY
-                STATUS.dySt_ergMitteilung = grund
+                STATUS.dySt_ergMitteilung = MRN & grund
                If tstmp IsNot Nothing Then STATUS.dySt_ergZeitpunkt = tstmp
                'EINTRAG IN tblDakosy_Zollanmeldungen
-                Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = FORM.saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, STATUS.dySt_ergZeitpunkt, "NCTS")
-                Dim NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut = saveDY_NCTS(STATUS, DY_TMP, NCTS.Transaktion.IOReferenz, STATUS.dySt_ergZeitpunkt, , MRN)
+                Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = FORM.saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "NCTS")
+                Dim NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut = saveDY_NCTS(STATUS, DY_TMP, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, , "") 'MRN)


                SaveNCTS_FirmaNL(NCTS_TMP, DY_TMP, division)
@@ -1895,7 +1919,8 @@ Public Class cWorker_NCTS

                STATUS.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_53
                STATUS.dySt_ergCode = "TSTMP"
-                STATUS.dySt_ergMitteilung = ""
+                STATUS.dySt_ergMitteilung = MRN
+                ' STATUS.dySt_ergMitteilung = ""
                If tstmp IsNot Nothing Then STATUS.dySt_ergZeitpunkt = tstmp
                'EINTRAG IN tblDakosy_Zollanmeldungen
                Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = FORM.saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, If(tstmp, NCTS.Transaktion.IODatumZeit), "NCTS")