This commit is contained in:
2020-06-22 13:32:28 +02:00
parent 3d67139c09
commit 2d85480c4c
25 changed files with 30373 additions and 2360 deletions

View File

@@ -752,7 +752,7 @@ Public Class cTelotec_Anmeldung
'Versender 'Verkäufer
If If(DY.ConorTra_Na, "") <> "" Or If(DY.ConorTra_TIN, "") Then
Dim AD = getAdresseFromEORI(DY.ConorTra_TIN, SQL)
Dim AD = getAdresseFromEORI(DY.ConorTra_TIN, "", SQL)
If AD IsNot Nothing Then
SPEDITIONSBUCH.AbsenderKundenNr = AD.AdressenNr
SPEDITIONSBUCH.Absender = AD.Ordnungsbegriff
@@ -773,7 +773,7 @@ Public Class cTelotec_Anmeldung
'Empfänger
If If(DY.ConeeTra_Na, "") <> "" Or If(DY.ConeeTra_TIN, "") Then
Dim AD = getAdresseFromEORI(DY.ConeeTra_TIN, SQL)
Dim AD = getAdresseFromEORI(DY.ConeeTra_TIN, "", SQL)
If AD IsNot Nothing Then
SPEDITIONSBUCH.EmpfängerKundenNr = AD.AdressenNr
SPEDITIONSBUCH.Empfänger = AD.Ordnungsbegriff
@@ -879,7 +879,7 @@ Public Class cTelotec_Anmeldung
'Versender 'Verkäufer
If If(DY.ConorTra_Na, "") <> "" Or If(DY.ConorTra_TIN, "") <> "" Then
Dim AD = getAdresseFromEORI(DY.ConorTra_TIN, SQL)
Dim AD = getAdresseFromEORI(DY.ConorTra_TIN, "", SQL)
If AD IsNot Nothing Then
SPEDITIONSBUCH.AbsenderKundenNr = AD.AdressenNr
SPEDITIONSBUCH.Absender = AD.Ordnungsbegriff
@@ -900,7 +900,7 @@ Public Class cTelotec_Anmeldung
'Empfänger
If If(DY.ConeeTra_Na, "") <> "" Or If(DY.ConeeTra_TIN, "") <> "" Then
Dim AD = getAdresseFromEORI(DY.ConeeTra_TIN, SQL)
Dim AD = getAdresseFromEORI(DY.ConeeTra_TIN, "", SQL)
If AD IsNot Nothing Then
SPEDITIONSBUCH.EmpfängerKundenNr = AD.AdressenNr
SPEDITIONSBUCH.Empfänger = AD.Ordnungsbegriff
@@ -994,10 +994,10 @@ Public Class cTelotec_Anmeldung
End Function
Shared Function getAdresseFromEORI(EORI As String, SQL As VERAG_PROG_ALLGEMEIN.SQL)
Shared Function getAdresseFromEORI(EORI As String, EORI_NL As String, SQL As VERAG_PROG_ALLGEMEIN.SQL)
If EORI Is Nothing Then Return Nothing
If If(EORI, "") <> "" Then
Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI)
Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL)
If IsNumeric(kdNrTmp) Then
Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdNrTmp)
Return ADRESSE