edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2020-06-22 13:32:28 +02:00
parent 3d67139c09
commit 2d85480c4c
25 changed files with 30373 additions and 2360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut.vb
View File

@@ -977,7 +977,7 @@ Public Class cDakosyNCTSOut
SPEDITIONSBUCH.BelegNr = DY.ncts_MRN
SPEDITIONSBUCH.LKW_Kennzeichen = If(DY.ncts_Befoerderungsmittel_KennzeichenAbgang, "")
Dim AD = getAdresseFromEORI(DY.ncts_SumA_Versender_EORI, SQL)
Dim AD = getAdresseFromEORI(DY.ncts_SumA_Versender_EORI, DY.ncts_SumA_Versender_NLNR, SQL)
If AD IsNot Nothing Then
SPEDITIONSBUCH.AbsenderKundenNr = AD.AdressenNr
SPEDITIONSBUCH.Absender = AD.Ordnungsbegriff
@@ -990,7 +990,7 @@ Public Class cDakosyNCTSOut
SPEDITIONSBUCH.Absender &= " " & If(DY.ncts_SumA_Versender_Ort, "")
ElseIf DY.ncts_WARENPOS.Count > 0 Then
Dim WP = DY.ncts_WARENPOS(0)
Dim AD_pos = getAdresseFromEORI(WP.nctsWP_SumAVersender_EORI, SQL)
Dim AD_pos = getAdresseFromEORI(WP.nctsWP_SumAVersender_EORI, WP.nctsWP_SumAVersender_NLNR, SQL)
If AD_pos IsNot Nothing Then
SPEDITIONSBUCH.AbsenderKundenNr = AD_pos.AdressenNr
SPEDITIONSBUCH.Absender = AD_pos.Ordnungsbegriff
@@ -1008,7 +1008,7 @@ Public Class cDakosyNCTSOut
End If
Dim AD2 = getAdresseFromEORI(DY.ncts_SumA_Empfaenger_EORI, SQL)
Dim AD2 = getAdresseFromEORI(DY.ncts_SumA_Empfaenger_EORI, DY.ncts_SumA_Empfaenger_NLNR, SQL)
If AD2 IsNot Nothing Then
SPEDITIONSBUCH.EmpfängerKundenNr = AD2.AdressenNr
SPEDITIONSBUCH.Empfänger = AD2.Ordnungsbegriff
@@ -1021,7 +1021,7 @@ Public Class cDakosyNCTSOut
SPEDITIONSBUCH.Empfänger &= " " & If(DY.ncts_SumA_Empfaenger_Ort, "")
ElseIf DY.ncts_WARENPOS.Count > 0 Then
Dim WP = DY.ncts_WARENPOS(0)
Dim AD_pos = getAdresseFromEORI(WP.nctsWP_SumAEmpfaenger_EORI, SQL)
Dim AD_pos = getAdresseFromEORI(WP.nctsWP_SumAEmpfaenger_EORI, WP.nctsWP_SumAEmpfaenger_NLNR, SQL)
If AD_pos IsNot Nothing Then
SPEDITIONSBUCH.EmpfängerKundenNr = AD_pos.AdressenNr
SPEDITIONSBUCH.Empfänger = AD_pos.Ordnungsbegriff
@@ -1076,10 +1076,10 @@ Public Class cDakosyNCTSOut
End Sub
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