neu

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -653,15 +653,20 @@ Public Class SQL
         Return Nothing
     End Function
 
-
-    Public Function getFMZOLLKdNrFromEORI(ByVal eori As String) As String
-        Dim s As String = ""
+    Function getFirmaWhere()
         Dim where = ""
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX" : where &= " AND [FilialenNr]='5501'  "
-            Case Else : where &= " AND isnull([FilialenNr],0)<>'5501' "
+            Case "UNISPED" : where &= " AND [FilialenNr]='5601'  "
+            Case "AMBAR" : where &= " AND [FilialenNr]='5701'  "
+            Case "FRONTOFFICE" : where &= " AND [FilialenNr]='5801'  "
+            Case Else : where &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') "
         End Select
-
+        Return where
+    End Function
+    Public Function getFMZOLLKdNrFromEORI(ByVal eori As String) As String
+        Dim s As String = ""
+        Dim where = getFirmaWhere()
 
         Try
             Dim conn As SqlConnection = GetNewOpenConnectionFMZOLL()
@@ -904,11 +909,7 @@ Public Class SQL
 
     Public Function getATLASKdNrFromZollNr(ByVal ZollNr As String) As String
         Dim s As String = ""
-        Dim where = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX" : where &= " AND [FilialenNr]='5501'  "
-            Case Else : where &= " AND isnull([FilialenNr],0)<>'5501' "
-        End Select
+        Dim where = getFirmaWhere()
 
         Try
             Dim conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL