NCTS_TR CC015B, ATLAS Codelisten, BugFixes DY Nachrichtenverarbeitung, EZOLL: Zollbeleg versenden
This commit is contained in:
@@ -25,6 +25,7 @@ Public Class cZOLL_IMPORT
|
||||
Function countSpedbuchEntrysTC(filiale, BezugsNr, telanm_ART) As Integer
|
||||
Select Case telanm_ART
|
||||
Case "NCTS", "T1", "T2", "T2L" : Return countSpedbuchEntrysTC_EZA(filiale, BezugsNr)
|
||||
Case "AES" : Return countSpedbuchEntrysTC_AES(filiale, BezugsNr)
|
||||
Case Else : Return countSpedbuchEntrysTC_EZA(filiale, BezugsNr)
|
||||
End Select
|
||||
|
||||
@@ -35,6 +36,11 @@ Public Class cZOLL_IMPORT
|
||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AtlasBezNrEZA]='" & BezugsNr & "'", "FMZOLL",, 0)
|
||||
End Function
|
||||
|
||||
Function countSpedbuchEntrysTC_AES(filiale, BezugsNr) As Integer
|
||||
If If(BezugsNr, "") = "" Then Return -1
|
||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND [AtlasBezNrAES]='" & BezugsNr & "'", "FMZOLL",, 0)
|
||||
End Function
|
||||
|
||||
|
||||
Function countSpedbuchEntrysTC_NCTS(filiale, BezugsNr) As Integer
|
||||
If If(BezugsNr, "") = "" Then Return -1
|
||||
@@ -314,7 +320,7 @@ Public Class cZOLL_IMPORT
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Function EZOLLImport(LRN, art) As Boolean
|
||||
Public Shared Function EZOLLImport(LRN, art, Optional ByRef SPEDBUCH_TMP = Nothing) As Boolean
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'Wichtig für Spedbucheintrag
|
||||
Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
|
||||
@@ -334,6 +340,7 @@ Public Class cZOLL_IMPORT
|
||||
Dim abfertigungsnummer = getAbfertigungsnummer(LRN)
|
||||
|
||||
If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then
|
||||
SPEDBUCH_TMP = SPEDBUCH
|
||||
If filiale <> "" And abfertigungsnummer <> "" Then
|
||||
If countSpedbuchEntrys(filiale, LRN, art) = 0 Then
|
||||
|
||||
@@ -353,11 +360,13 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
Select Case art
|
||||
Case "NCTS" : SPEDBUCH.AtlasBezNrNCTS = LRN
|
||||
Case "AES" : SPEDBUCH.AtlasBezNrAES = LRN
|
||||
Case Else : SPEDBUCH.AtlasBezNrEZA = LRN
|
||||
End Select
|
||||
|
||||
SPEDBUCH = ZOLL_IMPORT.IMPORT(SPEDBUCH, SPEDBUCH.AvisoID, SPEDBUCH.SendungID, "VERA", filialeBez, 1, SPEDBUCH.AtlasBezNrEZA, SPEDBUCH.AtlasBezNrNCTS, notfound, True)
|
||||
SPEDBUCH = ZOLL_IMPORT.IMPORT(SPEDBUCH, SPEDBUCH.AvisoID, SPEDBUCH.SendungID, "VERA", filialeBez, 1, SPEDBUCH.AtlasBezNrEZA, SPEDBUCH.AtlasBezNrNCTS, notfound, True,, SPEDBUCH.AtlasBezNrAES)
|
||||
|
||||
SPEDBUCH_TMP = SPEDBUCH
|
||||
If notfound Then Return False
|
||||
' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA !!", "" & Me.eza_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "")
|
||||
|
||||
@@ -447,6 +456,7 @@ Public Class cZOLL_IMPORT
|
||||
Case "5003" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
|
||||
Case "5103" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
|
||||
Case "5303" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
|
||||
Case "7001" : Return bezugsNr.ToString.Substring(0, 4) '...... derzeit nur 4803
|
||||
'Case "4801", "4803", "4805", "4807", "4811", "5003", "5103", "5303" : Return bezugsNr.ToString.Substring(0, 4) ...... derzeit nur 4803
|
||||
'filialeBez SUB, NKD, WAI,.-..
|
||||
End Select
|
||||
@@ -528,6 +538,8 @@ Public Class cZOLL_IMPORT
|
||||
If EZA_Nr <> "" Then
|
||||
' SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||
EZollEZADatenbereitstellung(EZA_Nr)
|
||||
ElseIf AES_Nr <> "" Then
|
||||
EZollEZADatenbereitstellung(AES_Nr) ' ????
|
||||
ElseIf NCTS_Nr <> "" Then
|
||||
' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
|
||||
EZollNCTSDatenbereitstellung(NCTS_Nr)
|
||||
@@ -708,6 +720,7 @@ Public Class cZOLL_IMPORT
|
||||
SPEDITIONSBUCH.HandlingZuKassieren = SENDUNG.tblSnd_BARzuKassieren
|
||||
End If
|
||||
|
||||
|
||||
If SPEDITIONSBUCH.AbsenderKundenNr Is Nothing OrElse SPEDITIONSBUCH.AbsenderKundenNr <= 0 Then
|
||||
If SENDUNG.tblSnd_AbsenderKdNr > 0 Then
|
||||
SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr
|
||||
@@ -716,15 +729,16 @@ Public Class cZOLL_IMPORT
|
||||
End If
|
||||
|
||||
If SPEDITIONSBUCH.EmpfängerKundenNr Is Nothing OrElse SPEDITIONSBUCH.EmpfängerKundenNr <= 0 Then
|
||||
If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr
|
||||
If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger
|
||||
End If
|
||||
If SENDUNG.tblSnd_EmpfaengerKdNr > 0 Then SPEDITIONSBUCH.EmpfängerKundenNr = SENDUNG.tblSnd_EmpfaengerKdNr
|
||||
If SPEDITIONSBUCH.Empfänger Is Nothing OrElse SPEDITIONSBUCH.Empfänger = "" Then SPEDITIONSBUCH.Empfänger = SENDUNG.tblSnd_Empfaenger
|
||||
End If
|
||||
|
||||
If SPEDITIONSBUCH.VermittlerKundenNr Is Nothing OrElse SPEDITIONSBUCH.VermittlerKundenNr <= 0 Then
|
||||
|
||||
If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr)
|
||||
If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber
|
||||
End If
|
||||
If SENDUNG.tblSnd_AuftraggeberKdNr > 0 Then SPEDITIONSBUCH.VermittlerKundenNr = SENDUNG.tblSnd_AuftraggeberKdNr ': MsgBox(SENDUNG.tblSnd_AuftraggeberKdNr)
|
||||
If SPEDITIONSBUCH.Vermittler Is Nothing OrElse SPEDITIONSBUCH.Vermittler = "" Then SPEDITIONSBUCH.Vermittler = SENDUNG.tblSnd_Auftraggeber
|
||||
End If
|
||||
|
||||
End If
|
||||
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||
SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
|
||||
@@ -776,6 +790,10 @@ Public Class cZOLL_IMPORT
|
||||
correctEntry(SPEDITIONSBUCH.AvisiererKundenNr, SPEDITIONSBUCH.Avisierer)
|
||||
correctEntry(SPEDITIONSBUCH.EndempfängerKundenNr, SPEDITIONSBUCH.Endempfänger)
|
||||
|
||||
If SPEDITIONSBUCH.LKW_Kennzeichen IsNot Nothing AndAlso SPEDITIONSBUCH.LKW_Kennzeichen.ToString.Length > 25 Then
|
||||
SPEDITIONSBUCH.LKW_Kennzeichen = SPEDITIONSBUCH.LKW_Kennzeichen.ToString.Substring(0, 25)
|
||||
End If
|
||||
|
||||
If SPEDITIONSBUCH.Währungsschlüssel Is Nothing OrElse (IsNumeric(SPEDITIONSBUCH.Währungsschlüssel) AndAlso SPEDITIONSBUCH.Währungsschlüssel <= 0) Then SPEDITIONSBUCH.Währungsschlüssel = 900
|
||||
|
||||
If Personalnummer > 0 Then SPEDITIONSBUCH.Personalnummer = Personalnummer
|
||||
|
||||
Reference in New Issue
Block a user