From 355058cefd622af07063ef827afe6a1f1cf41b42 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 7 Jan 2026 22:29:08 +0100 Subject: [PATCH 1/3] CBAM, VERAG Cust --- DAKOSY_Worker/cImporter_DHFToVERAG.vb | 24 ++- DAKOSY_Worker/cImporter_DakosyToVERAG.vb | 17 ++- DAKOSY_Worker/cImporter_TelotecToVERAG.vb | 14 +- MailSender/MAILSender.vb | 2 +- UID/usrctlProcedures.Designer.vb | 137 +++++++++++++----- UID/usrctlProcedures.resx | 6 - UID/usrctlProcedures.vb | 109 +++++++++++++- .../frmDYNachrichtenVerarbeitung.vb | 2 +- 8 files changed, 247 insertions(+), 64 deletions(-) diff --git a/DAKOSY_Worker/cImporter_DHFToVERAG.vb b/DAKOSY_Worker/cImporter_DHFToVERAG.vb index 5e7b175..160e3bd 100644 --- a/DAKOSY_Worker/cImporter_DHFToVERAG.vb +++ b/DAKOSY_Worker/cImporter_DHFToVERAG.vb @@ -13,7 +13,7 @@ Public Class cImporter_DHFToVERAG ' ===================================================================== ' MAIN ENTRY ' ===================================================================== - Public Function ImportEZOLLByLRN(CRN As String, EZOLL_DB As String, Optional overwrite As Boolean = True) As Boolean + Public Function ImportEZOLLByLRN(CRN As String, EZOLL_DB As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = True) As Boolean Try If String.IsNullOrWhiteSpace(CRN) Then Return False @@ -157,7 +157,7 @@ Public Class cImporter_DHFToVERAG it.zaItem_OriginCountry = ToStringSafe(r("Orig")) it.zaItem_NetMass = ToNullableDecimal(r("Net")) it.zaItem_InvoiceValueEUR = ToNullableDecimal(r("ItVal")) - it.zaItem_StatisticalValueEUR = ToNullableDecimal(r("StatVal")) + it.zaItem_StatisticalValueEUR = ToNullableDecimal(r("StatVal")) LoadEZOLL_HSAddCodes(it, LizenzNr, OperatorID, VorgangID, AnmID, r("GdsItemID")) LoadEZOLL_ItemDocuments(it, LizenzNr, OperatorID, VorgangID, AnmID) @@ -185,6 +185,13 @@ Public Class cImporter_DHFToVERAG ZA.Items.Add(it) Next + ' ================================================================ + 'CBAM WARNING + ' ================================================================ + If freshInsert Then + ZA.checkfreshCBAMWarning() + End If + ' --------------------------------------------------------------- ' SAVE ' --------------------------------------------------------------- @@ -462,7 +469,9 @@ Public Class cImporter_DHFToVERAG doc.zaDoc_Reference = ToStringSafe(r("referenceNumber")) - doc.zaDoc_Date = ToNullableDate(r("validityDate")) + If r("validityDate") IsNot Nothing AndAlso r("validityDate") IsNot DBNull.Value Then + doc.zaDoc_Date = ToNullableDate(r("validityDate")) + End If 'doc.zaDoc_Section = ToStringSafe(r("DocumentTypID")) doc.zaDoc_Description = ToStringSafe(r("text")) @@ -471,8 +480,9 @@ Public Class cImporter_DHFToVERAG ' ------------------------------------------------------------ doc.zaDoc_Presentation = ToStringSafe(r("typeOfPackages")) - doc.zaDoc_DepreciationAmount = ToNullableDecimal(r("amount")) - + If r("amount") IsNot Nothing AndAlso r("amount") IsNot DBNull.Value Then + doc.zaDoc_DepreciationAmount = ToNullableDecimal(r("amount")) + End If doc.zaDoc_DepreciationUnitmeasurement = ToStringSafe(r("measurementUnitAndQualifier")) @@ -513,7 +523,7 @@ Public Class cImporter_DHFToVERAG Dim party As New cVERAG_CustomsDeclarations_Parties - party.zaParty_Role = r("AdressTypID") + party.zaParty_Role = ToStringSafe(r("AdressTypID")) party.zaParty_EORI = ToStringSafe(r("identificationNumber")) party.zaParty_Name = ToStringSafe(r("name")) @@ -533,7 +543,7 @@ Public Class cImporter_DHFToVERAG Private Function ExistsInVERAG(CRN As String) As Boolean Dim sql = "SELECT TOP 1 1 FROM tblVERAG_CustomsDeclarations " & - "WHERE za_System='EZOLL' AND (za_MRN=@CRN )" + "WHERE za_System LIKE 'DHF%' AND (za_MRN=@CRN )" Dim p As New List(Of SQLVariable) From { New SQLVariable("CRN", CRN) diff --git a/DAKOSY_Worker/cImporter_DakosyToVERAG.vb b/DAKOSY_Worker/cImporter_DakosyToVERAG.vb index 3b4740c..4cca6b6 100644 --- a/DAKOSY_Worker/cImporter_DakosyToVERAG.vb +++ b/DAKOSY_Worker/cImporter_DakosyToVERAG.vb @@ -7,15 +7,15 @@ Public Class cImporter_DakosyToVERAG ' ======================================================================== ' MAIN ENTRY ' ======================================================================== - Public Function ImportDakosyEZA(MRN As String, Optional overwrite As Boolean = True) As Boolean + Public Function ImportDakosyEZA(MRN As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = False) As Boolean If MRN Is Nothing Then Return False If MRN = "" Then Return False Dim EZA = cDakosyEZA.LOADByMRN(MRN, True) - If EZA IsNot Nothing Then Return ImportDakosyEZA(EZA) + If EZA IsNot Nothing Then Return ImportDakosyEZA(EZA, overwrite, freshInsert) Return False End Function - Public Function ImportDakosyEZA(eza As cDakosyEZA, Optional overwrite As Boolean = True) As Boolean + Public Function ImportDakosyEZA(eza As cDakosyEZA, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = False) As Boolean Try If eza Is Nothing Then Return False If String.IsNullOrWhiteSpace(eza.eza_MRN) AndAlso String.IsNullOrWhiteSpace(eza.eza_ANR) Then Return False @@ -289,11 +289,22 @@ Public Class cImporter_DakosyToVERAG Next End If + ' ================================================================ + 'CBAM WARNING + ' ================================================================ + If freshInsert Then + VERAG_ZA.checkfreshCBAMWarning() + End If + ' ================================================================ + + ' ================================================================ ' SAVE ' ================================================================ + Return VERAG_ZA.SAVE() + Catch ex As Exception cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name) Return False diff --git a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb index 1971a24..d32caac 100644 --- a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb +++ b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb @@ -11,18 +11,18 @@ Public Class cImporter_TelotecToVERAG ' ===================================================================== ' MAIN ENTRY ' ===================================================================== - Public Function ImportTelotec(CRN As String, Optional overwrite As Boolean = True) As Boolean + Public Function ImportTelotec(CRN As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = True) As Boolean If CRN Is Nothing Then Return False If CRN = "" Then Return False Dim cTelotec_Anmeldung = TELOTEC_Worker.cTelotec_Anmeldung.LOADByCRN(CRN, True) - If cTelotec_Anmeldung IsNot Nothing Then Return ImportTelotec(cTelotec_Anmeldung, overwrite) + If cTelotec_Anmeldung IsNot Nothing Then Return ImportTelotec(cTelotec_Anmeldung, overwrite, freshInsert) Return False End Function - Public Function ImportTelotec(tel As cTelotec_Anmeldung, Optional overwrite As Boolean = True) As Boolean + Public Function ImportTelotec(tel As cTelotec_Anmeldung, Optional overwrite As Boolean = True, Optional freshinsert As Boolean = True) As Boolean Try If tel Is Nothing Then Return False If String.IsNullOrWhiteSpace(ToStringSafe(tel.Refs_LRN)) AndAlso @@ -177,6 +177,14 @@ Public Class cImporter_TelotecToVERAG ZA.Items.Add(it) Next + + ' ================================================================ + 'CBAM WARNING + ' ================================================================ + If freshinsert Then + ZA.checkfreshCBAMWarning() + End If + ' ================================================================ ' ================================================================ ' SAVE ' ================================================================ diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 685053a..0111d56 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -468,7 +468,7 @@ Module Mail System.Console.WriteLine("OPTION erkannt: TETRA_PAK _ Erstellt eine monatliche Auswertung der DAKSOY/EZOLL-Abfertigungen für TETRAPAK.") System.Console.WriteLine("Auswertung Details gestartet...") - If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com", von, bis, "AT") Then + If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com; nikhil.mediratta@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com;nikhil.mediratta@tetrapak.com", von, bis, "AT") Then System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") End If End If diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index 998221f..50f3d15 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -108,14 +108,21 @@ Partial Class usrctlProcedures Me.Button52 = New System.Windows.Forms.Button() Me.TabPage8 = New System.Windows.Forms.TabPage() Me.btnImportTrStat = New System.Windows.Forms.Button() + Me.TabPage9 = New System.Windows.Forms.TabPage() Me.btnT1Data = New System.Windows.Forms.Button() Me.TabPage10 = New System.Windows.Forms.TabPage() + Me.btnDHF_UNISPEDtoVERAEZA_File = New System.Windows.Forms.Button() + Me.btnDHFtoVERAEZA_File = New System.Windows.Forms.Button() + Me.btnTCtoVERAEZA_File = New System.Windows.Forms.Button() + Me.btnDYtoVERAEZA_File = New System.Windows.Forms.Button() + Me.btnDHFUNItoVERAEZA = New System.Windows.Forms.Button() + Me.txtListDHFMrn = New System.Windows.Forms.TextBox() + Me.btnDHFtoVERAEZA = New System.Windows.Forms.Button() Me.txtListTCMrn = New System.Windows.Forms.TextBox() Me.btnTCtoVERAEZA = New System.Windows.Forms.Button() Me.btnCBAM_ATEZ = New System.Windows.Forms.Button() Me.txtListDYMrn = New System.Windows.Forms.TextBox() Me.btnDYtoVERAEZA = New System.Windows.Forms.Button() - Me.TabPage9 = New System.Windows.Forms.TabPage() Me.Button18 = New System.Windows.Forms.Button() Me.TextBox1 = New System.Windows.Forms.TextBox() Me.lblAnzahl = New System.Windows.Forms.Label() @@ -169,9 +176,7 @@ Partial Class usrctlProcedures Me.Button99 = New System.Windows.Forms.Button() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.txtListDHFMrn = New System.Windows.Forms.TextBox() - Me.btnDHFtoVERAEZA = New System.Windows.Forms.Button() - Me.btnDHFUNItoVERAEZA = New System.Windows.Forms.Button() + Me.cbxCD_Overwrite = New System.Windows.Forms.CheckBox() Me.tbTRStat.SuspendLayout() Me.TabPage3.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -1053,6 +1058,11 @@ Partial Class usrctlProcedures ' 'TabPage10 ' + Me.TabPage10.Controls.Add(Me.cbxCD_Overwrite) + Me.TabPage10.Controls.Add(Me.btnDHF_UNISPEDtoVERAEZA_File) + Me.TabPage10.Controls.Add(Me.btnDHFtoVERAEZA_File) + Me.TabPage10.Controls.Add(Me.btnTCtoVERAEZA_File) + Me.TabPage10.Controls.Add(Me.btnDYtoVERAEZA_File) Me.TabPage10.Controls.Add(Me.btnDHFUNItoVERAEZA) Me.TabPage10.Controls.Add(Me.txtListDHFMrn) Me.TabPage10.Controls.Add(Me.btnDHFtoVERAEZA) @@ -1069,29 +1079,92 @@ Partial Class usrctlProcedures Me.TabPage10.Text = "TabPageDY" Me.TabPage10.UseVisualStyleBackColor = True ' + 'btnDHF_UNISPEDtoVERAEZA_File + ' + Me.btnDHF_UNISPEDtoVERAEZA_File.Location = New System.Drawing.Point(448, 225) + Me.btnDHF_UNISPEDtoVERAEZA_File.Name = "btnDHF_UNISPEDtoVERAEZA_File" + Me.btnDHF_UNISPEDtoVERAEZA_File.Size = New System.Drawing.Size(63, 23) + Me.btnDHF_UNISPEDtoVERAEZA_File.TabIndex = 49 + Me.btnDHF_UNISPEDtoVERAEZA_File.Text = "(FILE...)" + Me.btnDHF_UNISPEDtoVERAEZA_File.UseVisualStyleBackColor = True + ' + 'btnDHFtoVERAEZA_File + ' + Me.btnDHFtoVERAEZA_File.Location = New System.Drawing.Point(448, 161) + Me.btnDHFtoVERAEZA_File.Name = "btnDHFtoVERAEZA_File" + Me.btnDHFtoVERAEZA_File.Size = New System.Drawing.Size(63, 23) + Me.btnDHFtoVERAEZA_File.TabIndex = 48 + Me.btnDHFtoVERAEZA_File.Text = "(FILE...)" + Me.btnDHFtoVERAEZA_File.UseVisualStyleBackColor = True + ' + 'btnTCtoVERAEZA_File + ' + Me.btnTCtoVERAEZA_File.Location = New System.Drawing.Point(279, 161) + Me.btnTCtoVERAEZA_File.Name = "btnTCtoVERAEZA_File" + Me.btnTCtoVERAEZA_File.Size = New System.Drawing.Size(63, 23) + Me.btnTCtoVERAEZA_File.TabIndex = 47 + Me.btnTCtoVERAEZA_File.Text = "(FILE...)" + Me.btnTCtoVERAEZA_File.UseVisualStyleBackColor = True + ' + 'btnDYtoVERAEZA_File + ' + Me.btnDYtoVERAEZA_File.Location = New System.Drawing.Point(115, 161) + Me.btnDYtoVERAEZA_File.Name = "btnDYtoVERAEZA_File" + Me.btnDYtoVERAEZA_File.Size = New System.Drawing.Size(63, 23) + Me.btnDYtoVERAEZA_File.TabIndex = 46 + Me.btnDYtoVERAEZA_File.Text = "(FILE...)" + Me.btnDYtoVERAEZA_File.UseVisualStyleBackColor = True + ' + 'btnDHFUNItoVERAEZA + ' + Me.btnDHFUNItoVERAEZA.Location = New System.Drawing.Point(348, 225) + Me.btnDHFUNItoVERAEZA.Name = "btnDHFUNItoVERAEZA" + Me.btnDHFUNItoVERAEZA.Size = New System.Drawing.Size(163, 58) + Me.btnDHFUNItoVERAEZA.TabIndex = 45 + Me.btnDHFUNItoVERAEZA.Text = "DHF UNISPED ->VERAG ZA" + Me.btnDHFUNItoVERAEZA.UseVisualStyleBackColor = True + ' + 'txtListDHFMrn + ' + Me.txtListDHFMrn.Location = New System.Drawing.Point(348, 14) + Me.txtListDHFMrn.Multiline = True + Me.txtListDHFMrn.Name = "txtListDHFMrn" + Me.txtListDHFMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical + Me.txtListDHFMrn.Size = New System.Drawing.Size(163, 133) + Me.txtListDHFMrn.TabIndex = 44 + ' + 'btnDHFtoVERAEZA + ' + Me.btnDHFtoVERAEZA.Location = New System.Drawing.Point(348, 161) + Me.btnDHFtoVERAEZA.Name = "btnDHFtoVERAEZA" + Me.btnDHFtoVERAEZA.Size = New System.Drawing.Size(163, 73) + Me.btnDHFtoVERAEZA.TabIndex = 43 + Me.btnDHFtoVERAEZA.Text = "DHF VERAG->VERAG ZA" + Me.btnDHFtoVERAEZA.UseVisualStyleBackColor = True + ' 'txtListTCMrn ' Me.txtListTCMrn.Location = New System.Drawing.Point(197, 14) Me.txtListTCMrn.Multiline = True Me.txtListTCMrn.Name = "txtListTCMrn" Me.txtListTCMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtListTCMrn.Size = New System.Drawing.Size(145, 155) + Me.txtListTCMrn.Size = New System.Drawing.Size(145, 133) Me.txtListTCMrn.TabIndex = 42 ' 'btnTCtoVERAEZA ' - Me.btnTCtoVERAEZA.Location = New System.Drawing.Point(197, 175) + Me.btnTCtoVERAEZA.Location = New System.Drawing.Point(197, 161) Me.btnTCtoVERAEZA.Name = "btnTCtoVERAEZA" - Me.btnTCtoVERAEZA.Size = New System.Drawing.Size(145, 49) + Me.btnTCtoVERAEZA.Size = New System.Drawing.Size(145, 73) Me.btnTCtoVERAEZA.TabIndex = 41 Me.btnTCtoVERAEZA.Text = "TELOTEC->VERAG ZA" Me.btnTCtoVERAEZA.UseVisualStyleBackColor = True ' 'btnCBAM_ATEZ ' - Me.btnCBAM_ATEZ.Location = New System.Drawing.Point(133, 239) + Me.btnCBAM_ATEZ.Location = New System.Drawing.Point(33, 249) Me.btnCBAM_ATEZ.Name = "btnCBAM_ATEZ" - Me.btnCBAM_ATEZ.Size = New System.Drawing.Size(145, 49) + Me.btnCBAM_ATEZ.Size = New System.Drawing.Size(309, 25) Me.btnCBAM_ATEZ.TabIndex = 40 Me.btnCBAM_ATEZ.Text = "Überschreibe CBAM von ATEZ" Me.btnCBAM_ATEZ.UseVisualStyleBackColor = True @@ -1102,14 +1175,14 @@ Partial Class usrctlProcedures Me.txtListDYMrn.Multiline = True Me.txtListDYMrn.Name = "txtListDYMrn" Me.txtListDYMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtListDYMrn.Size = New System.Drawing.Size(145, 155) + Me.txtListDYMrn.Size = New System.Drawing.Size(145, 133) Me.txtListDYMrn.TabIndex = 39 ' 'btnDYtoVERAEZA ' - Me.btnDYtoVERAEZA.Location = New System.Drawing.Point(33, 175) + Me.btnDYtoVERAEZA.Location = New System.Drawing.Point(33, 161) Me.btnDYtoVERAEZA.Name = "btnDYtoVERAEZA" - Me.btnDYtoVERAEZA.Size = New System.Drawing.Size(145, 49) + Me.btnDYtoVERAEZA.Size = New System.Drawing.Size(145, 73) Me.btnDYtoVERAEZA.TabIndex = 36 Me.btnDYtoVERAEZA.Text = "DY->VERAG ZA" Me.btnDYtoVERAEZA.UseVisualStyleBackColor = True @@ -1593,32 +1666,17 @@ Partial Class usrctlProcedures Me.DataGridViewTextBoxColumn2.HeaderText = "anz" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'txtListDHFMrn + 'cbxCD_Overwrite ' - Me.txtListDHFMrn.Location = New System.Drawing.Point(348, 14) - Me.txtListDHFMrn.Multiline = True - Me.txtListDHFMrn.Name = "txtListDHFMrn" - Me.txtListDHFMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtListDHFMrn.Size = New System.Drawing.Size(163, 155) - Me.txtListDHFMrn.TabIndex = 44 - ' - 'btnDHFtoVERAEZA - ' - Me.btnDHFtoVERAEZA.Location = New System.Drawing.Point(348, 175) - Me.btnDHFtoVERAEZA.Name = "btnDHFtoVERAEZA" - Me.btnDHFtoVERAEZA.Size = New System.Drawing.Size(163, 49) - Me.btnDHFtoVERAEZA.TabIndex = 43 - Me.btnDHFtoVERAEZA.Text = "DHF VERAG->VERAG ZA" - Me.btnDHFtoVERAEZA.UseVisualStyleBackColor = True - ' - 'btnDHFUNItoVERAEZA - ' - Me.btnDHFUNItoVERAEZA.Location = New System.Drawing.Point(348, 230) - Me.btnDHFUNItoVERAEZA.Name = "btnDHFUNItoVERAEZA" - Me.btnDHFUNItoVERAEZA.Size = New System.Drawing.Size(163, 49) - Me.btnDHFUNItoVERAEZA.TabIndex = 45 - Me.btnDHFUNItoVERAEZA.Text = "DHF UNISPED ->VERAG ZA" - Me.btnDHFUNItoVERAEZA.UseVisualStyleBackColor = True + Me.cbxCD_Overwrite.AutoSize = True + Me.cbxCD_Overwrite.Checked = True + Me.cbxCD_Overwrite.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxCD_Overwrite.Location = New System.Drawing.Point(517, 16) + Me.cbxCD_Overwrite.Name = "cbxCD_Overwrite" + Me.cbxCD_Overwrite.Size = New System.Drawing.Size(69, 17) + Me.cbxCD_Overwrite.TabIndex = 50 + Me.cbxCD_Overwrite.Text = "overwrite" + Me.cbxCD_Overwrite.UseVisualStyleBackColor = True ' 'usrctlProcedures ' @@ -1854,4 +1912,9 @@ Partial Class usrctlProcedures Friend WithEvents btnDHFUNItoVERAEZA As Button Friend WithEvents txtListDHFMrn As TextBox Friend WithEvents btnDHFtoVERAEZA As Button + Friend WithEvents btnDYtoVERAEZA_File As Button + Friend WithEvents btnDHF_UNISPEDtoVERAEZA_File As Button + Friend WithEvents btnDHFtoVERAEZA_File As Button + Friend WithEvents btnTCtoVERAEZA_File As Button + Friend WithEvents cbxCD_Overwrite As CheckBox End Class diff --git a/UID/usrctlProcedures.resx b/UID/usrctlProcedures.resx index c9977e7..508fc32 100644 --- a/UID/usrctlProcedures.resx +++ b/UID/usrctlProcedures.resx @@ -123,10 +123,4 @@ True - - True - - - True - \ No newline at end of file diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index a3fa4d3..2167b06 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -4535,7 +4535,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' End Sub Private Sub btnDYtoVERAEZA_Click(sender As Object, e As EventArgs) Handles btnDYtoVERAEZA.Click - + ' MsgBox(VERAG_PROG_ALLGEMEIN.cGreendeal_CBAM_Trn.BuildCBAMPatternWhereClause("Warentarifnummer")) If txtListDYMrn Is Nothing OrElse String.IsNullOrWhiteSpace(txtListDYMrn.Text) Then Exit Sub ' Trennzeichen definieren @@ -4550,7 +4550,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' Dim value As String = entry.Trim() If value.Length = 18 Then - WRK.ImportDakosyEZA(value) + WRK.ImportDakosyEZA(value, cbxCD_Overwrite.Checked) End If cnt += 1 btnDYtoVERAEZA.Text = "DY->VERAG ZA" & vbNewLine & cnt & "/" & entries.Count @@ -4587,7 +4587,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' Dim value As String = entry.Trim() If value.Length = 18 Then - WRK.ImportTelotec(value) + WRK.ImportTelotec(value, cbxCD_Overwrite.Checked) End If cnt += 1 btnTCtoVERAEZA.Text = "TELOTEC->VERAG ZA" & vbNewLine & cnt & "/" & entries.Count @@ -4610,9 +4610,9 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' Dim value As String = entry.Trim() - If value.Length = 18 Then - If sender Is btnDHFtoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL") - If sender Is btnDHFUNItoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL_UNISPED") + If value.Length >= 18 And value.Length < 30 Then + If sender Is btnDHFtoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL", cbxCD_Overwrite.Checked) + If sender Is btnDHFUNItoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL_UNISPED", cbxCD_Overwrite.Checked) End If cnt += 1 If sender Is btnDHFtoVERAEZA Then sender.Text = "DHF VERAG ->VERAG ZA" & vbNewLine & cnt & "/" & entries.Count @@ -4622,6 +4622,103 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' Next End Sub + Private Sub Button55_Click(sender As Object, e As EventArgs) Handles btnDYtoVERAEZA_File.Click + Dim ofd As New OpenFileDialog With { + .Title = "MRN-Datei auswählen", + .Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*", + .Multiselect = False + } + + If ofd.ShowDialog() <> DialogResult.OK Then Exit Sub + If Not System.IO.File.Exists(ofd.FileName) Then Exit Sub + + Dim lines = System.IO.File.ReadAllLines(ofd.FileName) + + Dim WRK As New DAKOSY_Worker.cImporter_DakosyToVERAG + Dim cnt As Integer = 0 + Dim total As Integer = lines.Length + + For Each line As String In lines + Dim value As String = line.Trim() + + ' MRN-Validierung (klassisch 18 Zeichen) + If value.Length >= 18 And value.Length < 30 Then + WRK.ImportDakosyEZA(value, cbxCD_Overwrite.Checked) + End If + + cnt += 1 + btnDYtoVERAEZA.Text = "DY->VERAG ZA" & vbNewLine & cnt & "/" & total + Me.Refresh() + Application.DoEvents() + Next + + End Sub + + Private Sub Button55_Click_1(sender As Object, e As EventArgs) Handles btnTCtoVERAEZA_File.Click + Dim ofd As New OpenFileDialog With { + .Title = "MRN-Datei auswählen", + .Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*", + .Multiselect = False + } + + If ofd.ShowDialog() <> DialogResult.OK Then Exit Sub + If Not System.IO.File.Exists(ofd.FileName) Then Exit Sub + + Dim lines = System.IO.File.ReadAllLines(ofd.FileName) + + Dim WRK As New DAKOSY_Worker.cImporter_TelotecToVERAG + Dim cnt As Integer = 0 + Dim total As Integer = lines.Length + + For Each line As String In lines + Dim value As String = line.Trim() + + ' MRN-Validierung (klassisch 18 Zeichen) + If value.Length >= 18 And value.Length < 30 Then + WRK.ImportTelotec(value, cbxCD_Overwrite.Checked) + End If + + cnt += 1 + btnTCtoVERAEZA.Text = "TC->VERAG ZA" & vbNewLine & cnt & "/" & total + Me.Refresh() + Application.DoEvents() + Next + End Sub + + Private Sub Button56_Click(sender As Object, e As EventArgs) Handles btnDHFtoVERAEZA_File.Click, btnDHF_UNISPEDtoVERAEZA_File.Click + Dim ofd As New OpenFileDialog With { + .Title = "MRN-Datei auswählen", + .Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*", + .Multiselect = False + } + + If ofd.ShowDialog() <> DialogResult.OK Then Exit Sub + If Not System.IO.File.Exists(ofd.FileName) Then Exit Sub + + Dim lines = System.IO.File.ReadAllLines(ofd.FileName) + + Dim WRK As New DAKOSY_Worker.cImporter_DHFToVERAG + Dim cnt As Integer = 0 + Dim total As Integer = lines.Length + + For Each line As String In lines + Dim value As String = line.Trim() + + ' MRN-Validierung (klassisch 18 Zeichen) + If value.Length >= 18 And value.Length < 30 Then + If sender Is btnDHFtoVERAEZA_File Then WRK.ImportEZOLLByLRN(value, "EZOLL", cbxCD_Overwrite.Checked) + If sender Is btnDHF_UNISPEDtoVERAEZA_File Then WRK.ImportEZOLLByLRN(value, "EZOLL_UNISPED", cbxCD_Overwrite.Checked) + End If + + cnt += 1 + If sender Is btnDHFtoVERAEZA_File Then btnDHFtoVERAEZA.Text = "DHF->VERAG ZA" & vbNewLine & cnt & "/" & total + If sender Is btnDHF_UNISPEDtoVERAEZA_File Then btnDHFUNItoVERAEZA.Text = "DHF->VERAG ZA" & vbNewLine & cnt & "/" & total + + Me.Refresh() + Application.DoEvents() + Next + End Sub + 'Private Sub Button26_Click(sender As Object, e As EventArgs) diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index ce2cf35..2d574f6 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -10339,7 +10339,7 @@ Public Class frmDYNachrichtenVerarbeitung '=====IMPORT IN VERAG DATENMODELL========== Dim IMP As New DAKOSY_Worker.cImporter_DakosyToVERAG - IMP.ImportDakosyEZA(EZA_TMP, False) + IMP.ImportDakosyEZA(EZA_TMP, False, True) '================================== From a8504ac3a2e44c54ed032c8066f860d95acbdd36 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 13 Jan 2026 10:01:43 +0100 Subject: [PATCH 2/3] CBAM/VERAG Zollanmeldungen --- DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb | 12 ++ .../DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb | 24 ++++ DAKOSY_Worker/cImporter_DHFToVERAG.vb | 10 +- DAKOSY_Worker/cImporter_DakosyToVERAG.vb | 130 +++++++++--------- DAKOSY_Worker/cImporter_TelotecToVERAG.vb | 9 +- MailSender/MAILSender.vb | 19 ++- .../frmDYNachrichtenVerarbeitung.vb | 6 +- .../frmStartOptions.Designer.vb | 15 ++ initATLASAufschubkonten/frmStartOptions.vb | 8 +- .../frmTCNachrichtenVerarbeitung.vb | 2 +- 10 files changed, 158 insertions(+), 77 deletions(-) diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb index 20b4171..ec4d27a 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb @@ -431,6 +431,18 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_ End Try Return LOADByAnmID End Function + Sub loadAll() + + Me.LOAD_Unterlagen() + Me.LOAD_Warenposition() + + Me.LOAD_Adressen() + Me.LOAD_Aufschub() + Me.LOAD_BEAnteilZLAVUV() + Me.LOAD_SumABeendigungsAnteil() + + + End Sub Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False) As cDakosyEZA Try Dim EZA As New cDakosyEZA diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb index 6fe354d..2d254ba 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb @@ -208,6 +208,30 @@ Public Class cDakosyEZA_Greenpulse Return dest End Function + Public Shared Sub INSERT_KAFKA(za As cVERAG_CustomsDeclarations) + Try + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS Is Nothing Then + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS = New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID) + End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CBAM_INSERT_KAFKA") Then + Dim key = cATEZ_Greenpulse_KafkaDecs.GetUniqueKey_Pipe_FromVERAG_CustomsDec(za, za.za_MRN) + Dim rec = cDakosyEZA_Greenpulse.BuildByMrn(za) + Dim dr = cATEZ_Greenpulse_KafkaDecs.InsertOrUpdateToKafkaSync_Bool(rec, key, 30000) + 'Unlerlagen + If za.za_SendungsId IsNot Nothing AndAlso za.za_SendungsId > 0 Then + Dim rec_inv = cDakosyEZA_Greenpulse.BuildInvoices(za.za_SendungsId) + Dim dr_inv = cATEZ_Greenpulse_KafkaInvoices.InsertOrUpdateToKafkaSync_Bool(rec_inv, key, 30000) + End If + End If + + Catch ex As Exception + Try + cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & za.za_MRN, Reflection.MethodInfo.GetCurrentMethod.Name) + Catch ex2 As Exception + cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Try + End Sub Public Shared Function BuildByMrn(za As cVERAG_CustomsDeclarations) As cATEZ_Greenpulse_KafkaDecs If za Is Nothing Then Throw New ArgumentNullException(NameOf(za)) diff --git a/DAKOSY_Worker/cImporter_DHFToVERAG.vb b/DAKOSY_Worker/cImporter_DHFToVERAG.vb index 160e3bd..9c595b4 100644 --- a/DAKOSY_Worker/cImporter_DHFToVERAG.vb +++ b/DAKOSY_Worker/cImporter_DHFToVERAG.vb @@ -13,7 +13,7 @@ Public Class cImporter_DHFToVERAG ' ===================================================================== ' MAIN ENTRY ' ===================================================================== - Public Function ImportEZOLLByLRN(CRN As String, EZOLL_DB As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = True) As Boolean + Public Function ImportEZOLLByLRN(CRN As String, EZOLL_DB As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = False) As Boolean Try If String.IsNullOrWhiteSpace(CRN) Then Return False @@ -192,10 +192,12 @@ Public Class cImporter_DHFToVERAG ZA.checkfreshCBAMWarning() End If - ' --------------------------------------------------------------- ' SAVE - ' --------------------------------------------------------------- - Return ZA.SAVE() + Dim saved = ZA.SAVE() + ' ======KAFKA========================================================== + If freshInsert Then cDakosyEZA_Greenpulse.INSERT_KAFKA(ZA) + ' ================================================================ + Return saved Catch ex As Exception cErrorHandler.ERR(ex.Message, ex.StackTrace, MethodInfo.GetCurrentMethod.Name) diff --git a/DAKOSY_Worker/cImporter_DakosyToVERAG.vb b/DAKOSY_Worker/cImporter_DakosyToVERAG.vb index 4cca6b6..45c0847 100644 --- a/DAKOSY_Worker/cImporter_DakosyToVERAG.vb +++ b/DAKOSY_Worker/cImporter_DakosyToVERAG.vb @@ -34,92 +34,92 @@ Public Class cImporter_DakosyToVERAG ' ================================================================ ' HEADER ' ================================================================ - Dim VERAG_ZA As cVERAG_CustomsDeclarations + Dim ZA As cVERAG_CustomsDeclarations If If(eza.eza_MRN, If(eza.eza_ANR, "")) = "" Then - VERAG_ZA = New cVERAG_CustomsDeclarations + ZA = New cVERAG_CustomsDeclarations Else - VERAG_ZA = cVERAG_CustomsDeclarations.loadByMRN(If(eza.eza_MRN, If(eza.eza_ANR, "")), False) + ZA = cVERAG_CustomsDeclarations.loadByMRN(If(eza.eza_MRN, If(eza.eza_ANR, "")), False) End If - VERAG_ZA.za_System = "DAKOSY" - VERAG_ZA.za_CustomsSystem = "ATLAS" - VERAG_ZA.za_REGIME = "IMPORT" - VERAG_ZA.za_CustomsSystemCountry = "DE" - VERAG_ZA.za_IsExternalSystem = False - VERAG_ZA.za_IsFinalDeclaration = True + ZA.za_System = "DAKOSY" + ZA.za_CustomsSystem = "ATLAS" + ZA.za_REGIME = "IMPORT" + ZA.za_CustomsSystemCountry = "DE" + ZA.za_IsExternalSystem = False + ZA.za_IsFinalDeclaration = True - VERAG_ZA.za_Firma = eza.eza_firma - VERAG_ZA.za_Niederlassung = eza.eza_niederlassung + ZA.za_Firma = eza.eza_firma + ZA.za_Niederlassung = eza.eza_niederlassung - VERAG_ZA.za_MRN = If(eza.eza_MRN, eza.eza_ANR) - VERAG_ZA.za_LRN = eza.eza_ObjectName + ZA.za_MRN = If(eza.eza_MRN, eza.eza_ANR) + ZA.za_LRN = eza.eza_ObjectName - VERAG_PROG_ALLGEMEIN.cProgramFunctions.tryGetFirmaNiederlassung(VERAG_ZA.za_Firma, VERAG_ZA.za_Niederlassung, "", VERAG_ZA.za_LRN) - VERAG_PROG_ALLGEMEIN.cProgramFunctions.tryGetAvisoId_SndId_ByLRN(VERAG_ZA.za_LRN, VERAG_ZA.za_AvisoId, VERAG_ZA.za_SendungsId) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.tryGetFirmaNiederlassung(ZA.za_Firma, ZA.za_Niederlassung, "", ZA.za_LRN) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.tryGetAvisoId_SndId_ByLRN(ZA.za_LRN, ZA.za_AvisoId, ZA.za_SendungsId) Dim DY = cDakosy_Zollanmeldungen.LOADById(eza.eza_dyaAnmID) If DY IsNot Nothing Then - If VERAG_ZA.za_AvisoId Is Nothing AndAlso DY.dy_AvisoId IsNot Nothing Then VERAG_ZA.za_AvisoId = DY.dy_AvisoId - If VERAG_ZA.za_SendungsId Is Nothing AndAlso DY.dy_SendungsId IsNot Nothing Then VERAG_ZA.za_SendungsId = DY.dy_SendungsId + If ZA.za_AvisoId Is Nothing AndAlso DY.dy_AvisoId IsNot Nothing Then ZA.za_AvisoId = DY.dy_AvisoId + If ZA.za_SendungsId Is Nothing AndAlso DY.dy_SendungsId IsNot Nothing Then ZA.za_SendungsId = DY.dy_SendungsId End If If eza.eza_Anmeldedatum IsNot Nothing AndAlso eza.eza_Anmeldedatum.ToString <> "" Then - VERAG_ZA.za_DeclarationDate = CDate(eza.eza_Anmeldedatum) - VERAG_ZA.za_ReleaseDate = CDate(eza.eza_Anmeldedatum) + ZA.za_DeclarationDate = CDate(eza.eza_Anmeldedatum) + ZA.za_ReleaseDate = CDate(eza.eza_Anmeldedatum) Else Dim dateumRelease As String = (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(dySt_DakosyTransaktionsDatum,'')", "[tblDakosy_Statusmeldungen]", " dySt_status = 60 And dySt_dyId = '" & eza.eza_dyaAnmID & "' Order By [dySt_DakosyTransaktionsDatum] desc", "FMZOLL",) If dateumRelease <> "" AndAlso IsDate(dateumRelease) Then - VERAG_ZA.za_DeclarationDate = CDate(dateumRelease) - VERAG_ZA.za_ReleaseDate = CDate(dateumRelease) + ZA.za_DeclarationDate = CDate(dateumRelease) + ZA.za_ReleaseDate = CDate(dateumRelease) Else - VERAG_ZA.za_DeclarationDate = ToNullableDate(If(eza.eza_Anmeldedatum, eza.eza_LetzteBearbeitung)) - VERAG_ZA.za_ReleaseDate = ToNullableDate(If(eza.eza_Anmeldedatum, eza.eza_LetzteBearbeitung)) + ZA.za_DeclarationDate = ToNullableDate(If(eza.eza_Anmeldedatum, eza.eza_LetzteBearbeitung)) + ZA.za_ReleaseDate = ToNullableDate(If(eza.eza_Anmeldedatum, eza.eza_LetzteBearbeitung)) End If End If - VERAG_ZA.za_MainProcedure = eza.eza_VerfahrenBeantragtCode - VERAG_ZA.za_RepresentationCode = eza.eza_VertretungsVerhaeltnisCode - VERAG_ZA.za_FiscalRepFlag = ToNullableBool(eza.eza_FiskalvertretungKz) - VERAG_ZA.za_ApplicantVATNo = ToStringSafe(eza.eza_UstIdAnmelder) - VERAG_ZA.za_ApplicantTaxOffice = ToStringSafe(eza.eza_FinanzamtAnmelder) - VERAG_ZA.za_TaxDeduction = ToNullableBool(eza.eza_Vorsteuerabzug) + ZA.za_MainProcedure = eza.eza_VerfahrenBeantragtCode + ZA.za_RepresentationCode = eza.eza_VertretungsVerhaeltnisCode + ZA.za_FiscalRepFlag = ToNullableBool(eza.eza_FiskalvertretungKz) + ZA.za_ApplicantVATNo = ToStringSafe(eza.eza_UstIdAnmelder) + ZA.za_ApplicantTaxOffice = ToStringSafe(eza.eza_FinanzamtAnmelder) + ZA.za_TaxDeduction = ToNullableBool(eza.eza_Vorsteuerabzug) - VERAG_ZA.za_CountryDispatch = eza.eza_VersendungsLandCode - VERAG_ZA.za_CountryDestination = eza.eza_Bestimmungsland - VERAG_ZA.za_CountryDestinationState = eza.eza_Bestimmungsbundesland + ZA.za_CountryDispatch = eza.eza_VersendungsLandCode + ZA.za_CountryDestination = eza.eza_Bestimmungsland + ZA.za_CountryDestinationState = eza.eza_Bestimmungsbundesland - VERAG_ZA.za_ContainerNr1 = eza.eza_ContainerNr1 - VERAG_ZA.za_ContainerNr2 = eza.eza_ContainerNr2 - VERAG_ZA.za_ContainerNr3 = eza.eza_ContainerNr3 - VERAG_ZA.za_ContainerNr4 = eza.eza_ContainerNr4 - VERAG_ZA.za_ContainerNr5 = eza.eza_ContainerNr5 - VERAG_ZA.za_ContainerNr6 = eza.eza_ContainerNr6 - VERAG_ZA.za_ContainerNr7 = eza.eza_ContainerNr7 - VERAG_ZA.za_ContainerNr8 = eza.eza_ContainerNr8 - VERAG_ZA.za_ContainerNr9 = eza.eza_ContainerNr9 + ZA.za_ContainerNr1 = eza.eza_ContainerNr1 + ZA.za_ContainerNr2 = eza.eza_ContainerNr2 + ZA.za_ContainerNr3 = eza.eza_ContainerNr3 + ZA.za_ContainerNr4 = eza.eza_ContainerNr4 + ZA.za_ContainerNr5 = eza.eza_ContainerNr5 + ZA.za_ContainerNr6 = eza.eza_ContainerNr6 + ZA.za_ContainerNr7 = eza.eza_ContainerNr7 + ZA.za_ContainerNr8 = eza.eza_ContainerNr8 + ZA.za_ContainerNr9 = eza.eza_ContainerNr9 - VERAG_ZA.za_MeansOfTransport_Vehicle = eza.eza_KennzeichenNameBefoerderungsmittelAnkunft - VERAG_ZA.za_MeansOfTransport_Nationality = eza.eza_BeförderungsmittelGrenzeStaatszugehörigkeitCode - VERAG_ZA.za_MeansOfTransport_Type = eza.eza_BeförderungsmittelGrenzeArt - VERAG_ZA.za_CountryImport = "DE" - VERAG_ZA.za_WarehouseCode = eza.eza_Warenort - VERAG_ZA.za_InvoiceAmount = eza.eza_Rechnungspreis - VERAG_ZA.za_InvoiceCurrency = eza.eza_Rechnungswaehrung - VERAG_ZA.za_DV1Flag = ToNullableBool(eza.eza_DV1Kz) - VERAG_ZA.za_PrevDocument_No = eza.eza_VorpapierNr - VERAG_ZA.za_PrevDocument_Type = eza.eza_VorpapierArtCode + ZA.za_MeansOfTransport_Vehicle = eza.eza_KennzeichenNameBefoerderungsmittelAnkunft + ZA.za_MeansOfTransport_Nationality = eza.eza_BeförderungsmittelGrenzeStaatszugehörigkeitCode + ZA.za_MeansOfTransport_Type = eza.eza_BeförderungsmittelGrenzeArt + ZA.za_CountryImport = "DE" + ZA.za_WarehouseCode = eza.eza_Warenort + ZA.za_InvoiceAmount = eza.eza_Rechnungspreis + ZA.za_InvoiceCurrency = eza.eza_Rechnungswaehrung + ZA.za_DV1Flag = ToNullableBool(eza.eza_DV1Kz) + ZA.za_PrevDocument_No = eza.eza_VorpapierNr + ZA.za_PrevDocument_Type = eza.eza_VorpapierArtCode - VERAG_ZA.za_Incoterms = eza.eza_LieferbedingungCode - VERAG_ZA.za_IncotermsPlace = eza.eza_LieferbedingungOrt + ZA.za_Incoterms = eza.eza_LieferbedingungCode + ZA.za_IncotermsPlace = eza.eza_LieferbedingungOrt - VERAG_ZA.za_Sachbearbeiter = eza.eza_AnmeldenderBearbeiterName - VERAG_ZA.za_TotGrossMass = ToNullableDecimal(eza.eza_GesamtRohmasse) + ZA.za_Sachbearbeiter = eza.eza_AnmeldenderBearbeiterName + ZA.za_TotGrossMass = ToNullableDecimal(eza.eza_GesamtRohmasse) - VERAG_ZA.za_TransportModeBorder = ToStringSafe(eza.eza_VerkehrszweigGrenze) + ZA.za_TransportModeBorder = ToStringSafe(eza.eza_VerkehrszweigGrenze) ' ================================================================ ' ADRESSEN @@ -160,7 +160,7 @@ Public Class cImporter_DakosyToVERAG End If - VERAG_ZA.Parties.Add(party) + ZA.Parties.Add(party) Next End If @@ -185,7 +185,7 @@ Public Class cImporter_DakosyToVERAG duty.zaDuty_Currency = "EUR" duty.zaDuty_LimitDate = ToNullableDate(d.ezaAfb_Faelligkeit) - VERAG_ZA.Duties.Add(duty) + ZA.Duties.Add(duty) Next End If @@ -205,7 +205,7 @@ Public Class cImporter_DakosyToVERAG - VERAG_ZA.Documents.Add(doc) + ZA.Documents.Add(doc) Next End If @@ -285,7 +285,7 @@ Public Class cImporter_DakosyToVERAG Next End If - VERAG_ZA.Items.Add(item) + ZA.Items.Add(item) Next End If @@ -293,16 +293,16 @@ Public Class cImporter_DakosyToVERAG 'CBAM WARNING ' ================================================================ If freshInsert Then - VERAG_ZA.checkfreshCBAMWarning() + ZA.checkfreshCBAMWarning() End If ' ================================================================ - - ' ================================================================ ' SAVE + Dim saved = ZA.SAVE() + ' ======KAFKA========================================================== + If freshInsert Then cDakosyEZA_Greenpulse.INSERT_KAFKA(ZA) ' ================================================================ - - Return VERAG_ZA.SAVE() + Return saved Catch ex As Exception diff --git a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb index d32caac..d2a245c 100644 --- a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb +++ b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb @@ -11,7 +11,7 @@ Public Class cImporter_TelotecToVERAG ' ===================================================================== ' MAIN ENTRY ' ===================================================================== - Public Function ImportTelotec(CRN As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = True) As Boolean + Public Function ImportTelotec(CRN As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = False) As Boolean If CRN Is Nothing Then Return False If CRN = "" Then Return False @@ -22,7 +22,7 @@ Public Class cImporter_TelotecToVERAG Return False End Function - Public Function ImportTelotec(tel As cTelotec_Anmeldung, Optional overwrite As Boolean = True, Optional freshinsert As Boolean = True) As Boolean + Public Function ImportTelotec(tel As cTelotec_Anmeldung, Optional overwrite As Boolean = True, Optional freshinsert As Boolean = False) As Boolean Try If tel Is Nothing Then Return False If String.IsNullOrWhiteSpace(ToStringSafe(tel.Refs_LRN)) AndAlso @@ -187,8 +187,11 @@ Public Class cImporter_TelotecToVERAG ' ================================================================ ' ================================================================ ' SAVE + Dim saved = ZA.SAVE() + ' ======KAFKA========================================================== + cDakosyEZA_Greenpulse.INSERT_KAFKA(ZA) ' ================================================================ - Return ZA.SAVE() + Return saved Catch ex As Exception cErrorHandler.ERR(ex.Message, ex.StackTrace, MethodInfo.GetCurrentMethod.Name) diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 0111d56..28297e1 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -50,7 +50,7 @@ Module Mail 'Exit Sub - 'PARAM = "ZF_QUARTER" + ' PARAM = "TETRAPAK_OKT" 'PARAM = "JAHRESABRECHNUNG AG-ZS" ' PARAM = "UID_OPS_SYSKA_ABGLEICH" @@ -472,6 +472,23 @@ Module Mail System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") End If End If + 'Case "TETRAPAK_OKT" 'umgebaut auf neue Mailsender-Logik + ' Dim von = CDate("01.10.2025") + ' Dim bis = CDate("31.10.2025") + ' If dtParam.Rows.Count = 1 Then + ' System.Console.WriteLine("OPTION erkannt: " & dtParam.Rows(0).Item("ms_info")) + ' System.Console.WriteLine("Auswertung Details gestartet...") + ' If SendEmail_Tetrapak(dtParam.Rows(0).Item("ms_an"), von, bis, "DE", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) AndAlso SendEmail_Tetrapak(dtParam.Rows(0).Item("ms_an"), von, bis, "AT", dtParam.Rows(0).Item("ms_cc"), dtParam.Rows(0).Item("ms_bcc"), dtParam.Rows(0).Item("ms_subject"), dtParam.Rows(0).Item("ms_mailtext")) Then + ' System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + ' End If + ' Else + ' System.Console.WriteLine("OPTION erkannt: TETRA_PAK _ Erstellt eine monatliche Auswertung der DAKSOY/EZOLL-Abfertigungen für TETRAPAK.") + ' System.Console.WriteLine("Auswertung Details gestartet...") + + ' If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com; nikhil.mediratta@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com;nikhil.mediratta@tetrapak.com", von, bis, "AT") Then + ' System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + ' End If + ' End If Case "Imex_Kunden_keine_Abfertigung" 'umgebaut auf neue Mailsender-Logik Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year) diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index 2d574f6..98755b4 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -9120,6 +9120,7 @@ Public Class frmDYNachrichtenVerarbeitung Else EZA_TMP = saveDY_EZA(STATUS, DY_TMP, EZA.Transaktion.IOReferenz, If(zp, EZA.Transaktion.IODatumZeit)) End If + EZA_TMP.loadAll() 'Anmlededatum setzen EZA_TMP.eza_Anmeldedatum = zp @@ -9135,7 +9136,7 @@ Public Class frmDYNachrichtenVerarbeitung '=====IMPORT IN VERAG DATENMODELL========== Dim IMP As New DAKOSY_Worker.cImporter_DakosyToVERAG - IMP.ImportDakosyEZA(EZA_TMP, False) + IMP.ImportDakosyEZA(EZA_TMP, False, True) '================================== '=====ATEZ BEREITSTELLUNG========== @@ -10265,7 +10266,7 @@ Public Class frmDYNachrichtenVerarbeitung Else EZA_TMP = saveDY_EZA(STATUS, DY_TMP, EZA.Transaktion.IOReferenz, If(zp, EZA.Transaktion.IODatumZeit)) End If - + EZA_TMP.loadAll() Dim firma = "" Dim nl = "" @@ -10337,6 +10338,7 @@ Public Class frmDYNachrichtenVerarbeitung EZA_TMP.insertIntoSpedBuch(DY_TMP) + '=====IMPORT IN VERAG DATENMODELL========== Dim IMP As New DAKOSY_Worker.cImporter_DakosyToVERAG IMP.ImportDakosyEZA(EZA_TMP, False, True) diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 74631e2..83ca27b 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -363,6 +363,7 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button21 = New System.Windows.Forms.Button() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Button29 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1158,6 +1159,7 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Button29) Me.TabPage1.Controls.Add(Me.LinkLabel68) Me.TabPage1.Controls.Add(Me.PictureBox26) Me.TabPage1.Controls.Add(Me.cbxGestellungspeichern) @@ -4856,6 +4858,18 @@ Partial Class frmStartOptions Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' + 'Button29 + ' + Me.Button29.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button29.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button29.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button29.Location = New System.Drawing.Point(1072, 67) + Me.Button29.Name = "Button29" + Me.Button29.Size = New System.Drawing.Size(123, 24) + Me.Button29.TabIndex = 152 + Me.Button29.Text = "testKK" + Me.Button29.UseVisualStyleBackColor = True + ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -5273,4 +5287,5 @@ Partial Class frmStartOptions Friend WithEvents lblBackToCustomer_RMC As LinkLabel Friend WithEvents lblBackToCustomer_UTA As LinkLabel Friend WithEvents lblBackToCustomer_PLOSE As LinkLabel + Friend WithEvents Button29 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index a3a61d5..b2f72a0 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -6,6 +6,7 @@ Imports System.Security.Cryptography.X509Certificates Imports System.Text Imports System.Threading Imports System.Xml +Imports DAKOSY_Worker Imports MDM_Worker Imports Renci.SshNet Imports VERAG_PROG_ALLGEMEIN @@ -1001,7 +1002,7 @@ Public Class frmStartOptions '=====IMPORT IN VERAG DATENMODELL========== Dim IMP As New DAKOSY_Worker.cImporter_DHFToVERAG Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "UNIDPED" : IMP.ImportEZOLLByLRN(cDHF_Anhaenge.CRN, "EZOLL_UNISPED", False) + Case "UNISPED" : IMP.ImportEZOLLByLRN(cDHF_Anhaenge.CRN, "EZOLL_UNISPED", False, True) Case Else : IMP.ImportEZOLLByLRN(cDHF_Anhaenge.CRN, "EZOLL", False) End Select '========================================== @@ -7193,4 +7194,9 @@ repeatRequest: End Sub + Private Sub Button29_Click_1(sender As Object, e As EventArgs) Handles Button29.Click + Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True) + ZA.checkfreshCBAMWarning() + + End Sub End Class \ No newline at end of file diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index e2332eb..f6bd9cc 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -1058,7 +1058,7 @@ Public Class frmTCNachrichtenVerarbeitung '=====IMPORT IN VERAG DATENMODELL========== If TC.Hea_DecTy = "EUA" Then Dim IMP As New DAKOSY_Worker.cImporter_TelotecToVERAG - IMP.ImportTelotec(TC, False) + IMP.ImportTelotec(TC, False, True) End If '================================== From eb4fdfaf58e57821915f5d84d49d3fd47ff9da49 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 14 Jan 2026 08:46:16 +0100 Subject: [PATCH 3/3] Codelisten --- initATLASAufschubkonten/frmStartOptions.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index b2f72a0..30bc00e 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -7195,7 +7195,8 @@ repeatRequest: End Sub Private Sub Button29_Click_1(sender As Object, e As EventArgs) Handles Button29.Click - Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True) + 'Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True) + Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7701ACA0024DR0", True) ZA.checkfreshCBAMWarning() End Sub