neu
This commit is contained in:
@@ -122,7 +122,7 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then
|
||||
If filiale <> "" And abfertigungsnummer <> "" Then
|
||||
If countSpedbuchEntrys(filiale, LRN) = 0 Then
|
||||
If countSpedbuchEntrys(filiale, LRN, art) = 0 Then
|
||||
|
||||
SPEDBUCH.FilialenNr = filiale
|
||||
SPEDBUCH.AbfertigungsNr = abfertigungsnummer
|
||||
@@ -130,7 +130,7 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
SPEDBUCH.Abfertigungsanzahl = 1
|
||||
SPEDBUCH.Fakturiert = 0
|
||||
SPEDBUCH.AtlasBezNrEZA = LRN
|
||||
' SPEDBUCH.AtlasBezNrEZA = LRN
|
||||
SPEDBUCH.Zollsystem = "E"
|
||||
SPEDBUCH.Sachbearbeiter = "AUTO"
|
||||
|
||||
@@ -207,11 +207,23 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
|
||||
|
||||
Shared Function countSpedbuchEntrys(filiale, ncts) As Integer
|
||||
Shared Function countSpedbuchEntrys(filiale, bezugsnr, art) As Integer
|
||||
If art = "NCTS" Then
|
||||
Return countSpedbuchEntrysNCTS(filiale, bezugsnr)
|
||||
Else
|
||||
Return countSpedbuchEntrysEZA(filiale, bezugsnr)
|
||||
End If
|
||||
End Function
|
||||
Shared Function countSpedbuchEntrysNCTS(filiale, ncts) As Integer
|
||||
If If(ncts, "") = "" Then Return 0
|
||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrNCTS='" & ncts & "'", "FMZOLL")
|
||||
End Function
|
||||
|
||||
Shared Function countSpedbuchEntrysEZA(filiale, eza) As Integer
|
||||
If If(eza, "") = "" Then Return 0
|
||||
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AtlasBezNrEZA='" & eza & "'", "FMZOLL")
|
||||
End Function
|
||||
|
||||
Shared Function getFiliale(ByVal bezugsNr, ByRef filialeBez) As String
|
||||
If If(bezugsNr, "").ToString.Length > 4 Then
|
||||
Select Case bezugsNr.ToString.Substring(0, 4)
|
||||
@@ -379,7 +391,7 @@ Public Class cZOLL_IMPORT
|
||||
Dim BelegNrTmp = ""
|
||||
Dim BetragTmp As Double = 0
|
||||
|
||||
If dt.Rows.Count > 0 Then
|
||||
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
|
||||
|
||||
For Each r In dt.Rows
|
||||
If BenutzerTmp = "" Then BenutzerTmp = r("Benutzer")
|
||||
@@ -396,7 +408,7 @@ Public Class cZOLL_IMPORT
|
||||
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("BAR-Err: Beträge konnten nicht geladen werden!" & vbNewLine & ex.Message & ex.StackTrace)
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "BAR-Err: Beträge konnten nicht geladen werden!", "al@verag.ag", "al@verag.ag")
|
||||
End Try
|
||||
|
||||
'If If(SENDUNG.tblSnd_bar, False) Then
|
||||
@@ -444,6 +456,12 @@ Public Class cZOLL_IMPORT
|
||||
If Aviso.Freigabe > CDate("01.01.2000") Then 'SPEDITIONSBUCH.Abfertigungsdatum Then
|
||||
SPEDITIONSBUCH.Abfertigungsdatum = CDate(Aviso.Freigabe).ToShortDateString
|
||||
End If
|
||||
If Aviso.FreigabeFiliale IsNot Nothing AndAlso IsNumeric(Aviso.FreigabeFiliale) AndAlso Aviso.FreigabeFiliale > 0 Then
|
||||
SPEDITIONSBUCH.FilialenNrHandling = Aviso.FreigabeFiliale
|
||||
'Else
|
||||
' SPEDITIONSBUCH.FilialenNrHandling = SPEDITIONSBUCH.FilialenNr
|
||||
End If
|
||||
|
||||
' pnl3.Visible = True
|
||||
' txtAuftraggeber.Text = Aviso.Auftraggeber
|
||||
' txtAuftraggeberKdNr.Text = Aviso.Auftraggeber_KdNr
|
||||
@@ -481,28 +499,29 @@ Public Class cZOLL_IMPORT
|
||||
SPEDITIONSBUCH.Frachtführer = SENDUNG.tblSnd_Frachtfuehrer
|
||||
If getint(SENDUNG.tblSnd_FrachtfuehrerKdNr) > 0 Then SPEDITIONSBUCH.FrachtführerKundenNr = SENDUNG.tblSnd_FrachtfuehrerKdNr
|
||||
|
||||
|
||||
|
||||
If SENDUNG.tblSnd_BARzuKassieren IsNot Nothing AndAlso IsNumeric(SENDUNG.tblSnd_BARzuKassieren) AndAlso SPEDITIONSBUCH.HandlingZuKassieren <= 0 Then
|
||||
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
|
||||
If SENDUNG.tblSnd_AbsenderKdNr > 0 Then
|
||||
SPEDITIONSBUCH.AbsenderKundenNr = SENDUNG.tblSnd_AbsenderKdNr
|
||||
End If
|
||||
If SPEDITIONSBUCH.Absender Is Nothing OrElse SPEDITIONSBUCH.Absender = "" Then SPEDITIONSBUCH.Absender = SENDUNG.tblSnd_Absender
|
||||
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 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 SPEDITIONSBUCH.Absender Is Nothing OrElse SPEDITIONSBUCH.Absender = "" Then SPEDITIONSBUCH.Absender = SENDUNG.tblSnd_Absender
|
||||
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 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
|
||||
End If
|
||||
|
||||
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||
SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr
|
||||
SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
|
||||
|
||||
If PosAnzahl > 0 Then
|
||||
@@ -1030,13 +1049,13 @@ Public Class cZOLL_IMPORT
|
||||
' In Euro umrechnen.
|
||||
'HIER
|
||||
If SPEDITIONSBUCH.Abfertigungsdatum IsNot Nothing Then
|
||||
Dim dATLAS2 As DataTable = KDSQL.loadDgvBySql("SELECT baskur_kurs" & _
|
||||
" FROM baskur" & _
|
||||
" WHERE (baskur_code = '" & r.Item("veoerz_baswrg") & "')" & _
|
||||
" AND (baskur_typ = 1 OR baskur_typ = 2)" & _
|
||||
" AND (baskur_gvdat <= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" & _
|
||||
" AND (baskur_gbdat >= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "'as DATETIME))" & _
|
||||
" AND (baskur_wkz = 'EUR')" & _
|
||||
Dim dATLAS2 As DataTable = KDSQL.loadDgvBySql("SELECT baskur_kurs" &
|
||||
" FROM baskur" &
|
||||
" WHERE (baskur_code = '" & r.Item("veoerz_baswrg") & "')" &
|
||||
" AND (baskur_typ = 1 OR baskur_typ = 2)" &
|
||||
" AND (baskur_gvdat <= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "' as DATETIME))" &
|
||||
" AND (baskur_gbdat >= CAST('" & CDate(SPEDITIONSBUCH.Abfertigungsdatum).ToShortDateString & "'as DATETIME))" &
|
||||
" AND (baskur_wkz = 'EUR')" &
|
||||
" ORDER BY baskur_gvdat DESC, baskur_gbdat DESC", ATLAS_SERVER_VERBINDUNG)
|
||||
|
||||
' rst2 = GetRecordsetADO(strSQL, cnn, adOpenForwardOnly, adLockReadOnly, adCmdText)
|
||||
|
||||
Reference in New Issue
Block a user