neu

DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb

@@ -28,25 +28,56 @@
     '    getDataByBezugsnummer(BezugsNr, Abfertigungsart)
     'End Sub
 
-    Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean
+    Function getATAMRNBezugsnummer(BezugsNr As String, Abfertigungsart As String) As String
+        getATAMRNBezugsnummer = ""
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
-            Case "UNISPED"
+            ' Case "IMEX"
+            ' Case "UNISPED"
+            Case ""
             Case Else
                 Select Case Abfertigungsart
                     Case 38, 26 'AT
-                    '    getADFrom_EZOLL 
-                    Case 1, 2, 3, 28
-                        If load_EZA_FromDAKOSY(BezugsNr) Then Return True
+                        '    getADFrom_EZOLL 
+                        getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr) 'Ü-T1
+                    Case 1, 2, 3, 28, 39
+                        getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr)
                         '... and Systeme
 
-                    Case 5, 6
-                        If load_NCTS_FromDAKOSY(BezugsNr) Then Return True
+                    Case Else
+                        getATAMRNBezugsnummer = load_NCTS_MRN_FromDAKOSY(BezugsNr)
+                        If getATAMRNBezugsnummer = "" Then 'Falls doch nicht    
+                            getATAMRNBezugsnummer = load_EZA_ATA_FromDAKOSY(BezugsNr)
+                        End If
+                End Select
+        End Select
+
+    End Function
+
+    Function getDataByBezugsnummer(BezugsNr As String, Abfertigungsart As String) As Boolean
+        getDataByBezugsnummer = False
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            '  Case "UNISPED"
+            Case ""
+            Case Else
+                Select Case Abfertigungsart
+                    Case 38, 26 'AT
+                        '    getADFrom_EZOLL 
+                        getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr)'Ü-T1
+                    Case 1, 2, 3, 28, 39
+                        getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr)
+                        '... and Systeme
+
+                    Case Else
+                        getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr)
+                        If Not getDataByBezugsnummer Then 'Falls doch nicht    
+                            getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr)
+                        End If
                 End Select
         End Select
         Return False
     End Function
 
+
     Function addIfNotExists(ByRef LIST As List(Of String), addstring As String) As List(Of String)
         If addstring = "" Then Return LIST
         For Each s In LIST
@@ -64,12 +95,28 @@
         If listToString <> "" Then listToString = listToString.Substring(2)
     End Function
 
+
+    Function load_EZA_ATA_FromDAKOSY(BezugsNr) As String
+        Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True)
+        If EZA Is Nothing Then Return ""
+        Return If(EZA.eza_ANR, If(EZA.eza_MRN, ""))
+    End Function
+
+    Function load_NCTS_MRN_FromDAKOSY(BezugsNr) As String
+        Dim NCTS = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True)
+        If NCTS Is Nothing Then Return ""
+        Return If(NCTS.ncts_MRN, If(NCTS.ncts_ANR, ""))
+    End Function
+
+
+
     Function load_EZA_FromDAKOSY(BezugsNr) As Boolean
         Dim EZA = DAKOSY_Worker.cDakosyEZA.LOADByBezugsNr(BezugsNr, True)
         If EZA Is Nothing Then Return False
         Return load_EZA_FromDAKOSY(EZA)
     End Function
 
+
     Function load_EZA_FromDAKOSY(EZA As DAKOSY_Worker.cDakosyEZA) As Boolean
         Try
             If EZA Is Nothing Then Return Nothing