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
2019-11-06 16:31:56 +01:00
parent e2c05a5ea3
commit d4dfcd1744
46 changed files with 3412 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
DAKOSY_Worker/cZOLL_IMPORT.vb
View File

@@ -253,7 +253,7 @@ Public Class cZOLL_IMPORT
End Function
'Zollsystem 0,1
Public Function IMPORT(SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, avisoLinkId As Integer, SendungId As Integer, strManNr As String, strManNl As String, Zollsystem As String, EZA_Nr As String, NCTS_Nr As String, ByRef notFound As Boolean, Optional autoImport As Boolean = False) As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
Public Function IMPORT(SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, avisoLinkId As Integer, SendungId As Integer, strManNr As String, strManNl As String, Zollsystem As String, EZA_Nr As String, NCTS_Nr As String, ByRef notFound As Boolean, Optional autoImport As Boolean = False, Optional Personalnummer As Integer = -1) As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
Me.SPEDITIONSBUCH = SPEDITIONSBUCH
Me.strManNr = strManNr
@@ -497,28 +497,28 @@ Public Class cZOLL_IMPORT
'Wenn Packstücke im Aviso eingegeben wurden, werden diese in das Speditionbuch gespeichert
If packstueckeAVISO_TMP.Trim <> "" Then
SPEDITIONSBUCH.Packstücke = packstueckeAVISO_TMP
If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Bemerkungen = packstueckeZOLL_TMP
SPEDITIONSBUCH.Packstücke = packstueckeAVISO_TMP
If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Bemerkungen = packstueckeZOLL_TMP
Else
If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Packstücke = packstueckeZOLL_TMP
End If
'Wenn Gewicht im Aviso eingegeben ist, aber keine Rohmasse von ATLAS/EZOLL
If IsNull(SPEDITIONSBUCH.Rohmasse) And Not IsNull(RohmasseAviso) Then
If IsNumeric(RohmasseAviso) Then
SPEDITIONSBUCH.Rohmasse = CInt(RohmasseAviso)
End If
End If
' If autoImport And Not notFound Then
If SENDUNG IsNot Nothing AndAlso SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then
If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28) And NCTS_Nr <> "" Then
'Überstellungs-T
SPEDITIONSBUCH.Abfertigungsart = 5
Else
If packstueckeZOLL_TMP.Trim <> "" Then SPEDITIONSBUCH.Packstücke = packstueckeZOLL_TMP
End If
'Wenn Gewicht im Aviso eingegeben ist, aber keine Rohmasse von ATLAS/EZOLL
If IsNull(SPEDITIONSBUCH.Rohmasse) And Not IsNull(RohmasseAviso) Then
If IsNumeric(RohmasseAviso) Then
SPEDITIONSBUCH.Rohmasse = CInt(RohmasseAviso)
End If
End If
' If autoImport And Not notFound Then
If SENDUNG IsNot Nothing AndAlso SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then
If (SENDUNG.tblSnd_Abfertigungsart_ID = 26 Or SENDUNG.tblSnd_Abfertigungsart_ID = 28) And NCTS_Nr <> "" Then
'Überstellungs-T
SPEDITIONSBUCH.Abfertigungsart = 5
Else
SPEDITIONSBUCH.Abfertigungsart = SENDUNG.tblSnd_Abfertigungsart_ID
End If
SPEDITIONSBUCH.Abfertigungsart = SENDUNG.tblSnd_Abfertigungsart_ID
End If
End If
' End If
@@ -531,7 +531,7 @@ Public Class cZOLL_IMPORT
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
'notFound = Me.notFound
If autoImport AndAlso Not checkIfAutoOK() Then
@@ -609,7 +609,7 @@ Public Class cZOLL_IMPORT
Function checkIfAutoOK() As Boolean
Public Function checkIfAutoOK() As Boolean
Try
If If(SPEDITIONSBUCH.Personalnummer, "") = "" Then Return False