NEU

DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb

@@ -499,13 +499,13 @@ Public Class cDakosyNCTSOut
         End Try
         Return LOADByAnmID
     End Function
-    Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean) As cDakosyNCTSOut
+    Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False) As cDakosyNCTSOut
         Try
             Dim NCTS As New cDakosyNCTSOut
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName=@bezugsNr  ", conn)
+                Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_NCTSOut WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_LetzteBearbeitung desc", conn)
                     cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
                     Dim dr = cmd.ExecuteReader()
                     If dr.Read Then
@@ -761,6 +761,11 @@ Public Class cDakosyNCTSOut
                 Dim filialeBez = ""
                 Dim filiale = getFiliale(Me.ncts_ObjectName, filialeBez)
                 Dim abfertigungsnummer = getAbfertigungsnummer(Me.ncts_ObjectName)
+
+                If abfertigungsnummer = "" Then
+                    getFilialeAbfertigungsnummerFromSendung(filiale, abfertigungsnummer, DY.dy_SendungsId)
+                End If
+
                 If filiale <> "" And abfertigungsnummer <> "" Then
                     ' If countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) = 0 Then
                     If countSpedbuchEntrys(filiale, Me.ncts_ObjectName) = 0 Then
@@ -815,6 +820,9 @@ Public Class cDakosyNCTSOut
                 Case "5003" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
                 Case "5103" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
                 Case "5303" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
+                Case "5501", "5601", "5701", "5801" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
+                Case Else
+                    If IsNumeric(bezugsNr.ToString.Substring(0, 4)) Then Return bezugsNr.ToString.Substring(0, 4)    'Case Else : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
                     'Case "4801", "4803", "4805", "4807", "4811", "5003", "5103", "5303" : Return bezugsNr.ToString.Substring(0, 4) ...... derzeit nur 4803
                     'filialeBez SUB, NKD, WAI,.-..
             End Select
@@ -831,7 +839,7 @@ Public Class cDakosyNCTSOut
                 If Not IsNumeric(s) Then Exit For
                 abf &= s
             Next
-     
+
 
             If IsNumeric(abf) Then
                 If CLng(abf) < 99000000 Then ' wenn zu groß, fehlerhaft
@@ -845,6 +853,16 @@ Public Class cDakosyNCTSOut
         End If
         Return ""
     End Function
+    Sub getFilialeAbfertigungsnummerFromSendung(ByRef filiale, ByRef abfertigungsnummer, dy_SendungsId)
+        If dy_SendungsId IsNot Nothing AndAlso IsNumeric(dy_SendungsId) Then
+            Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
+            If SND IsNot Nothing Then
+                If SND.FilialenNr > 0 Then filiale = SND.FilialenNr
+                If SND.AbfertigungsNr > 0 Then abfertigungsnummer = SND.AbfertigungsNr
+            End If
+        End If
+    End Sub
+
 
     Public Shared Sub DakosyNCTSDatenbereitstellung(ByRef SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, NCTS_Nr As String, ByRef notFound As Boolean)
         Dim DY As DAKOSY_Worker.cDakosyNCTSOut = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(NCTS_Nr, True)