diff --git a/ATILLA_Speditionsbuch/cATILLA_Speditionsbuch.vb b/ATILLA_Speditionsbuch/cATILLA_Speditionsbuch.vb index 6316e00..6f5019f 100644 --- a/ATILLA_Speditionsbuch/cATILLA_Speditionsbuch.vb +++ b/ATILLA_Speditionsbuch/cATILLA_Speditionsbuch.vb @@ -16,7 +16,7 @@ Module cATILLA_Speditionsbuch Public Sub LOAD(datum As Date) Try Using conn As SqlConnection = GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM Speditionsbuch WHERE FilialenNr=4801 and SB_Zeitstempel > '" & datum.ToShortDateString & " 00:00:00' and Bar=0 ", conn) + Using cmd As New SqlCommand("SELECT * FROM Speditionsbuch WHERE FilialenNr IN (4801,4802) and SB_Zeitstempel > '" & datum.ToShortDateString & " 00:00:00' and Bar=0 ", conn) Dim dr = cmd.ExecuteReader() While dr.Read diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index fd54213..a1c4442 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -334,7 +334,7 @@ Public Class cZOLL_IMPORT Dim filiale = getFiliale(LRN, filialeBez) Select Case filiale Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" - Case "4801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung + Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" End Select Dim abfertigungsnummer = getAbfertigungsnummer(LRN) @@ -884,7 +884,7 @@ Public Class cZOLL_IMPORT Select Case SENDUNG.FilialenNr Case 4803, 4809, 7001 strManNl = "SUB" - Case 4801 + Case 4801, 4802 strManNl = "SUW" Case 5003 strManNl = "SBG" 'ANDERER SERVER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -1032,7 +1032,7 @@ Public Class cZOLL_IMPORT Select Case SPEDITIONSBUCH.FilialenNr Case 4803, 4809, 7001 strManNl = "SUB" - Case 4801 + Case 4801, 4802 strManNl = "SUW" Case 5003 strManNl = "SBG" 'ANDERER SERVER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -1133,7 +1133,8 @@ Public Class cZOLL_IMPORT SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If Catch ex As Exception - MsgBox("Fehler ATLAS Personal: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace) + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler ATLAS Personal: " & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Next Else @@ -1272,7 +1273,8 @@ Public Class cZOLL_IMPORT SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If Catch ex As Exception - MsgBox("Fehler ATLAS Personal: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler ATLAS Personal: " & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try Next Else @@ -1540,7 +1542,8 @@ Public Class cZOLL_IMPORT SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If Catch ex As Exception - MsgBox("Fehler EZOLL Personal: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler EZOLL Personal: " & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try 'Anhang @@ -1680,7 +1683,8 @@ Public Class cZOLL_IMPORT SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If Catch ex As Exception - MsgBox("Fehler EZOLL Personal: " & vbNewLine & ex.Message & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler EZOLL Personal: " & vbNewLine & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try 'Anhang diff --git a/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb b/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb index 4057182..c587c4e 100644 --- a/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb +++ b/DAKOSY_Worker/cZollsysteme_Aktenbeschriftung.vb @@ -472,10 +472,10 @@ Public Class cZollsysteme_Aktenbeschriftung VERAG_NCTS.Company = "ATILLA" VERAG_NCTS.Department = "SUB" Case "6" - If LRN.StartsWith("4801") Then - VERAG_NCTS.Company = "ATILLA" - Else - VERAG_NCTS.Company = "VERAG" + If LRN.StartsWith("4801") Or LRN.StartsWith("4802") Then + VERAG_NCTS.Company = "ATILLA" + Else + VERAG_NCTS.Company = "VERAG" End If VERAG_NCTS.Department = "SUB" Case "8" diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 65defb5..c223c91 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -1402,7 +1402,7 @@ Module Mail sqlstr &= " SELECT [Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch WHERE Abfertigungsart IN (26,28) " - sqlstr &= " AND [Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4806 ) " + sqlstr &= " AND [Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4802,4806 ) " sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " & " GROUP BY [Grenzstelle]" & " ORDER BY Anzahl DESC" diff --git a/initATLASAufschubkonten/cWorker_NCTS.vb b/initATLASAufschubkonten/cWorker_NCTS.vb index 05eb421..b892a5a 100644 --- a/initATLASAufschubkonten/cWorker_NCTS.vb +++ b/initATLASAufschubkonten/cWorker_NCTS.vb @@ -1240,7 +1240,7 @@ Public Class cWorker_NCTS If MRN <> "" Then NCTS_TMP.ncts_MRN = MRN : NCTS_TMP.SAVE() End If End If - saveDY_NCTS = NCTS_TMP + saveDY_NCTS = NCTS_TMP End Function Shared Sub SaveNCTS_FirmaNL(ByRef NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, division As String) @@ -1699,8 +1699,13 @@ Public Class cWorker_NCTS If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id STATUS.SAVE() - ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME + '=======BEREITSTELLUNG DER DATEN AN FREMDSYSTEME======= cVERAG_out_ncts.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP) + '====================================================== + + '=====ATEZ BEREITSTELLUNG========== + checkATEZ_Bereitstellung(DY_TMP, d) + '================================== FORM.addDGVEinarbeitung("NCTS: Erledigungsmeldung", STATUS.dySt_BezugsNr) End If @@ -1998,6 +2003,10 @@ Public Class cWorker_NCTS + '=====ATEZ BEREITSTELLUNG========== + checkATEZ_Bereitstellung(DY_TMP, d) + '================================== + FORM.addDGVEinarbeitung("NCTS: Überlassungsmeldung", STATUS.dySt_BezugsNr) End If Catch ex As Exception @@ -2014,6 +2023,18 @@ Public Class cWorker_NCTS End If End Sub + Shared Sub checkATEZ_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String) + If DY_TMP Is Nothing Then Exit Sub + + Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(DY_TMP.dy_BezugsNr) + If ATEZ IsNot Nothing AndAlso ATEZ.hasEntry Then + If ATEZ.status Then + FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\") + End If + End If + End Sub + + Shared Function readNCTS_AnrechnungReferenzbetraege(FORM As frmDYNachrichtenVerarbeitung, d As String) As String Try @@ -2071,6 +2092,10 @@ Public Class cWorker_NCTS If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id STATUS.SAVE() + '=====ATEZ BEREITSTELLUNG========== + checkATEZ_Bereitstellung(DY_TMP, d) + '================================== + FORM.addDGVEinarbeitung("NCTS: AnrechnungReferenzbetäege", STATUS.dySt_BezugsNr) End If Catch ex As Exception diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index e3200c6..1f4e45c 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -5875,7 +5875,7 @@ Public Class frmDYNachrichtenVerarbeitung Case "5701" firma = "AMBAR" niederlassung = "AMBAR" - Case "4801" + Case "4801", "4802" firma = "ATILLA" niederlassung = "SUB" 'Case "4801" diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 452cf7c..be0b6f1 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -705,6 +705,7 @@ Public Class frmStartOptions Case "5701" : Standort = "AMB" Case "5801" : Standort = "FO" Case "4801" : Standort = "ATL" + Case "4802" : Standort = "ATL" Case "5003" : Standort = "SBG" Case "5103" : Standort = "WAI" Case "5303" : Standort = "NKD" diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index f105ac2..1b5b409 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -752,7 +752,7 @@ Public Class frmTCNachrichtenVerarbeitung If TC.telanm_BezugsNr.ToString.StartsWith("5501") Then TC.telanm_firma = "IMEX" 'VERAG WO End If - If TC.telanm_BezugsNr.ToString.StartsWith("4801") Then + If TC.telanm_BezugsNr.ToString.StartsWith("4801") Or TC.telanm_BezugsNr.ToString.StartsWith("4802") Then TC.telanm_firma = "IMEX" 'VERAG WO End If TC.telanm_niederlassung = "SUB"