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/cZOLL_IMPORT.vb
View File

@@ -989,8 +989,8 @@ Public Class cZOLL_IMPORT
' MsgBox(fNEF.txtAbsender.Text)
If SPEDITIONSBUCH.Absender = "" Then setAdresseAndKundenNr(SPEDITIONSBUCH.Absender, SPEDITIONSBUCH.AbsenderKundenNr, 3, 1, r.Item("zbant_verszb"), r.Item("basman_nr"), r.Item("basman_nl"), r.Item("zbant_beznr"), r.Item("zbant_regnr"), r.Item("zbant_korant"), r.Item("zbant_vland"), r.Item("zbant_verseori"))
If SPEDITIONSBUCH.Empfänger = "" Then setAdresseAndKundenNr(SPEDITIONSBUCH.Empfänger, SPEDITIONSBUCH.EmpfängerKundenNr, 4, 2, r.Item("zbant_anmzb"), r.Item("basman_nr"), r.Item("basman_nl"), r.Item("zbant_beznr"), r.Item("zbant_regnr"), r.Item("zbant_korant"), r.Item("zbant_vland"), r.Item("zbant_anmeori"))
If SPEDITIONSBUCH.Absender = "" Then setAdresseAndKundenNr(SPEDITIONSBUCH.Absender, SPEDITIONSBUCH.AbsenderKundenNr, 3, 1, r.Item("zbant_verszb"), r.Item("basman_nr"), r.Item("basman_nl"), r.Item("zbant_beznr"), r.Item("zbant_regnr"), r.Item("zbant_korant"), r.Item("zbant_vland"), r.Item("zbant_verseori"), "")
If SPEDITIONSBUCH.Empfänger = "" Then setAdresseAndKundenNr(SPEDITIONSBUCH.Empfänger, SPEDITIONSBUCH.EmpfängerKundenNr, 4, 2, r.Item("zbant_anmzb"), r.Item("basman_nr"), r.Item("basman_nl"), r.Item("zbant_beznr"), r.Item("zbant_regnr"), r.Item("zbant_korant"), r.Item("zbant_vland"), r.Item("zbant_anmeori"), "")
' If SPEDITIONSBUCH.Vermittler = "" Then setAdresseAndKundenNr(SPEDITIONSBUCH.Vermittler, SPEDITIONSBUCH.VermittlerKundenNr, -1, 3, r.Item("zbant_vertzb"), r.Item("basman_nr"), r.Item("basman_nl"), r.Item("zbant_beznr"), r.Item("zbant_regnr"), r.Item("zbant_korant"), r.Item("zbant_vland"), r.Item("zbant_verteori"))
@@ -1285,10 +1285,10 @@ Public Class cZOLL_IMPORT
Function getAdresseFromEORI(EORI)
Function getAdresseFromEORI(EORI, EORI_NL)
If EORI Is Nothing Then Return Nothing
If If(EORI, "") <> "" Then
Dim kdNrTmp = KDSQL.getFMZOLLKdNrFromEORI(EORI)
Dim kdNrTmp = KDSQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL)
If IsNumeric(kdNrTmp) Then
Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdNrTmp)
Return ADRESSE
@@ -1610,12 +1610,12 @@ Public Class cZOLL_IMPORT
Return False
End Function
Sub setAdresseAndKundenNr(ByRef KUNDE_TXT As String, ByRef KUNDE_KDNR As Integer, Adr_zbadz_typ As Integer, intTyp As Integer, ByVal zollNr As String, ByVal basman_nr As String, ByVal basman_nl As String, ByVal zbant_beznr As String, ByVal zbant_regnr As String, ByVal zbant_korant As String, zbant_vland As String, eori As String)
Sub setAdresseAndKundenNr(ByRef KUNDE_TXT As String, ByRef KUNDE_KDNR As Integer, Adr_zbadz_typ As Integer, intTyp As Integer, ByVal zollNr As String, ByVal basman_nr As String, ByVal basman_nl As String, ByVal zbant_beznr As String, ByVal zbant_regnr As String, ByVal zbant_korant As String, zbant_vland As String, eori As String, eori_NL As String)
Dim kunde_tmp As String = ""
Dim kdnr_tmp As String = ""
If KUNDE_TXT = "" And KUNDE_KDNR <= 0 Then
kdnr_tmp = KDSQL.getFMZOLLKdNrFromEORI(eori)
kdnr_tmp = KDSQL.getFMZOLLKdNrFromEORI(eori, eori_NL)
If IsNull(kdnr_tmp) Then
If Not IsNull(zollNr) AndAlso IsNumeric(zollNr) AndAlso zollNr <> 0 Then
kdnr_tmp = KDSQL.getATLASKdNrFromZollNr(zollNr)