TruckMaster

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -987,9 +987,20 @@ Public Class SQL
         End Select
         Return where
     End Function
-    Public Function getFMZOLLKdNrFromEORI(ByVal eori As String, eoriNL As String) As String
+    Function getFirmaWhere(Firma As String)
+        Dim where = ""
+        Select Case Firma
+            Case "IMEX" : where &= " AND [FilialenNr]='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, eoriNL As String, Firma As String) As String
         Dim s As String = ""
-        Dim where = getFirmaWhere()
+        Dim where = getFirmaWhere(Firma)
 
         Try
             Dim conn As SqlConnection = GetNewOpenConnectionFMZOLL()

VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb

@@ -958,10 +958,10 @@ Public Class cNCTS_TR
 
 
 
-    Shared Function getAdresseFromEORI(EORI As String, EORI_NL As String, SQL As VERAG_PROG_ALLGEMEIN.SQL)
+    Shared Function getAdresseFromEORI(EORI As String, EORI_NL As String, SQL As VERAG_PROG_ALLGEMEIN.SQL, Firma As String)
         If EORI Is Nothing Then Return Nothing
         If If(EORI, "") <> "" Then
-            Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL)
+            Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL, Firma)
             If IsNumeric(kdNrTmp) Then
                 Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdNrTmp)
                 Return ADRESSE