From 79e6765c62c64b307cef3e6675632df138ca6b33 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 19 Sep 2025 12:02:56 +0200 Subject: [PATCH 01/10] plose, StartOpt. --- MDM_Worker/cPLOSE_Inv_Data.vb | 84 ++++---- .../frmNachrichtenVerarbeitung_MDM_divers.vb | 180 +++++++++++++++--- .../frmStartOptions.Designer.vb | 142 ++++++++------ initATLASAufschubkonten/frmStartOptions.vb | 28 ++- 4 files changed, 313 insertions(+), 121 deletions(-) diff --git a/MDM_Worker/cPLOSE_Inv_Data.vb b/MDM_Worker/cPLOSE_Inv_Data.vb index 0f9d05d..2f9393b 100644 --- a/MDM_Worker/cPLOSE_Inv_Data.vb +++ b/MDM_Worker/cPLOSE_Inv_Data.vb @@ -211,7 +211,7 @@ Public Class cPLOSE_Inv_Data If jahr < 2020 Then Return False - Dim REohneDAID As String = "Select plInv_Id, plInv_PdfFileName, plInv_daId, plInv_PLOSEKundennummer FROM [tblPLOSE_Inv_Data] where plInv_daId Is null And plInv_PdfFileName Is Not null And Year(plInv_SupplierRechnungsDatum) = " & jahr & IIf(kdNr > 0, " and plInv_PLOSEKundennummer = " & kdNr, "") + Dim REohneDAID As String = "Select plInv_Id, plInv_Dateiname,plInv_PdfFileName, plInv_daId, plInv_PLOSEKundennummer FROM [tblPLOSE_Inv_Data] where plInv_daId Is null And plInv_PdfFileName Is Not null And Year(plInv_SupplierRechnungsDatum) = " & jahr & IIf(kdNr > 0, " and plInv_PLOSEKundennummer = " & kdNr, "") Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim dtREohneDAID As DataTable = SQL.loadDgvBySql(REohneDAID, "FMZOLL") @@ -234,56 +234,72 @@ Public Class cPLOSE_Inv_Data filename2 = filename.Replace("-", "_") + 'If r.Item("plInv_Dateiname") = "830850-PSS-MAUT. PLOSE BOX-2025-07-14-000000-999999-00_RGDAT_17.07.2025.csv" Then + + ' filename3 = filename.ToString().Substring(0, 9) + ' filename3 &= "%" + ' filename3 &= filename.ToString().Substring(9, filename.Length - 9) + ' filename4 = filename3.Replace("-", "_") + + ' filename3 = filename3.Replace(" ", "") + ' filename4 = filename4.Replace(" ", "") + 'End If + If Regex.IsMatch(filename, "^[A-Za-z]") Then - Dim match As Match = Regex.Match(filename, "\d+") - If match.Success Then - filename3 = filename.Substring(match.Index).Trim - filename4 = filename.Replace("-", "_") - End If + Dim match As Match = Regex.Match(filename, "\d+") + If match.Success Then + filename3 = filename.Substring(match.Index).Trim + filename4 = filename.Replace("-", "_") + End If - ElseIf filename.Contains("_dk") Then 'Sonderlogik Dänemark + ElseIf filename.Contains("_dk") Then 'Sonderlogik Dänemark - filename3 = filename.Replace(jahrEnd & "-", jahrEnd) + filename3 = filename.Replace(jahrEnd & "-", jahrEnd) filename4 = filename.Replace(jahrEnd & "-", jahrEnd) + filename3 = filename3.Replace(" ", "") + filename4 = filename4.Replace(" ", "") + ElseIf filename.Contains("_fy") Then 'Sonderlogik Norwegen - Dim indexOfFirst_ = filename.IndexOf("_fy") - If filename.Length > indexOfFirst_ + 5 Then - Dim month = filename.Substring(indexOfFirst_ + 3, 2) - If IsNumeric(month) Then - Dim test = month.IndexOf(0) - Dim monthWithoutLeadingZero As String = month - If monthWithoutLeadingZero.IndexOf(0) = 0 Then monthWithoutLeadingZero = monthWithoutLeadingZero.Replace("0", "") - filename3 = filename.Replace(jahrEnd & month, jahrEnd & monthWithoutLeadingZero) + Dim indexOfFirst_ = filename.IndexOf("_fy") + If filename.Length > indexOfFirst_ + 5 Then + Dim month = filename.Substring(indexOfFirst_ + 3, 2) + If IsNumeric(month) Then + Dim test = month.IndexOf(0) + Dim monthWithoutLeadingZero As String = month + If monthWithoutLeadingZero.IndexOf(0) = 0 Then monthWithoutLeadingZero = monthWithoutLeadingZero.Replace("0", "") + filename3 = filename.Replace(jahrEnd & month, jahrEnd & monthWithoutLeadingZero) filename4 = filename.Replace(jahrEnd & month, jahrEnd & monthWithoutLeadingZero) + filename3 = filename3.Replace(" ", "") + filename4 = filename4.Replace(" ", "") End If + End If + + + + + End If + + Dim daId As Integer = 0 + If filename3 = "" Then + daId = CInt(SQL.getValueTxtBySql("Select top(1) isnull(da_id,0) FROM tblDatenarchiv WHERE da_KundenNr = 0 And da_kategorie = 'MDM' AND da_ordner='MDM_DATEN' AND da_uOrdner1= 'PLOSE' AND da_uOrdner2= '" & jahr & "' AND (da_name like '%" & filename & "' or da_name like '%" & filename2 & "')", "FMZOLL",,, 0)) + Else + daId = CInt(SQL.getValueTxtBySql("Select top(1) isnull(da_id,0) FROM tblDatenarchiv WHERE da_KundenNr = 0 And da_kategorie = 'MDM' AND da_ordner='MDM_DATEN' AND da_uOrdner1= 'PLOSE' AND da_uOrdner2= '" & jahr & "' AND (da_name like '%" & filename & "' or da_name like '%" & filename2 & "' or da_name like '%" & filename3 & "' or da_name like '%" & filename4 & "')", "FMZOLL",,, 0)) End If - - End If - - Dim daId As Integer = 0 - If filename3 = "" Then - daId = CInt(SQL.getValueTxtBySql("Select top(1) isnull(da_id,0) FROM tblDatenarchiv WHERE da_KundenNr = 0 And da_kategorie = 'MDM' AND da_ordner='MDM_DATEN' AND da_uOrdner1= 'PLOSE' AND da_uOrdner2= '" & jahr & "' AND (da_name like '%" & filename & "' or da_name like '%" & filename2 & "')", "FMZOLL",,, 0)) - Else - daId = CInt(SQL.getValueTxtBySql("Select top(1) isnull(da_id,0) FROM tblDatenarchiv WHERE da_KundenNr = 0 And da_kategorie = 'MDM' AND da_ordner='MDM_DATEN' AND da_uOrdner1= 'PLOSE' AND da_uOrdner2= '" & jahr & "' AND (da_name like '%" & filename & "' or da_name like '%" & filename2 & "' or da_name like '%" & filename3 & "' or da_name like '%" & filename4 & "')", "FMZOLL",,, 0)) - End If - - - - If daId > 0 Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - Dim Path As String = DS.GET_TOP1_PATH() - If Path <> "" And System.IO.File.Exists(Path) Then - SQL.doSQL("UPDATE [tblPLOSE_Inv_Data] SET plInv_daId = " & DS.da_id & ", plInv_daIdgesetztDatum = getdate() WHERE plInv_Id = " & r.Item("plInv_Id") & " AND plInv_daId is null", "FMZOLL") + If daId > 0 Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + Dim Path As String = DS.GET_TOP1_PATH() + If Path <> "" And System.IO.File.Exists(Path) Then + SQL.doSQL("UPDATE [tblPLOSE_Inv_Data] SET plInv_daId = " & DS.da_id & ", plInv_daIdgesetztDatum = getdate() WHERE plInv_Id = " & r.Item("plInv_Id") & " AND plInv_daId is null", "FMZOLL") + End If End If End If - End If Next diff --git a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb index efc91f4..6cee86f 100644 --- a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb +++ b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb @@ -4,6 +4,7 @@ Imports System.Text Imports System.Text.RegularExpressions Imports System.Web Imports System.Xml +Imports io.konik.zugferd Imports Renci.SshNet Imports Renci.SshNet.Sftp Imports VERAG_PROG_ALLGEMEIN @@ -23,6 +24,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers Dim Dateiname = "" Public year As Integer Public UtaTestkunden As Boolean = False + Public RMCNewFormat As Boolean = True Sub New(programName As String) @@ -526,11 +528,17 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers Exit Sub End If + Dim dt As New DataTable + Dim deleteTable As Boolean = False Dim verarbeitungspfad, zielpfad If programName.Contains("RMC") Then verarbeitungspfad = rmc.VERARBEITUNG_PFAD zielpfad = rmc.ZIEL_PFAD + + dt.Columns.Add("KundenNr", GetType(String)) + dt.Columns.Add("UID", GetType(String)) + ElseIf programName.Contains("UTA") Then verarbeitungspfad = uta.VERARBEITUNG_PFAD zielpfad = uta.ZIEL_PFAD @@ -552,6 +560,8 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers If programName.Contains("RMC") Then + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + Select Case i Case 1 @@ -561,7 +571,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers If fi.Extension.ToLower = ".csv" Then If Not found Then - If readRMC(d) <> "" Then found = True + If readRMC(d, programName) <> "" Then found = True End If If found Then cntDatenEingelesen += 1 End If @@ -580,30 +590,126 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers 'd.breimaier: 2024-06-05 aktuell nur die RMC-Dateien! (später, wenn CSV vollständig, dann alle PDFs importieren! 'd.breimaier: 2024-06-17 laut Christian Schuster von Comcore (EDV-BEtr. von RMC) nicht möglich CSV mit easytrip und sofico Datensätzen zu ergängen! - If fi.Name.ToString.StartsWith("invoice_") Then + 'd.breimaier: 2025-09-15 laut Christian Schuster erhalten wir nun die Rechnungen mit folgenden Aufbau: - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d)) + '• fixwert invoice + '• Kundennummer 26807 (in der CSV enthalten) + '• Abrechnungnummer 5549 (Stimmt mit der Abrechnungsnummer im Dateinamen der CSV überein) + '• RechnungsNr "262014347" (in der CSV enthalten) - nicht verwechseln mit RechngsNrSL + '• Das Land AT, DE, FR... + '• zuletzt steht orig. Das ist für euch nicht wichtig, bedeutet nur das ist das Original und keine Kopie - DS.uploadDataToDATENSERVER(d,,,,,, True) + 'easytrip-Rechnungen sind immer ITALIEN! + + Dim fileNamePath As String = d + + 'If fi.Name.ToString.StartsWith("invoice_") Then + + If RMCNewFormat Then + + Dim destFilename As String = fi.FullName + + destFilename = destFilename.Replace(".pdf", IIf(programName.ToLower.Contains("nto"), "_nto", "_bto") & ".pdf") + + System.IO.File.Move(fi.FullName, destFilename) 'Datei umbenennen + + fileNamePath = destFilename + + End If + + If fi.Name.ToString.StartsWith("invoice_") OrElse (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'RMC Eigenrechnungen + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath)) + + DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True) + + If fi.Name.ToString.StartsWith("invoice_") Then + + SQL.doSQL("Update [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL") + + ElseIf (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'EasyTrip IT Rechnungen + + Dim fileNameEasyTrip As String = fi.Name + + fileNameEasyTrip = fileNameEasyTrip.Replace("maut_", "") + fileNameEasyTrip = fileNameEasyTrip.Replace("EGR_con", "") + + 'maut_24952_EGR_con00079883FITFIT2002A25-07993920250908120506AT70DE_341929194_.pdf + + '24952_00079883FITFIT2002A25-07993920250908120506AT70DE_341929194_.pdf + + 'RechnungNr: FIT2002A25-079939 + 'Datum: 08/09/2025 + 'Land: IT + 'VAT: DE_341929194 + + Dim indexOfFIT = fileNameEasyTrip.LastIndexOf("FITFIT") + 3 + + Dim kdNr As String = fileNameEasyTrip.Substring(0, 5) + Dim invoiceNo As String = "" 'FIT2002A25-079939 + Dim invoiceDate As String = "" '20250908 + Dim UID As String = "" 'DE_341929194 + + Dim RMC As New cRMC() 'easytry über Filename anlegen! + + invoiceNo = fileNameEasyTrip.Substring(indexOfFIT, 17) + invoiceDate = fileNameEasyTrip.Substring(indexOfFIT + 17, 8) + Dim parsedDate As DateTime = DateTime.ParseExact(invoiceDate, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture) + + UID = fileNameEasyTrip.Substring(fileNameEasyTrip.IndexOf("AT70") + 4, 12) + UID = UID.Replace("_", "") + + RMC.rmc_reDatum = parsedDate.ToString("dd.MM.yyyy") + RMC.rmc_importDatum = Now() + RMC.rmc_kdNr = kdNr + RMC.rmc_UID = UID + RMC.rmc_landKZ = "IT" + RMC.rmc_landBezeichnung = "Italien" + RMC.rmc_reDatum = parsedDate + RMC.rmc_reNr = invoiceNo + RMC.rmc_waehrung = "EUR" + RMC.rmc_daId = DS.da_id + RMC.rmc_pdfFileName = fi.Name + + 'EasyTrip können die Beträge initual nicht ausgelesen werden, dürfen aber nicht 0 sein! + RMC.rmc_betragBrutto = 0.01 + RMC.rmc_betragMWST = 0.01 + RMC.rmc_betragNetto = 0.01 + RMC.rmc_euroBrutto = 0.01 + + + If RMC.SAVE() Then + + + Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr) + If Not adress.hasEntry Then + Dim R As DataRow = dt.NewRow + R("KundenNr") = RMC.rmc_kdNr + R("UID") = RMC.rmc_UID + dt.Rows.Add(R) + End If + + End If + + End If - SQL.doSQL("Update [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL") End If 'copy file to lydia - - Dim filepathToLydia = IIf(rmc.PDFRECHNUNGEN <> "", rmc.PDFRECHNUNGEN, "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\") - If Dateiname.ToString.ToLower.Contains("nto") Then - frmStartOptions.copyFile(d, filepathToLydia & "NETTO\") - Else - frmStartOptions.copyFile(d, filepathToLydia & "BRUTTO\") + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + Dim filepathToLydia = IIf(rmc.PDFRECHNUNGEN <> "", rmc.PDFRECHNUNGEN, "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\") + If Dateiname.ToString.ToLower.Contains("nto") Then + frmStartOptions.copyFile(fileNamePath, filepathToLydia & "NETTO\") + Else + frmStartOptions.copyFile(fileNamePath, filepathToLydia & "BRUTTO\") + End If End If - frmStartOptions.moveFile_DateBack(d, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name) dgvEinarbeitung.Refresh() - End If @@ -955,6 +1061,23 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers If programName.Contains("UTA") Then uta.importUTALeistungen() + If programName.Contains("RMC") Then + + + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + If dt.Rows.Count > 0 Then + Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False,) + If filepath <> "" Then + Dim anhenge As New List(Of String) + anhenge.Add(filepath) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr (EASYTRIP)", "Im Anhang die zu prüfenden Kunden von WÖLFL EasyTrip: " & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) + End If + End If + + End If + + End If + End Sub @@ -979,7 +1102,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers End Sub - Function readRMC(d As String) As String + Function readRMC(d As String, typ As String) As String Try Dim fi As FileInfo = New FileInfo(d) @@ -989,6 +1112,10 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers Dim fileNr = filetimestamp.Substring(0, IIf(filetimestamp.Length > 8, filetimestamp.Length - 8, filetimestamp.Length)) Dim fileType = IIf(fi.Name.ToLower.Contains("nto"), "netto", "brutto") + If RMCNewFormat Then + fileType = IIf(typ.ToLower.Contains("nto"), "netto", "brutto") + End If + Dim dt As New DataTable dt.Columns.Add("KundenNr", GetType(String)) dt.Columns.Add("Kunde", GetType(String)) @@ -1030,13 +1157,14 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers End Using addDGVEinarbeitung("RMC: Detail" & kdNr, readRMC) - - If dt.Rows.Count > 0 Then - Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False,) - If filepath <> "" Then - Dim anhenge As New List(Of String) - anhenge.Add(filepath) - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL für Importdatei: " & fi.Name & vbNewLine & "Pro Importdatei wird ein Email generiert/gesendet" & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + If dt.Rows.Count > 0 Then + Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False,) + If filepath <> "" Then + Dim anhenge As New List(Of String) + anhenge.Add(filepath) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL für Importdatei: " & fi.Name & vbNewLine & "Pro Importdatei wird ein Email generiert/gesendet" & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) + End If End If End If @@ -1142,7 +1270,15 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers End If RMC.rmc_euroBrutto = SQL.isleernothing(currentRow(13)) - RMC.rmc_pdfFileName = "invoice_" & RMC.rmc_kdNr & "_" & filenr & "_" & RMC.rmc_sammelReNr & IIf(fileType = "netto", "_nto_e_verag.pdf", "_bto_e_verag.pdf") + + If RMCNewFormat Then + RMC.rmc_pdfFileName = "invoice_" & RMC.rmc_kdNr & "_" & filenr & "_" & RMC.rmc_sammelReNr & "_" & RMC.rmc_landKZ & "_orig" & IIf(fileType = "netto", "_nto", "_bto") & ".pdf" + Else + RMC.rmc_pdfFileName = "invoice_" & RMC.rmc_kdNr & "_" & filenr & "_" & RMC.rmc_sammelReNr & IIf(fileType = "netto", "_nto_e_verag.pdf", "_bto_e_verag.pdf") + End If + + + If RMC.SAVE() Then If kdNr <> RMC.rmc_kdNr Then diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 23742af..5a6f39b 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -277,6 +277,11 @@ Partial Class frmStartOptions Me.Button27 = New System.Windows.Forms.Button() Me.lblWartungen = New System.Windows.Forms.Label() Me.TabPage7 = New System.Windows.Forms.TabPage() + Me.cbxMailsenden = New System.Windows.Forms.CheckBox() + Me.cbxKundenbesonderheitenCS = New System.Windows.Forms.CheckBox() + Me.lblCS_DB = New System.Windows.Forms.Label() + Me.lbl_CS_online = New System.Windows.Forms.Label() + Me.cbxTestsystemCS = New System.Windows.Forms.CheckBox() Me.lblCSPortfolio = New System.Windows.Forms.Label() Me.bcxKundendatenaktCS = New System.Windows.Forms.CheckBox() Me.cbCheckDate = New System.Windows.Forms.CheckBox() @@ -306,11 +311,8 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() Me.Button21 = New System.Windows.Forms.Button() - Me.cbxTestsystemCS = New System.Windows.Forms.CheckBox() - Me.lbl_CS_online = New System.Windows.Forms.Label() - Me.lblCS_DB = New System.Windows.Forms.Label() - Me.cbxKundenbesonderheitenCS = New System.Windows.Forms.CheckBox() - Me.cbxMailsenden = New System.Windows.Forms.CheckBox() + Me.cbxCSsync = New System.Windows.Forms.CheckBox() + Me.Label48 = New System.Windows.Forms.Label() Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -3463,6 +3465,8 @@ Partial Class frmStartOptions ' 'TabPage7 ' + Me.TabPage7.Controls.Add(Me.Label48) + Me.TabPage7.Controls.Add(Me.cbxCSsync) Me.TabPage7.Controls.Add(Me.cbxMailsenden) Me.TabPage7.Controls.Add(Me.cbxKundenbesonderheitenCS) Me.TabPage7.Controls.Add(Me.lblCS_DB) @@ -3482,6 +3486,57 @@ Partial Class frmStartOptions Me.TabPage7.Text = "Creditsafe" Me.TabPage7.UseVisualStyleBackColor = True ' + 'cbxMailsenden + ' + Me.cbxMailsenden.AutoSize = True + Me.cbxMailsenden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxMailsenden.Location = New System.Drawing.Point(16, 246) + Me.cbxMailsenden.Name = "cbxMailsenden" + Me.cbxMailsenden.Size = New System.Drawing.Size(83, 17) + Me.cbxMailsenden.TabIndex = 163 + Me.cbxMailsenden.Text = "Mail senden" + Me.cbxMailsenden.UseVisualStyleBackColor = True + ' + 'cbxKundenbesonderheitenCS + ' + Me.cbxKundenbesonderheitenCS.AutoSize = True + Me.cbxKundenbesonderheitenCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxKundenbesonderheitenCS.Location = New System.Drawing.Point(16, 223) + Me.cbxKundenbesonderheitenCS.Name = "cbxKundenbesonderheitenCS" + Me.cbxKundenbesonderheitenCS.Size = New System.Drawing.Size(164, 17) + Me.cbxKundenbesonderheitenCS.TabIndex = 162 + Me.cbxKundenbesonderheitenCS.Text = "setze Kundenbesonderheiten" + Me.cbxKundenbesonderheitenCS.UseVisualStyleBackColor = True + ' + 'lblCS_DB + ' + Me.lblCS_DB.AutoSize = True + Me.lblCS_DB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblCS_DB.Location = New System.Drawing.Point(152, 48) + Me.lblCS_DB.Name = "lblCS_DB" + Me.lblCS_DB.Size = New System.Drawing.Size(0, 13) + Me.lblCS_DB.TabIndex = 161 + ' + 'lbl_CS_online + ' + Me.lbl_CS_online.AutoSize = True + Me.lbl_CS_online.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lbl_CS_online.Location = New System.Drawing.Point(102, 48) + Me.lbl_CS_online.Name = "lbl_CS_online" + Me.lbl_CS_online.Size = New System.Drawing.Size(0, 13) + Me.lbl_CS_online.TabIndex = 160 + ' + 'cbxTestsystemCS + ' + Me.cbxTestsystemCS.AutoSize = True + Me.cbxTestsystemCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxTestsystemCS.Location = New System.Drawing.Point(17, 6) + Me.cbxTestsystemCS.Name = "cbxTestsystemCS" + Me.cbxTestsystemCS.Size = New System.Drawing.Size(79, 17) + Me.cbxTestsystemCS.TabIndex = 140 + Me.cbxTestsystemCS.Text = "Testsystem" + Me.cbxTestsystemCS.UseVisualStyleBackColor = True + ' 'lblCSPortfolio ' Me.lblCSPortfolio.AutoSize = True @@ -3496,7 +3551,7 @@ Partial Class frmStartOptions ' Me.bcxKundendatenaktCS.AutoSize = True Me.bcxKundendatenaktCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.bcxKundendatenaktCS.Location = New System.Drawing.Point(14, 147) + Me.bcxKundendatenaktCS.Location = New System.Drawing.Point(16, 200) Me.bcxKundendatenaktCS.Name = "bcxKundendatenaktCS" Me.bcxKundendatenaktCS.Size = New System.Drawing.Size(150, 17) Me.bcxKundendatenaktCS.TabIndex = 158 @@ -3507,7 +3562,7 @@ Partial Class frmStartOptions ' Me.cbCheckDate.AutoSize = True Me.cbCheckDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbCheckDate.Location = New System.Drawing.Point(14, 124) + Me.cbCheckDate.Location = New System.Drawing.Point(16, 177) Me.cbCheckDate.Name = "cbCheckDate" Me.cbCheckDate.Size = New System.Drawing.Size(74, 17) Me.cbCheckDate.TabIndex = 140 @@ -3529,7 +3584,7 @@ Partial Class frmStartOptions Me.Button28.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button28.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button28.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button28.Location = New System.Drawing.Point(10, 216) + Me.Button28.Location = New System.Drawing.Point(12, 269) Me.Button28.Name = "Button28" Me.Button28.Size = New System.Drawing.Size(131, 24) Me.Button28.TabIndex = 141 @@ -3541,7 +3596,7 @@ Partial Class frmStartOptions Me.btnCreditsaveLauf.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCreditsaveLauf.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.btnCreditsaveLauf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCreditsaveLauf.Location = New System.Drawing.Point(16, 76) + Me.btnCreditsaveLauf.Location = New System.Drawing.Point(14, 103) Me.btnCreditsaveLauf.Name = "btnCreditsaveLauf" Me.btnCreditsaveLauf.Size = New System.Drawing.Size(131, 24) Me.btnCreditsaveLauf.TabIndex = 140 @@ -3806,56 +3861,27 @@ Partial Class frmStartOptions Me.Button21.Text = "AAS Sendung 24h" Me.Button21.UseVisualStyleBackColor = True ' - 'cbxTestsystemCS + 'cbxCSsync ' - Me.cbxTestsystemCS.AutoSize = True - Me.cbxTestsystemCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTestsystemCS.Location = New System.Drawing.Point(17, 6) - Me.cbxTestsystemCS.Name = "cbxTestsystemCS" - Me.cbxTestsystemCS.Size = New System.Drawing.Size(79, 17) - Me.cbxTestsystemCS.TabIndex = 140 - Me.cbxTestsystemCS.Text = "Testsystem" - Me.cbxTestsystemCS.UseVisualStyleBackColor = True + Me.cbxCSsync.AutoSize = True + Me.cbxCSsync.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxCSsync.Location = New System.Drawing.Point(17, 64) + Me.cbxCSsync.Name = "cbxCSsync" + Me.cbxCSsync.Size = New System.Drawing.Size(54, 17) + Me.cbxCSsync.TabIndex = 164 + Me.cbxCSsync.Text = "Sync*" + Me.cbxCSsync.UseVisualStyleBackColor = True ' - 'lbl_CS_online + 'Label48 ' - Me.lbl_CS_online.AutoSize = True - Me.lbl_CS_online.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lbl_CS_online.Location = New System.Drawing.Point(102, 48) - Me.lbl_CS_online.Name = "lbl_CS_online" - Me.lbl_CS_online.Size = New System.Drawing.Size(0, 13) - Me.lbl_CS_online.TabIndex = 160 - ' - 'lblCS_DB - ' - Me.lblCS_DB.AutoSize = True - Me.lblCS_DB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblCS_DB.Location = New System.Drawing.Point(152, 48) - Me.lblCS_DB.Name = "lblCS_DB" - Me.lblCS_DB.Size = New System.Drawing.Size(0, 13) - Me.lblCS_DB.TabIndex = 161 - ' - 'cbxKundenbesonderheitenCS - ' - Me.cbxKundenbesonderheitenCS.AutoSize = True - Me.cbxKundenbesonderheitenCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxKundenbesonderheitenCS.Location = New System.Drawing.Point(14, 170) - Me.cbxKundenbesonderheitenCS.Name = "cbxKundenbesonderheitenCS" - Me.cbxKundenbesonderheitenCS.Size = New System.Drawing.Size(164, 17) - Me.cbxKundenbesonderheitenCS.TabIndex = 162 - Me.cbxKundenbesonderheitenCS.Text = "setze Kundenbesonderheiten" - Me.cbxKundenbesonderheitenCS.UseVisualStyleBackColor = True - ' - 'cbxMailsenden - ' - Me.cbxMailsenden.AutoSize = True - Me.cbxMailsenden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxMailsenden.Location = New System.Drawing.Point(14, 193) - Me.cbxMailsenden.Name = "cbxMailsenden" - Me.cbxMailsenden.Size = New System.Drawing.Size(83, 17) - Me.cbxMailsenden.TabIndex = 163 - Me.cbxMailsenden.Text = "Mail senden" - Me.cbxMailsenden.UseVisualStyleBackColor = True + Me.Label48.AutoSize = True + Me.Label48.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label48.ForeColor = System.Drawing.Color.Red + Me.Label48.Location = New System.Drawing.Point(14, 84) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(450, 13) + Me.Label48.TabIndex = 165 + Me.Label48.Text = "*bei Sync werden alle gelöscht und neu hochgeladen, sonst nur hochgeladen." ' 'MyTextBox3 ' @@ -4612,7 +4638,7 @@ Partial Class frmStartOptions Me.txtCSDate.BackColor = System.Drawing.SystemColors.Window Me.txtCSDate.Enabled = False Me.txtCSDate.ForeColor = System.Drawing.Color.Red - Me.txtCSDate.Location = New System.Drawing.Point(94, 121) + Me.txtCSDate.Location = New System.Drawing.Point(96, 174) Me.txtCSDate.MaxLength = 10 Me.txtCSDate.MaxLineLength = -1 Me.txtCSDate.MaxLines_Warning = "" @@ -5081,4 +5107,6 @@ Partial Class frmStartOptions Friend WithEvents lbl_CS_online As Label Friend WithEvents cbxMailsenden As CheckBox Friend WithEvents cbxKundenbesonderheitenCS As CheckBox + Friend WithEvents Label48 As Label + Friend WithEvents cbxCSsync As CheckBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 2dd1633..ed37a3c 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 com.sun.xml.internal.rngom.digested Imports MDM_Worker Imports Renci.SshNet Imports VERAG_PROG_ALLGEMEIN @@ -847,7 +848,9 @@ Public Class frmStartOptions Case "CREDITSAFE_UPLOADS" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - UploadCompaniesToCreditsafe() + Dim sync As Boolean = True + + UploadCompaniesToCreditsafe(sync) closeMe() @@ -6278,7 +6281,7 @@ weiter: 'Existing companies in the portfolio will be skipped, and only new unique entries will be added. - UploadCompaniesToCreditsafe() + UploadCompaniesToCreditsafe(cbxCSsync.Checked) End Sub @@ -6357,7 +6360,7 @@ weiter: '3. Drill Down to Company-Level Events When Needed: For detailed insights into a specific company, use the company-specific endpoint. '4. Verify Enabled Rules: Ensure that the appropriate event rules are enabled for your portfolios to capture the desired notifications. Refer to the Activate Event Rules section for guidance. - 'aktuell machem wir gleich punkt 3, das verursacht sehr viele APP-Aurfrufe, besser nach der Liste oben! + 'aktuell machem wir gleich Punkt 3 (damit haben wir alle Informationen), das verursacht allerdings sehr viele API-Aurfrufe, besser nach dem Best Practice oben! Dim creditsaveOld As String = " @@ -6426,14 +6429,21 @@ weiter: End Sub - Private Sub UploadCompaniesToCreditsafe() + Private Sub UploadCompaniesToCreditsafe(sync As Boolean) Dim cs = New cCreditSafeAPI("creditsafe") Dim addCreditsave As Boolean = False If cs.authenticate() = "200" Then addCreditsave = True + 'The Sync method allows you to replace all existing companies in a portfolio with the contents of an uploaded file. + 'Unlike the Import method, this endpoint overwrites the entire portfolio, deleting all previously allocated companies. + + Dim where As String = "" + + If Not sync Then where = " and kde_CSPortfolioAdded = 0" + While addCreditsave - Dim creditsave As String = "select kde_CreditSaveNo 'Safe Number', '' as 'Local Org No.',left(kde_CreditSaveId,2) as 'Country Code', '' as Reference, '' as 'Free Text', '' as 'Personal Limit' from tblKundenErweitert where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 0 group by kde_CreditSaveNo, kde_CreditSaveId" + Dim creditsave As String = "select kde_CreditSaveNo 'Safe Number', '' as 'Local Org No.',left(kde_CreditSaveId,2) as 'Country Code', '' as Reference, '' as 'Free Text', '' as 'Personal Limit' from tblKundenErweitert inner join Adressen on Adressen.AdressenNr = kde_KundenNr where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' " & where & " and Adressen.Auswahl = 'A' group by kde_CreditSaveNo, kde_CreditSaveId" Dim dtCreditsafe_CSV As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") If dtCreditsafe_CSV.Rows.Count = 0 Then @@ -6442,11 +6452,13 @@ weiter: Dim Path As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dtCreditsafe_CSV,,, "importcsv") If Path <> "" Then - If cs.AddCompaniesCSVToPortfolio(Path).Contains("400") Then 'bei Fehler abbrechen! + + Dim resp = cs.AddCompaniesCSVToPortfolio(Path, sync) + If resp IsNot Nothing AndAlso resp.Contains("400") Then 'bei Fehler abbrechen! Exit While End If - End If + End If Dim displayView = New DataView(dtCreditsafe_CSV, "", "Safe Number", DataViewRowState.CurrentRows) @@ -6464,7 +6476,7 @@ weiter: addCreditsave = (New SQL).doSQL("Update tblKundenErweitert set kde_CSPortfolioAdded = 1 where kde_CreditSaveNo in (" & CS_ID & ")", "FMZOLL") End If - + If sync Then addCreditsave = False End While From 767d6be341bd185c5d31b92967aa31feeba86dfa Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 16:15:47 +0200 Subject: [PATCH 02/10] StartOpt, Proc, Plose --- MDM_Worker/cPLOSE_Inv_Data.vb | 6 +- UID/usrctlProcedures.vb | 35 +-- .../frmStartOptions.Designer.vb | 92 +++++--- initATLASAufschubkonten/frmStartOptions.resx | 201 +++++++++--------- initATLASAufschubkonten/frmStartOptions.vb | 31 ++- 5 files changed, 198 insertions(+), 167 deletions(-) diff --git a/MDM_Worker/cPLOSE_Inv_Data.vb b/MDM_Worker/cPLOSE_Inv_Data.vb index 2f9393b..1e50ce2 100644 --- a/MDM_Worker/cPLOSE_Inv_Data.vb +++ b/MDM_Worker/cPLOSE_Inv_Data.vb @@ -234,11 +234,11 @@ Public Class cPLOSE_Inv_Data filename2 = filename.Replace("-", "_") - 'If r.Item("plInv_Dateiname") = "830850-PSS-MAUT. PLOSE BOX-2025-07-14-000000-999999-00_RGDAT_17.07.2025.csv" Then + 'If r.Item("plInv_Dateiname") = "830850-PSS-MAUT. PLOSE BOX-2025-09-15-000000-999999-00_RGDAT_16.09.2025.csv" Then ' filename3 = filename.ToString().Substring(0, 9) - ' filename3 &= "%" - ' filename3 &= filename.ToString().Substring(9, filename.Length - 9) + ' 'filename3 &= "%" + ' filename3 &= filename.ToString().Substring(10, filename.Length - 10) ' filename4 = filename3.Replace("-", "_") ' filename3 = filename3.Replace(" ", "") diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 44785b1..7e60fad 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -3463,6 +3463,8 @@ Public Class usrctlProcedures VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim savedDY As Boolean = False + Dim fd As New OpenFileDialog If fd.ShowDialog = DialogResult.OK Then If fd.FileName.ToLower.EndsWith(".csv") Then @@ -3678,8 +3680,10 @@ Public Class usrctlProcedures DYIMPORT.UST_ID_Fiskalvertreter = isleernothing((currentRow(137))) DYIMPORT.Shipmentnummer = isleernothing((currentRow(138))) DYIMPORT.Importstatus = isleernothing((currentRow(139))) + DYIMPORT.Importdate = Now() If DYIMPORT.SAVE() Then TextBox10.Text &= DYIMPORT.Id & vbNewLine + If Not savedDY Then savedDY = True Else MsgBox("FEHLER: " & currentRow(2).Trim() & " - " & currentRow(3).Trim()) End If @@ -3691,32 +3695,6 @@ Public Class usrctlProcedures Label10.Text = (cnt + 1) End If - Else - - Dim STDOF As New cStandardofferten(currentRow(0), currentRow(1), currentRow(2), currentRow(3)) - If STDOF.hasEntry Then - - Dim save As Boolean = False - - If isleernothing(currentRow(12)) IsNot Nothing AndAlso isleernothing(currentRow(12)) <> "NULL" Then - save = True - STDOF.LeistungsBez_EN = isleernothing(currentRow(12)) - End If - If isleernothing(currentRow(13)) IsNot Nothing AndAlso isleernothing(currentRow(13)) <> "NULL" Then - save = True - STDOF.LeistungsBez_RO = isleernothing(currentRow(13)) - End If - If isleernothing(currentRow(14)) IsNot Nothing AndAlso isleernothing(currentRow(14)) <> "NULL" Then - save = True - STDOF.LeistungsBez_TR = isleernothing(currentRow(14)) - End If - - If save Then STDOF.SAVE() - - End If - - - 'MsgBox(currentRow(2)) End If End If End If @@ -3728,6 +3706,11 @@ Public Class usrctlProcedures MsgBox(kdnr_tmp & " " & ex.Message & ex.StackTrace) End Try End While + + If savedDY Then + sql.doSQL("EXECUTE dbo.sp_DeleteDuplicateZollmeldungen", "FMZOLL") + End If + End Using End If End If diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 5a6f39b..2907a64 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -277,6 +277,8 @@ Partial Class frmStartOptions Me.Button27 = New System.Windows.Forms.Button() Me.lblWartungen = New System.Windows.Forms.Label() Me.TabPage7 = New System.Windows.Forms.TabPage() + Me.Label48 = New System.Windows.Forms.Label() + Me.cbxCSsync = New System.Windows.Forms.CheckBox() Me.cbxMailsenden = New System.Windows.Forms.CheckBox() Me.cbxKundenbesonderheitenCS = New System.Windows.Forms.CheckBox() Me.lblCS_DB = New System.Windows.Forms.Label() @@ -311,8 +313,6 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() Me.Button21 = New System.Windows.Forms.Button() - Me.cbxCSsync = New System.Windows.Forms.CheckBox() - Me.Label48 = New System.Windows.Forms.Label() Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -352,6 +352,8 @@ Partial Class frmStartOptions Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Label49 = New System.Windows.Forms.Label() + Me.Label50 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -3465,6 +3467,8 @@ Partial Class frmStartOptions ' 'TabPage7 ' + Me.TabPage7.Controls.Add(Me.Label50) + Me.TabPage7.Controls.Add(Me.Label49) Me.TabPage7.Controls.Add(Me.Label48) Me.TabPage7.Controls.Add(Me.cbxCSsync) Me.TabPage7.Controls.Add(Me.cbxMailsenden) @@ -3486,15 +3490,41 @@ Partial Class frmStartOptions Me.TabPage7.Text = "Creditsafe" Me.TabPage7.UseVisualStyleBackColor = True ' + 'Label48 + ' + Me.Label48.AutoSize = True + Me.Label48.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label48.ForeColor = System.Drawing.Color.Red + Me.Label48.Location = New System.Drawing.Point(14, 84) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(450, 13) + Me.Label48.TabIndex = 165 + Me.Label48.Text = "*bei Sync werden alle gelöscht und neu hochgeladen, sonst nur hochgeladen." + ' + 'cbxCSsync + ' + Me.cbxCSsync.AutoSize = True + Me.cbxCSsync.Checked = True + Me.cbxCSsync.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxCSsync.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxCSsync.Location = New System.Drawing.Point(17, 64) + Me.cbxCSsync.Name = "cbxCSsync" + Me.cbxCSsync.Size = New System.Drawing.Size(54, 17) + Me.cbxCSsync.TabIndex = 164 + Me.cbxCSsync.Text = "Sync*" + Me.cbxCSsync.UseVisualStyleBackColor = True + ' 'cbxMailsenden ' Me.cbxMailsenden.AutoSize = True + Me.cbxMailsenden.Checked = True + Me.cbxMailsenden.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxMailsenden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbxMailsenden.Location = New System.Drawing.Point(16, 246) Me.cbxMailsenden.Name = "cbxMailsenden" - Me.cbxMailsenden.Size = New System.Drawing.Size(83, 17) + Me.cbxMailsenden.Size = New System.Drawing.Size(87, 17) Me.cbxMailsenden.TabIndex = 163 - Me.cbxMailsenden.Text = "Mail senden" + Me.cbxMailsenden.Text = "Mail senden*" Me.cbxMailsenden.UseVisualStyleBackColor = True ' 'cbxKundenbesonderheitenCS @@ -3550,6 +3580,8 @@ Partial Class frmStartOptions 'bcxKundendatenaktCS ' Me.bcxKundendatenaktCS.AutoSize = True + Me.bcxKundendatenaktCS.Checked = True + Me.bcxKundendatenaktCS.CheckState = System.Windows.Forms.CheckState.Checked Me.bcxKundendatenaktCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.bcxKundendatenaktCS.Location = New System.Drawing.Point(16, 200) Me.bcxKundendatenaktCS.Name = "bcxKundendatenaktCS" @@ -3561,12 +3593,14 @@ Partial Class frmStartOptions 'cbCheckDate ' Me.cbCheckDate.AutoSize = True + Me.cbCheckDate.Checked = True + Me.cbCheckDate.CheckState = System.Windows.Forms.CheckState.Checked Me.cbCheckDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbCheckDate.Location = New System.Drawing.Point(16, 177) Me.cbCheckDate.Name = "cbCheckDate" - Me.cbCheckDate.Size = New System.Drawing.Size(74, 17) + Me.cbCheckDate.Size = New System.Drawing.Size(76, 17) Me.cbCheckDate.TabIndex = 140 - Me.cbCheckDate.Text = "AB Datum" + Me.cbCheckDate.Text = "ab-Datum*" Me.cbCheckDate.UseVisualStyleBackColor = True ' 'lblMissingCS @@ -3861,28 +3895,6 @@ Partial Class frmStartOptions Me.Button21.Text = "AAS Sendung 24h" Me.Button21.UseVisualStyleBackColor = True ' - 'cbxCSsync - ' - Me.cbxCSsync.AutoSize = True - Me.cbxCSsync.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxCSsync.Location = New System.Drawing.Point(17, 64) - Me.cbxCSsync.Name = "cbxCSsync" - Me.cbxCSsync.Size = New System.Drawing.Size(54, 17) - Me.cbxCSsync.TabIndex = 164 - Me.cbxCSsync.Text = "Sync*" - Me.cbxCSsync.UseVisualStyleBackColor = True - ' - 'Label48 - ' - Me.Label48.AutoSize = True - Me.Label48.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label48.ForeColor = System.Drawing.Color.Red - Me.Label48.Location = New System.Drawing.Point(14, 84) - Me.Label48.Name = "Label48" - Me.Label48.Size = New System.Drawing.Size(450, 13) - Me.Label48.TabIndex = 165 - Me.Label48.Text = "*bei Sync werden alle gelöscht und neu hochgeladen, sonst nur hochgeladen." - ' 'MyTextBox3 ' Me.MyTextBox3._DateTimeOnly = False @@ -4703,6 +4715,28 @@ Partial Class frmStartOptions Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' + 'Label49 + ' + Me.Label49.AutoSize = True + Me.Label49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label49.ForeColor = System.Drawing.Color.Red + Me.Label49.Location = New System.Drawing.Point(109, 246) + Me.Label49.Name = "Label49" + Me.Label49.Size = New System.Drawing.Size(234, 13) + Me.Label49.TabIndex = 166 + Me.Label49.Text = "*nur Info bei Kundenrechnung < 2 Jahre" + ' + 'Label50 + ' + Me.Label50.AutoSize = True + Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label50.ForeColor = System.Drawing.Color.Red + Me.Label50.Location = New System.Drawing.Point(168, 181) + Me.Label50.Name = "Label50" + Me.Label50.Size = New System.Drawing.Size(228, 13) + Me.Label50.TabIndex = 167 + Me.Label50.Text = "*prüfe Kunden, deren Bon-Dat. älter ist" + ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -5109,4 +5143,6 @@ Partial Class frmStartOptions Friend WithEvents cbxKundenbesonderheitenCS As CheckBox Friend WithEvents Label48 As Label Friend WithEvents cbxCSsync As CheckBox + Friend WithEvents Label49 As Label + Friend WithEvents Label50 As Label End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 8da457c..049c40f 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -212,6 +212,102 @@ +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 @@ -622,9 +718,6 @@ SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC - - True - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj @@ -721,102 +814,12 @@ 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 - - + + True + + + True + AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 21c920f..ef69338 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -837,21 +837,17 @@ Public Class frmStartOptions Dim upateKunden As Boolean = True Dim OnlyCurrentMonthData As Boolean = True - Dim setzeInfoImKunden As Boolean = True + Dim setzeInfoImKunden As Boolean = False Dim sendMail As Boolean = True importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, OnlyCurrentMonthData, upateKunden, setzeInfoImKunden, sendMail) - - closeMe() Case "CREDITSAFE_UPLOADS" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False Dim sync As Boolean = True - UploadCompaniesToCreditsafe(sync) - closeMe() Case Else @@ -3725,7 +3721,7 @@ Public Class frmStartOptions Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked, txtMsVerz._value) + Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked) 'bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "d.breimaier@verag.ag",,, MyTextBox2._value, cbxVermerk.Checked) 'Dim bool = getUID_PruefungVERAG(MyTextBox1.Text) showPic(bool, PictureBox12) @@ -4209,12 +4205,12 @@ Public Class frmStartOptions Private Sub LinkLabel32_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel32.LinkClicked VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False ' Dim bool = getUID_PruefungIMEX(MyTextBox1.Text) - Dim bool = getUID_Pruefung(MyTextBox1.Text, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked, txtMsVerz._value) + Dim bool = getUID_Pruefung(MyTextBox1.Text, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked) showPic(bool, PictureBox12) End Sub Private Sub LinkLabel33_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel33.LinkClicked VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim bool = getUID_Pruefung(MyTextBox1.Text, "AMBAR", "UID Prüfung AMBAR", "io@ambarlog.de", , "al@verag.ag;as@verag.ag", MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked, txtMsVerz._value) + Dim bool = getUID_Pruefung(MyTextBox1.Text, "AMBAR", "UID Prüfung AMBAR", "io@ambarlog.de", , "al@verag.ag;as@verag.ag", MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked) showPic(bool, PictureBox12) End Sub @@ -4365,7 +4361,7 @@ Public Class frmStartOptions Private Sub LinkLabel36_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel36.LinkClicked VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim bool = getUID_Pruefung(MyTextBox1.Text, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked, txtMsVerz._value) + Dim bool = getUID_Pruefung(MyTextBox1.Text, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked) showPic(bool, PictureBox12) End Sub @@ -6396,9 +6392,11 @@ weiter: inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 1 AND ba_Pruefungstool = 'creditsafe API'" & IIf(datum <> "", " AND Kunden.Bonitätsdatum <= '" & datum & "'", "") If False Then - creditsave &= " and ba_KundenNr = 720249" + creditsave &= " and ba_KundenNr = 725398" End If + Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-2) & "' ", "FMZOLL") + Dim dtCreditsafe As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") If dtCreditsafe.Rows.Count = 0 Then Exit Sub @@ -6422,7 +6420,18 @@ weiter: If currentBonID > 0 Then company.csBonID = currentBonID Dim dt As New DataTable() - cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, sendMail) + Dim Mailinfolast2Years As Boolean = False + If sendMail Then + Dim exists As Boolean = dtRechnungen.AsEnumerable().Any(Function(r) r.Field(Of Integer)("RechnungsKundenNr") = KUNDE_ERW.kde_KundenNr) + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + Mailinfolast2Years = True + Else + Mailinfolast2Years = exists + End If + + End If + + cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years) Thread.Sleep(1000) Next End If From 3ecdb6a9e580c62af5519534bc21326d63d3ca3c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 23 Sep 2025 16:32:16 +0200 Subject: [PATCH 03/10] StartOptions --- initATLASAufschubkonten/frmStartOptions.vb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index ef69338..9655b16 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -6431,7 +6431,15 @@ weiter: End If - cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years) + Dim APIText As String = cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years) + + If APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler") Then + Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "CREDITSAFE-EVENTS", "CS") + API.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents") + Exit For + End If + + Thread.Sleep(1000) Next End If @@ -6464,6 +6472,8 @@ weiter: Dim resp = cs.AddCompaniesCSVToPortfolio(Path, sync) If resp IsNot Nothing AndAlso resp.Contains("400") Then 'bei Fehler abbrechen! + Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "CREDITSAFE-PORTFOLIO UPLOAD", "CS") + API.UPDTAE_ERR("ERROR", resp, "AddCompaniesCSVToPortfolio") Exit While End If End If From f4dcfa7592c4318bfd5144a19af318a812b28dff Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 24 Sep 2025 15:36:50 +0200 Subject: [PATCH 04/10] Mitarbeiter, Creditsafe-Infos, etc. --- UID/Mitarbeiter/frmMitarbDetails.Designer.vb | 25 ++++----- UID/Mitarbeiter/frmMitarbDetails.vb | 24 ++++----- initATLASAufschubkonten/frmStartOptions.vb | 57 +++++++++++++++++--- 3 files changed, 75 insertions(+), 31 deletions(-) diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index dd5619b..74acbfd 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -202,7 +202,7 @@ Partial Class frmMitarbDetails Me.cboAdminBer = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() Me.TabPage8 = New System.Windows.Forms.TabPage() - Me.cbxClient = New System.Windows.Forms.ComboBox() + Me.cbxClientTimas = New System.Windows.Forms.ComboBox() Me.cbxTimasMehrereFirmen = New System.Windows.Forms.CheckBox() Me.clbTimasMehreFirmen = New System.Windows.Forms.CheckedListBox() Me.lblName1 = New System.Windows.Forms.TextBox() @@ -2260,7 +2260,7 @@ Partial Class frmMitarbDetails ' 'TabPage8 ' - Me.TabPage8.Controls.Add(Me.cbxClient) + Me.TabPage8.Controls.Add(Me.cbxClientTimas) Me.TabPage8.Controls.Add(Me.cbxTimasMehrereFirmen) Me.TabPage8.Controls.Add(Me.clbTimasMehreFirmen) Me.TabPage8.Controls.Add(Me.lblName1) @@ -2303,16 +2303,17 @@ Partial Class frmMitarbDetails Me.TabPage8.Text = "Zeiterfassung" Me.TabPage8.UseVisualStyleBackColor = True ' - 'cbxClient + 'cbxClientTimas ' - Me.cbxClient.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cbxClient.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxClient.FormattingEnabled = True - Me.cbxClient.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"}) - Me.cbxClient.Location = New System.Drawing.Point(253, 144) - Me.cbxClient.Name = "cbxClient" - Me.cbxClient.Size = New System.Drawing.Size(54, 21) - Me.cbxClient.TabIndex = 159 + Me.cbxClientTimas.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxClientTimas.DropDownWidth = 100 + Me.cbxClientTimas.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxClientTimas.FormattingEnabled = True + Me.cbxClientTimas.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"}) + Me.cbxClientTimas.Location = New System.Drawing.Point(253, 144) + Me.cbxClientTimas.Name = "cbxClientTimas" + Me.cbxClientTimas.Size = New System.Drawing.Size(54, 21) + Me.cbxClientTimas.TabIndex = 159 ' 'cbxTimasMehrereFirmen ' @@ -2937,7 +2938,7 @@ Partial Class frmMitarbDetails Friend WithEvents lblName1 As TextBox Friend WithEvents cbxTimasMehrereFirmen As CheckBox Friend WithEvents clbTimasMehreFirmen As CheckedListBox - Friend WithEvents cbxClient As ComboBox + Friend WithEvents cbxClientTimas As ComboBox Friend WithEvents tabParameter As TabPage Friend WithEvents dgvUserParameter As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 6464c25..027d89b 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -149,15 +149,15 @@ Public Class frmMitarbDetails clbTimasMehreFirmen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) clbTimasMehreFirmen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) - cbxClient.Items.Clear() - cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) - cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FO")) - cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) - cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AG", "VERAG AG")) - cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG GMBH", "VERAG GMBH")) + cbxClientTimas.Items.Clear() + cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) + cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FO")) + cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AG", "VERAG AG")) + cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG GMBH", "VERAG GMBH")) - cbxClient.SelectedIndex = 0 + cbxClientTimas.SelectedIndex = 0 cboFirma.Items.Clear() @@ -1285,7 +1285,7 @@ Public Class frmMitarbDetails If checkMandatoryFields() Then - timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, cbxClient.SelectedItem.Text, dtTimas) + timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, cbxClientTimas.SelectedItem.Text, dtTimas) If rtfInfoTimas.Visible = False AndAlso rtfInfoTimas.Text <> "" Then MsgBox(rtfInfoTimas.Text) tbcntr_TabIndexChanged(sender, e) End If @@ -1307,7 +1307,7 @@ Public Class frmMitarbDetails btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked txtClientNr.Enabled = Not cbxTimasAngelegt.Checked - cbxClient.Enabled = Not cbxTimasAngelegt.Checked + cbxClientTimas.Enabled = Not cbxTimasAngelegt.Checked dgvData.Visible = Not cbxTimasAngelegt.Checked rtfInfoTimas.Visible = cbxTimasAngelegt.Checked btngetInfo.Visible = cbxTimasAngelegt.Checked @@ -1329,7 +1329,7 @@ Public Class frmMitarbDetails ' Return False 'End If - If cbxClient.SelectedItem.Text = "" Then + If cbxClientTimas.SelectedItem.Text = "" Then MsgBox("ClientNr prüfen!") Return False End If @@ -1531,7 +1531,7 @@ Public Class frmMitarbDetails btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked txtClientNr.Enabled = Not cbxTimasAngelegt.Checked - cbxClient.Enabled = Not cbxTimasAngelegt.Checked + cbxClientTimas.Enabled = Not cbxTimasAngelegt.Checked dgvData.Visible = Not cbxTimasAngelegt.Checked TabControl3.Visible = Not cbxTimasAngelegt.Checked rtfInfoTimas.Visible = cbxTimasAngelegt.Checked diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 9655b16..55314d4 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 com.sun.xml.internal.rngom Imports com.sun.xml.internal.rngom.digested Imports MDM_Worker Imports Renci.SshNet @@ -6391,19 +6392,27 @@ weiter: inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 1 AND ba_Pruefungstool = 'creditsafe API'" & IIf(datum <> "", " AND Kunden.Bonitätsdatum <= '" & datum & "'", "") + If False Then - creditsave &= " and ba_KundenNr = 725398" + creditsave &= " and (ba_KundenNr = 718137 or ba_KundenNr = 1003418)" End If + Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-2) & "' ", "FMZOLL") - Dim dtCreditsafe As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") + If dtCreditsafe.Rows.Count = 0 Then Exit Sub Dim cs = New cCreditSafeAPI("creditsafe") + Dim dt_fehlendeCreditsafeIDS As New DataTable + dt_fehlendeCreditsafeIDS.Columns.Add("KundenNr", GetType(String)) + dt_fehlendeCreditsafeIDS.Columns.Add("Creditsafe-ID", GetType(String)) + dt_fehlendeCreditsafeIDS.Columns.Add("Creditsafe-NO", GetType(String)) + + If cs.authenticate() = "200" Then @@ -6421,8 +6430,9 @@ weiter: If currentBonID > 0 Then company.csBonID = currentBonID Dim dt As New DataTable() Dim Mailinfolast2Years As Boolean = False + Dim exists As Boolean = dtRechnungen.AsEnumerable().Any(Function(r) r.Field(Of Integer)("RechnungsKundenNr") = KUNDE_ERW.kde_KundenNr) If sendMail Then - Dim exists As Boolean = dtRechnungen.AsEnumerable().Any(Function(r) r.Field(Of Integer)("RechnungsKundenNr") = KUNDE_ERW.kde_KundenNr) + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Mailinfolast2Years = True Else @@ -6431,17 +6441,50 @@ weiter: End If - Dim APIText As String = cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years) + Dim APIText As String = "" + If exists Then + APIText = cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years) + End If - If APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler") Then - Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "CREDITSAFE-EVENTS", "CS") + If (APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler")) Then + Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "CREDITSAFE-EVENTS", "CS",, KUNDE_ERW.kde_KundenNr) API.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents") - Exit For + If APIText.Contains("Not Found") AndAlso APIText.Contains(KUNDE_ERW.kde_CreditSaveId) Then + + Dim R As DataRow = dt_fehlendeCreditsafeIDS.NewRow + R("KundenNr") = KUNDE_ERW.kde_KundenNr + R("Creditsafe-ID") = KUNDE_ERW.kde_CreditSaveId + R("Creditsafe-NO") = KUNDE_ERW.kde_CreditSaveNo + dt.Rows.Add(R) + + KUNDE_ERW.kde_CreditSaveId = "" + KUNDE_ERW.SAVE() + End If + + If APIText.Contains("Invalid token") Then + If Not cs.authenticate() = 200 Then + API.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents") + Exit For + Else + Thread.Sleep(4000) + End If + End If + End If Thread.Sleep(1000) Next + + If dt_fehlendeCreditsafeIDS.Rows.Count > 0 Then + Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_fehlendeCreditsafeIDS,,,,, False) + If filepath <> "" Then + Dim anhenge As New List(Of String) + anhenge.Add(filepath) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "as@verag.ag"), IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE - fehlende CS-IDs", "Im Anhang befinden sich eine Liste der Kunden, deren Creditsafe-ID ungültig sind/nicht gefunden wurden!" & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) + End If + End If + End If End Sub From 7c22afa197f9b92ccc0321d24f36c448477414e8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 25 Sep 2025 13:04:34 +0200 Subject: [PATCH 05/10] StartOpt --- .../frmStartOptions.Designer.vb | 60 ++++--- initATLASAufschubkonten/frmStartOptions.vb | 168 +++++++++++++++--- 2 files changed, 179 insertions(+), 49 deletions(-) diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 2907a64..b7868c7 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -277,6 +277,8 @@ Partial Class frmStartOptions Me.Button27 = New System.Windows.Forms.Button() Me.lblWartungen = New System.Windows.Forms.Label() Me.TabPage7 = New System.Windows.Forms.TabPage() + Me.Label50 = New System.Windows.Forms.Label() + Me.Label49 = New System.Windows.Forms.Label() Me.Label48 = New System.Windows.Forms.Label() Me.cbxCSsync = New System.Windows.Forms.CheckBox() Me.cbxMailsenden = New System.Windows.Forms.CheckBox() @@ -352,8 +354,7 @@ Partial Class frmStartOptions Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Label49 = New System.Windows.Forms.Label() - Me.Label50 = New System.Windows.Forms.Label() + Me.cbxEventtriggered = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -3467,6 +3468,7 @@ Partial Class frmStartOptions ' 'TabPage7 ' + Me.TabPage7.Controls.Add(Me.cbxEventtriggered) Me.TabPage7.Controls.Add(Me.Label50) Me.TabPage7.Controls.Add(Me.Label49) Me.TabPage7.Controls.Add(Me.Label48) @@ -3490,6 +3492,28 @@ Partial Class frmStartOptions Me.TabPage7.Text = "Creditsafe" Me.TabPage7.UseVisualStyleBackColor = True ' + 'Label50 + ' + Me.Label50.AutoSize = True + Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label50.ForeColor = System.Drawing.Color.Red + Me.Label50.Location = New System.Drawing.Point(168, 181) + Me.Label50.Name = "Label50" + Me.Label50.Size = New System.Drawing.Size(228, 13) + Me.Label50.TabIndex = 167 + Me.Label50.Text = "*prüfe Kunden, deren Bon-Dat. älter ist" + ' + 'Label49 + ' + Me.Label49.AutoSize = True + Me.Label49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label49.ForeColor = System.Drawing.Color.Red + Me.Label49.Location = New System.Drawing.Point(109, 246) + Me.Label49.Name = "Label49" + Me.Label49.Size = New System.Drawing.Size(234, 13) + Me.Label49.TabIndex = 166 + Me.Label49.Text = "*nur Info bei Kundenrechnung < 2 Jahre" + ' 'Label48 ' Me.Label48.AutoSize = True @@ -4715,27 +4739,18 @@ Partial Class frmStartOptions Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' - 'Label49 + 'cbxEventtriggered ' - Me.Label49.AutoSize = True - Me.Label49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label49.ForeColor = System.Drawing.Color.Red - Me.Label49.Location = New System.Drawing.Point(109, 246) - Me.Label49.Name = "Label49" - Me.Label49.Size = New System.Drawing.Size(234, 13) - Me.Label49.TabIndex = 166 - Me.Label49.Text = "*nur Info bei Kundenrechnung < 2 Jahre" - ' - 'Label50 - ' - Me.Label50.AutoSize = True - Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label50.ForeColor = System.Drawing.Color.Red - Me.Label50.Location = New System.Drawing.Point(168, 181) - Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(228, 13) - Me.Label50.TabIndex = 167 - Me.Label50.Text = "*prüfe Kunden, deren Bon-Dat. älter ist" + Me.cbxEventtriggered.AutoSize = True + Me.cbxEventtriggered.Checked = True + Me.cbxEventtriggered.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxEventtriggered.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxEventtriggered.Location = New System.Drawing.Point(14, 144) + Me.cbxEventtriggered.Name = "cbxEventtriggered" + Me.cbxEventtriggered.Size = New System.Drawing.Size(237, 17) + Me.cbxEventtriggered.TabIndex = 168 + Me.cbxEventtriggered.Text = "Daily-Check (schneller aber weniger deailiert)" + Me.cbxEventtriggered.UseVisualStyleBackColor = True ' 'frmStartOptions ' @@ -5145,4 +5160,5 @@ Partial Class frmStartOptions Friend WithEvents cbxCSsync As CheckBox Friend WithEvents Label49 As Label Friend WithEvents Label50 As Label + Friend WithEvents cbxEventtriggered As CheckBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 55314d4..b12a872 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -833,6 +833,17 @@ Public Class frmStartOptions End If + Case "CREDITSAFE_EVENTS_DETAIL" + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + + Dim upateKunden As Boolean = True + Dim OnlyCurrentMonthData As Boolean = True + Dim setzeInfoImKunden As Boolean = False + Dim sendMail As Boolean = True + + importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, OnlyCurrentMonthData, upateKunden, setzeInfoImKunden, sendMail, True) + closeMe() + Case "CREDITSAFE_EVENTS" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False @@ -841,7 +852,7 @@ Public Class frmStartOptions Dim setzeInfoImKunden As Boolean = False Dim sendMail As Boolean = True - importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, OnlyCurrentMonthData, upateKunden, setzeInfoImKunden, sendMail) + importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, OnlyCurrentMonthData, upateKunden, setzeInfoImKunden, sendMail, False) closeMe() Case "CREDITSAFE_UPLOADS" @@ -6341,23 +6352,29 @@ weiter: End If - importCreditsafeEvents(datumString, cbCheckDate.Checked, bcxKundendatenaktCS.Checked, cbxKundenbesonderheitenCS.Checked, cbxMailsenden.Checked) + importCreditsafeEvents(datumString, cbCheckDate.Checked, bcxKundendatenaktCS.Checked, cbxKundenbesonderheitenCS.Checked, cbxMailsenden.Checked, Not cbxEventtriggered.Checked) End Sub - Private Sub importCreditsafeEvents(datum As String, checkDate As Boolean, upateKunden As Boolean, setzeKundenbesonderheiten As Boolean, sendMail As Boolean) + Private Sub importCreditsafeEvents(datum As String, checkDate As Boolean, upateKunden As Boolean, setzeKundenbesonderheiten As Boolean, sendMail As Boolean, companyDetailEventsRequest As Boolean) + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 'WICHTIG, bei companyDetailEventsRequest = true wird gleich Punkt 3 gemacht (dauert länger, aber mehr Datensätze und alle Kunden werden geprüft, bei companyDetailEventsRequest = false wird die u.a. Best Practice-Methode durchgeführt-> also triggerbasierend)!!!! + + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 'Best Practices for Viewing Notification Events '1. Use Portfolio-Specific Events for Targeted Monitoring: Start with the portfolio-specific endpoint to focus on changes relevant to a particular portfolio. '2. Leverage Global Events for a Broader View: Use the all-events endpoint to gain a comprehensive overview of all notifications across your portfolios. '3. Drill Down to Company-Level Events When Needed: For detailed insights into a specific company, use the company-specific endpoint. - '4. Verify Enabled Rules: Ensure that the appropriate event rules are enabled for your portfolios to capture the desired notifications. Refer to the Activate Event Rules section for guidance. - 'aktuell machem wir gleich Punkt 3 (damit haben wir alle Informationen), das verursacht allerdings sehr viele API-Aurfrufe, besser nach dem Best Practice oben! + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Dim creditsaveOld As String = " @@ -6388,33 +6405,102 @@ weiter: - Dim creditsave As String = "select distinct(ba_KundenNr) from Kunden + + + Dim creditsave As String = "select distinct(ba_KundenNr),f.Firma from Kunden inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr + inner join Filialen as f on f.FilialenNr = Kunden.FilialenNr inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 1 AND ba_Pruefungstool = 'creditsafe API'" & IIf(datum <> "", " AND Kunden.Bonitätsdatum <= '" & datum & "'", "") - If False Then - creditsave &= " and (ba_KundenNr = 718137 or ba_KundenNr = 1003418)" - End If - - - Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-2) & "' ", "FMZOLL") - - Dim dtCreditsafe As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") - - If dtCreditsafe.Rows.Count = 0 Then Exit Sub - + 'KundenNr und Firma Dim cs = New cCreditSafeAPI("creditsafe") - Dim dt_fehlendeCreditsafeIDS As New DataTable - dt_fehlendeCreditsafeIDS.Columns.Add("KundenNr", GetType(String)) - dt_fehlendeCreditsafeIDS.Columns.Add("Creditsafe-ID", GetType(String)) - dt_fehlendeCreditsafeIDS.Columns.Add("Creditsafe-NO", GetType(String)) - + Dim Mailinfolast2Years As Boolean = False If cs.authenticate() = "200" Then + If Not companyDetailEventsRequest Then + + Dim API_Start_Daily = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "DAiLY-CREDITSAFE-EVENTS-IMPORT", "CS") + + Dim dtMonitoredRequest As New DataTable + + Dim companyDummy As New cCreditSafeAPI.Company("", "", "", "", "", "", Nothing, "", "", "", "", "", "", "", "", "", 0) + If txtCSDate.Text <> "" AndAlso IsDate(txtCSDate.Text) Then + companyDummy.lastChecked = CDate(txtCSDate.Text) + End If +repeatRequestDaily: + Dim page As Integer = 0 + Dim totalPages As Integer = -1 + + Dim APIText = cs.getCompanyEvents(companyDummy, dtMonitoredRequest, False, totalPages, checkDate, upateKunden, False,, setzeKundenbesonderheiten, True,, page) + If (APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler")) Then API_Start_Daily.UPDTAE_ERR("ERROR", APIText, "dailyImportCreditsafeEvents") + + If APIText.Contains("Invalid token") Then + If Not cs.authenticate() = 200 Then + API_Start_Daily.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents") + Exit Sub + Else + Thread.Sleep(4000) + GoTo repeatRequestDaily + End If + End If + + If totalPages > 1 Then + For i = 2 To totalPages +repeatRequestDailyPages: + APIText = cs.getCompanyEvents(companyDummy, dtMonitoredRequest, False, totalPages, checkDate, upateKunden, False,, setzeKundenbesonderheiten, True,, i) + If APIText.Contains("Invalid token") Then + If Not cs.authenticate() = 200 Then + API_Start_Daily.UPDTAE_ERR("ERROR", APIText, "dailyImportCreditsafeEvents") + Exit For + Else + Thread.Sleep(4000) + GoTo repeatRequestDailyPages + End If + End If + Next + + End If + + + + Exit Sub + + End If + + + If False Then + creditsave &= " and (ba_KundenNr = 718137 or ba_KundenNr = 1003418)" + End If + + + Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-2) & "' ", "FMZOLL") + + Dim dtCreditsafe As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") + + If dtCreditsafe.Rows.Count = 0 Then Exit Sub + + Dim countMissingVerag As Integer = 0 + Dim countMissingIMEX As Integer = 0 + Dim countMissingUNISPED As Integer = 0 + Dim countMissingAMBAR As Integer = 0 + + Dim dt_fehlendeCreditsafeIDS As New DataTable + dt_fehlendeCreditsafeIDS.Columns.Add("KundenNr", GetType(String)) + dt_fehlendeCreditsafeIDS.Columns.Add("Creditsafe-ID", GetType(String)) + dt_fehlendeCreditsafeIDS.Columns.Add("Creditsafe-NO", GetType(String)) + dt_fehlendeCreditsafeIDS.Columns.Add("Firma", GetType(String)) + + + + Dim counter As Integer = 0 + Dim API_Start = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "CREDITSAFE-EVENTS-IMPORT", "CS") + If dtCreditsafe.Rows.Count = 0 Then + API_Start.UPDTAE_ERR("ERROR - KEINE DATEN", "Anzahl abgefragte Datensätze:" & dtCreditsafe.Rows.Count & " Anzahl importierte Datensätze:" & counter & " Anzahl fehlende Creditsafe-IDs:" & dt_fehlendeCreditsafeIDS.Rows.Count, "importCreditsafeEvents") + End If For Each row As DataRow In dtCreditsafe.Rows @@ -6429,7 +6515,7 @@ weiter: If currentBonID > 0 Then company.csBonID = currentBonID Dim dt As New DataTable() - Dim Mailinfolast2Years As Boolean = False + Dim exists As Boolean = dtRechnungen.AsEnumerable().Any(Function(r) r.Field(Of Integer)("RechnungsKundenNr") = KUNDE_ERW.kde_KundenNr) If sendMail Then @@ -6440,10 +6526,10 @@ weiter: End If End If - +repeatRequest: Dim APIText As String = "" If exists Then - APIText = cs.getCompanyEvents(company, dt, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years) + APIText = cs.getCompanyEvents(company, dt, False, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years, row("Firma")) End If If (APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler")) Then @@ -6455,7 +6541,18 @@ weiter: R("KundenNr") = KUNDE_ERW.kde_KundenNr R("Creditsafe-ID") = KUNDE_ERW.kde_CreditSaveId R("Creditsafe-NO") = KUNDE_ERW.kde_CreditSaveNo - dt.Rows.Add(R) + R("Firma") = row("Firma") + dt_fehlendeCreditsafeIDS.Rows.Add(R) + + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + Select Case row(FIRMA) + Case "VERAG" : countMissingVerag += 1 + Case "IMEX" : countMissingIMEX += 1 + Case "AMBAR" : countMissingAMBAR += 1 + Case "UNISPED" : countMissingUNISPED += 1 + End Select + End If + KUNDE_ERW.kde_CreditSaveId = "" KUNDE_ERW.SAVE() @@ -6467,21 +6564,38 @@ weiter: Exit For Else Thread.Sleep(4000) + GoTo repeatRequest End If End If + Else + counter += 1 + End If Thread.Sleep(1000) Next + If dtCreditsafe.Rows.Count = (counter - dt_fehlendeCreditsafeIDS.Rows.Count) Then + API_Start.UPDTAE_OK() + Else + API_Start.UPDTAE_ERR("IMPORT UNVOLLSTÄNDIG", "Anzahl abgefragte Datensätze:" & dtCreditsafe.Rows.Count & " Anzahl importierte Datensätze:" & counter & " Anzahl fehlende Creditsafe-IDs:" & dt_fehlendeCreditsafeIDS.Rows.Count, "importCreditsafeEvents") + End If + + + If dt_fehlendeCreditsafeIDS.Rows.Count > 0 Then Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_fehlendeCreditsafeIDS,,,,, False) If filepath <> "" Then Dim anhenge As New List(Of String) anhenge.Add(filepath) - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "as@verag.ag"), IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE - fehlende CS-IDs", "Im Anhang befinden sich eine Liste der Kunden, deren Creditsafe-ID ungültig sind/nicht gefunden wurden!" & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) + Dim empfaneger As String = "" + If countMissingVerag > 0 Then empfaneger &= "as@verag.ag;" + If countMissingIMEX > 0 Then empfaneger &= "Viktoria.Leirich@imex-group.at;" + If countMissingUNISPED > 0 Then empfaneger &= "sabine.muehlboeck@unisped.at;" + If countMissingAMBAR > 0 Then empfaneger &= "Buchhaltung@ambarlog.com;" + If empfaneger <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE - fehlende CS-IDs", "Im Anhang befinden sich eine Liste der Kunden, deren Creditsafe-ID ungültig sind/nicht gefunden wurden!" & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) End If End If From 91a87172109cf55096e9a58bb5eb024cefd3f9cf Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 26 Sep 2025 16:00:31 +0200 Subject: [PATCH 06/10] Mailsender --- MailSender/MAILSender.vb | 108 ++++++++++++++------ MailSender/Resources/Auswertung_divers.xlsx | Bin 10116 -> 10171 bytes initATLASAufschubkonten/frmStartOptions.vb | 88 ++++++++-------- 3 files changed, 121 insertions(+), 75 deletions(-) diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index debee27..636694a 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -3,7 +3,6 @@ Imports System.IO Imports System.Net Imports System.Net.Mail Imports ClosedXML.Excel -Imports com.sun.xml.internal.rngom.digested Imports DAKOSY_Worker Imports VERAG_PROG_ALLGEMEIN @@ -52,7 +51,7 @@ Module Mail 'PARAM = "UID_OPS_SYSKA_ABGLEICH" - 'PARAM = "JAHRESABRECHNUNG AG-ZS" + 'PARAM = "BERICHT" '------------------------------------------------------------------------------------ @@ -2581,7 +2580,7 @@ Module Mail ,Absender ,Rechnungsbetrag Betrag ,BelegNr - ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land + ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land, Speditionsbuch.[LKW Kennzeichen] FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart where EmpfängerKundenNr IN (" & KdNr & ") and VermittlerKundenNr IN (" & KdNr & ") and Abfertigungsdatum BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "' And Speditionsbuch.Abfertigungsart IN (1,29,38)", "FMZOLL") @@ -2746,39 +2745,90 @@ Module Mail Datei = .Workbooks.Open(Path) 'Anpassen Blatt = Datei.Worksheets(1) 'Anpassen - Blatt.Range("I1").Value = von.ToShortDateString & "-" & bis.ToShortDateString - Dim cnt = 3 - For Each r In dt.Rows - Blatt.Range("A" & cnt).Value = cnt - 2 - Blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") - ' Blatt.Range("C" & cnt).Value = r("RechnungsNr") - Blatt.Range("C" & cnt).Value = r("Abfertigungsdatum") - Blatt.Range("D" & cnt).Value = r("Abfertigungsbezeichnung") - Blatt.Range("E" & cnt).Value = r("Absender") - Blatt.Range("F" & cnt).Value = "" 'r("Betrag") - Blatt.Range("H" & cnt).Value = r("BelegNr") + If KUNDE.KundenNr = 902452 Then 'KUNDE WILL WIEDER EXZTAWURST!!!!!!! + + Blatt.Range("H1").Value = von.ToShortDateString & "-" & bis.ToShortDateString + + Blatt.Range("A" & 2).Value = "Nr" + Blatt.Range("B" & 2).Value = "Datum" + Blatt.Range("C" & 2).Value = "MRN-Nr." + Blatt.Range("D" & 2).Value = "LKW/Cont." + Blatt.Range("E" & 2).Value = "Rg.-Nr." + Blatt.Range("F" & 2).Value = "EUST" + Blatt.Range("G" & 2).Value = "Anzahl Pos." + Blatt.Range("H" & 2).Value = "" + Blatt.Range("I" & 2).Value = "" + Blatt.Range("J" & 2).Value = "" + Blatt.Range("K" & 2).Value = "" + Blatt.Range("L" & 2).Value = "" + + Dim cnt = 3 + For Each r In dt.Rows + Blatt.Range("A" & cnt).Value = cnt - 2 + Blatt.Range("B" & cnt).Value = r("Abfertigungsdatum") + Blatt.Range("C" & cnt).Value = r("BelegNr") + Blatt.Range("D" & cnt).Value = r("LKW Kennzeichen") + + Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung + Try + Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") + If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then + Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST + Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ANZ_POS + If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then + Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.ATCMRN + End If + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + + cnt += 1 + Next + + Else + + + Blatt.Range("I1").Value = von.ToShortDateString & "-" & bis.ToShortDateString Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung - Try - Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") - If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then - Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.RechnungspreisohneWahrung - Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) - Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL - Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS - If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then - Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN + Dim cnt = 3 + For Each r In dt.Rows + Blatt.Range("A" & cnt).Value = cnt - 2 + Blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") + Blatt.Range("C" & cnt).Value = r("Abfertigungsdatum") + Blatt.Range("D" & cnt).Value = r("Abfertigungsbezeichnung") + Blatt.Range("E" & cnt).Value = r("Absender") + Blatt.Range("F" & cnt).Value = "" 'r("Betrag") + Blatt.Range("H" & cnt).Value = r("BelegNr") + + Try + Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") + If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.RechnungspreisohneWahrung + Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL + Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST + Blatt.Range("K" & cnt).Value = ZOLLANMELDUNG.ANZ_POS + + If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then + Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN + End If End If - End If - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + + cnt += 1 + Next + + End If - cnt += 1 - Next Datei.Save() .DisplayAlerts = False .quit() diff --git a/MailSender/Resources/Auswertung_divers.xlsx b/MailSender/Resources/Auswertung_divers.xlsx index 023087971f6554c2121384ffd3404a37737a7b39..8cbc13d67a3b8a1fd7c9a6db78e529995aa098cd 100644 GIT binary patch delta 3732 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 delta 3741 zcmZ9PXE+-Q7sq2qYn9j(wOSgrsUpj zb1sm1D33&YTv|Xu^dil=B@JybfU$29vxm^PQ(P3=LW3Zl0W`%0$ZxqMN~PHDD}8Iq z)WrKoJj46g;WZg?&hRvogJjnHUf`uH7nvL0f>t1ePxH74i*=PW{{&bqNrC0WCQEC7v;CaL0u(fD`QY13q$W*r;#Q^FCsZX#D}<~2cFi1MKF zOLKEP0re;MVw+g5mMe3EHz))HQS=y==V2Eytv|(o zjicPbej=&I%F0Rk_7ahnGLhUA#W!(}U7=tw$DN850YcBVO6+y!d>(^Ma)(9Ig?vts zRN;wr81ri3USJ6)oyc1i?ujjgBb>Ic=tp7iRnAy+ai;!@9od{~U%ANM-n}S({!zo% z?C?t~Nl?|MeP>0ses4I${mLBJB`grqoon%2$wtV*w(ID?p}R4g7*c9X=qB3xwwa#| z{*w+avLJ2f+LK2`WQ~TrppAr@q-yC6Q17*3t62H`S{(dQO$Sn z?OfcWP~+gu6X%(E!ac0ihRQjgR>R{E!sR`>(F{lg*sc3n&p7L1ay2>YT?R4(Ci~F^ zw;rwwDgb~)q5v2|DJVezR6PX{;k84SvHn~8>0|%^=$|{_?`jWsax@NryLr3#|FsC7 zX;KC_Nv619q046*Z~V5S3^y=WymD*U1k5_I!*|i3qG!b9)s;D5g1}D5N>>>1+qct2 z#`UW=uu+-eHzBtGuO=1$6#I2}*&LD{LvZkT9%VSp$B&ge3C=^rYrWN~ahyz1+C7#Kcsd%ITu>?%<5f*#r&i@;t}5ok3z>?I&G+~B)HuntJ7!E4aglv>suu;; ztS7jBAHDo3`UQ008v=nnggUr_jyO*K09Uk(x{2^%YiBX@D2qK^LSo-G2^f znc0Ck6cM(^ChG%a^U%RC(E&CickVj7+xDX|CsH?Com`b%~C+yK{&`VZjRl$mMN17 z79k`mh+b7N*g)Jp2n@+f=TJi`1t1v`J@k8jDeK#;VwT^uu&?XszZE>7c(~b8`J{cg zUvKmA*gd@%gADppBdJ zQ;k2kf3P-;F(PhLeC9K+Qswk>#|Pviny)iaC02$E#XU zk;981`Ug%-Qq;{h!H(aJitFd-7ku6;2q$Qu^F64NoMh3s$v~eatZL|^NdDV>RMa!i zHZpa&5mENeb~~o3ybr8|(&)t)kD_}7U_+ov=Ju=2R@EI}JVLasAn`dn@&c~IoTZRI z+RCsj%|M~#1h6U7L8d`?f?fgvHR;aIUmewI;UmfS+={oI)wrImKGQUMo@4u6Nk#?D zgG8y2PC#H7SYU%&b|a{&F5J#Do;f#zUAlG8nZ-FF(5zUVmem7Gu{D z_tB#>0y>=Tgc<2f!;d|}Kh|}~r0atP{$$twiEbtgR>tHUt%Sy=+R!wnBQ^-v9U@`r`>^Quq;eMG)0y#J*hyM_0}w z?#|pgsjVgkn*G2)Z2QN?SLL^(CMa4?Sm_b+6-6{1U%!sz|NN67Ok!ULdoxy z6@SOBHnKHU6ra-;-=Ij9VaP~*nba4m_(F}!@6M{_?w`J5YEabHeV@%J68SGdK6x~A zw}n?x7T@L2ko?la>$>cfBJs|mm6pb?2yJd&qD@cNt`+#Zpdy<1%_&ibt6FY>NsLx$ za*uqjyz0#5!c-K$hup6VhObW2>Q5m@&X$J~tY07oXy+Y^W8wITFVWC(2Zy=OCtrs? z?ABgqwJ17KI8W$XTmVX=)mA=uBa;@J7CA93>O;h}Vi`K;B>mM1mn1FufUbSd^B04> zqg3~9pF)5ZjuU(vpnZGIPy+M0HH^aRBMXIXFagk&5JA}M@}Zd6i&dH1{TU&RdVT^E-P-0RUXmqH;L-5tcrSavTwSlO+BFm5=X^w2&L6DcSF+s3~EKDl^PZEH5=v z%J<5(NM{VXx~VJ^qg?W(n%8*?iIDLXwa2eJT#Wo4RtoV@4m=4If!p{P9ep1i$7h5< zW)v%5SD8Z!b8ZmXiIK1PV#5tB2U}^77Ox#^17(gQGQG^T@PEkGAqF7=j#_uGZw#8I zILdb1F?r2L)kkQ&*_iMoXSl;RzI2t-GSSl%ZK1?G45=xx^$IOhY!?f=YOS?_Yru|Z z;-ehKp$$d1ZynZnwlB9=6>`fh$Kf0BYrGV9_X-MG}(yBcOusZ!>fx`?Pbl2!@Q5FWg30NM{NR2{<#Q zjH%|{w5M#ac?Uz^c(7B3BFc+ClVlhKlsOjZeI!rc%V0CkdTnFcWC~5L#dhz3Kx_c)g2kLh)3F<53a!<|ib-*ErGP>HkY~zWV|E!t{9uYw;tsHmT5=giEhN(y+QVqwPui3Aw z$05$AGz=M3gcRbI3Zs*4G|S`ob)RM(-lBZ7^z>_}m8i-<$3uUYXlOy=aEcdUWOU$z z>=YAra-vhlAx@^h;Kl=tlJ{jf9Oto-S+{-KC~Ez@eVi~;Ditvw8xEG`@;qsM$Ift{ z{~1}h5wN6-MiZm*J}6~w5;+`p$qVK(snL{n&->2d_#=FGng%N&G<40b$J@wgU51W; zyylY>Mtsrw>$@;s>&g)Mazm0!z6JE$YoHX4_S({S zWD}i4J}fU%L%R@aE0tV8h~8{q=Mjm2HSNBSLo_b0Cng2IrCJhojK3Qqf!)GT51K$V z*~>xT=7q&lGM(rW0R5nnUKj`ws$#ZxsqC7OYAlYZ(WrzjNmwSf5ISGzw+-UfCY6L> z$!SIF+4v)LHJ7-tk1)XL$*r8G-UzprFhN{)Qr6jL?v-b}pHs~k&3(5_?T=H)6_lJ@ z{k=h;sj--8EBxh3;qLr`*k^U;i0MkH5-FHJ#4N8_{b=EnHB8`9OP>Pg`{XjDbEqBDQA*mzS!umzezqOT6yJp}NCWD6+EOrho}{AVPSyQx@@A25C)t@1 zsA3A%7Daw`D%$^ibtnsAS?>Sm+uvCCFC#-$3#*f{qIQK1$=FfKA|gEh&wu}}1OOI6 zs7Mh$p8wu!0D$Aa+25WqCn}$lOWY7jMh^bX(bNFo@1OwSZz239>x$oB=C%K6&_`X0 YsFHu@L#c`ylLeyEMFpvKg#N1d2X6B10ssI2 diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index b12a872..656b928 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -6,8 +6,6 @@ Imports System.Security.Cryptography.X509Certificates Imports System.Text Imports System.Threading Imports System.Xml -Imports com.sun.xml.internal.rngom -Imports com.sun.xml.internal.rngom.digested Imports MDM_Worker Imports Renci.SshNet Imports VERAG_PROG_ALLGEMEIN @@ -833,26 +831,26 @@ Public Class frmStartOptions End If - Case "CREDITSAFE_EVENTS_DETAIL" + Case "CREDITSAFE_EVENTS_MONTHLY" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim upateKunden As Boolean = True - Dim OnlyCurrentMonthData As Boolean = True + Dim upateKunden As Boolean = False + Dim checkDate As Boolean = True Dim setzeInfoImKunden As Boolean = False - Dim sendMail As Boolean = True + Dim sendMail As Boolean = False 'nicht nochmals, oder? - importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, OnlyCurrentMonthData, upateKunden, setzeInfoImKunden, sendMail, True) + importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, checkDate, upateKunden, setzeInfoImKunden, sendMail, True) closeMe() - Case "CREDITSAFE_EVENTS" + Case "CREDITSAFE_EVENTS_DAILY" VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim upateKunden As Boolean = True - Dim OnlyCurrentMonthData As Boolean = True + Dim upateKunden As Boolean = False + Dim checkDate As Boolean = True Dim setzeInfoImKunden As Boolean = False Dim sendMail As Boolean = True - importCreditsafeEvents(CDate("01." & Now.Month & "." & Now.Year).ToShortDateString, OnlyCurrentMonthData, upateKunden, setzeInfoImKunden, sendMail, False) + importCreditsafeEvents(CDate(Today().AddDays(-1)).ToShortDateString, checkDate, upateKunden, setzeInfoImKunden, sendMail, False) closeMe() Case "CREDITSAFE_UPLOADS" @@ -6363,45 +6361,46 @@ weiter: '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - 'WICHTIG, bei companyDetailEventsRequest = true wird gleich Punkt 3 gemacht (dauert länger, aber mehr Datensätze und alle Kunden werden geprüft, bei companyDetailEventsRequest = false wird die u.a. Best Practice-Methode durchgeführt-> also triggerbasierend)!!!! + 'WICHTIG, bei companyDetailEventsRequest = true wird gleich Punkt 3 gemacht (dauert länger, aber mehr Datensätze und alle Kunden werden geprüft, bei companyDetailEventsRequest = false wird die u.a. Best Practice-Methode durchgeführt (Punkt 1 und 2) -> also triggerbasierend)!!!! + 'ANSATZ, bei der täglichen Prüfung die triggerbasierten Abruf, 1x im Monat bzw. wenn spezisches Unternehmen geprüft wird, dann Punkt 3. '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 'Best Practices for Viewing Notification Events '1. Use Portfolio-Specific Events for Targeted Monitoring: Start with the portfolio-specific endpoint to focus on changes relevant to a particular portfolio. '2. Leverage Global Events for a Broader View: Use the all-events endpoint to gain a comprehensive overview of all notifications across your portfolios. - '3. Drill Down to Company-Level Events When Needed: For detailed insights into a specific company, use the company-specific endpoint. + + '3. Drill Down to Company-Level Events WHEN NEEDED: For detailed insights into a specific company, use the company-specific endpoint. '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 'Dim creditsaveOld As String = " + ' select ba_KundenNr FROM tblBonitaetsauskunft WHERE ba_Pruefungstool = 'creditsafe API' - Dim creditsaveOld As String = " - select ba_KundenNr FROM tblBonitaetsauskunft WHERE ba_Pruefungstool = 'creditsafe API' - - EXCEPT - - SELECT * FROM ( SELECT ba_KundenNr - FROM tblBonitaetsauskunft - WHERE ba_Pruefungstool = 'creditsafe API' and cast(ba_Datum as Date) >= '" & datum & "' - - UNION ALL - - SELECT e.KundenNr - FROM ( - SELECT e.KundenNr, - e.eventDate, - 'creditsafe API' AS Source - FROM [VERAG].[dbo].[tblCreditsafeEvents] e - INNER JOIN [VERAG].[dbo].[tblBonitaetsauskunft] b - ON e.bonId = b.ba_id - WHERE b.ba_Pruefungstool = 'creditsafe API' - AND (e.localEventCode IN ('CL','CR') OR e.globalEventCode IN ('CL','CR')) - ) e - WHERE cast(e.eventDate as Date) >= '" & datum & "' - GROUP BY Source, e.KundenNr, cast(e.eventDate as Date) - ) AS Temp" + ' EXCEPT + + ' SELECT * FROM ( SELECT ba_KundenNr + ' FROM tblBonitaetsauskunft + ' WHERE ba_Pruefungstool = 'creditsafe API' and cast(ba_Datum as Date) >= '" & datum & "' + + ' UNION ALL + + ' SELECT e.KundenNr + ' FROM ( + ' SELECT e.KundenNr, + ' e.eventDate, + ' 'creditsafe API' AS Source + ' FROM [VERAG].[dbo].[tblCreditsafeEvents] e + ' INNER JOIN [VERAG].[dbo].[tblBonitaetsauskunft] b + ' ON e.bonId = b.ba_id + ' WHERE b.ba_Pruefungstool = 'creditsafe API' + ' AND (e.localEventCode IN ('CL','CR') OR e.globalEventCode IN ('CL','CR')) + ' ) e + ' WHERE cast(e.eventDate as Date) >= '" & datum & "' + ' GROUP BY Source, e.KundenNr, cast(e.eventDate as Date) + ' ) AS Temp" @@ -6411,9 +6410,11 @@ weiter: inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr inner join Filialen as f on f.FilialenNr = Kunden.FilialenNr inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr - where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 1 AND ba_Pruefungstool = 'creditsafe API'" & IIf(datum <> "", " AND Kunden.Bonitätsdatum <= '" & datum & "'", "") + where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 1 AND ba_Pruefungstool = 'creditsafe API'" & IIf(datum <> "", " AND Kunden.Bonitätsdatum <= '" & datum & "' ", "") - 'KundenNr und Firma + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + creditsave &= " AND ba_Kundennr in (701809, 1096780)" + End If Dim cs = New cCreditSafeAPI("creditsafe") @@ -6472,11 +6473,6 @@ repeatRequestDailyPages: End If - If False Then - creditsave &= " and (ba_KundenNr = 718137 or ba_KundenNr = 1003418)" - End If - - Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-2) & "' ", "FMZOLL") Dim dtCreditsafe As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") @@ -6529,7 +6525,7 @@ repeatRequestDailyPages: repeatRequest: Dim APIText As String = "" If exists Then - APIText = cs.getCompanyEvents(company, dt, False, checkDate, upateKunden, False,, setzeKundenbesonderheiten, Mailinfolast2Years, row("Firma")) + APIText = cs.getCompanyEventsDetails(company, dt, checkDate, upateKunden, False, , setzeKundenbesonderheiten, Mailinfolast2Years, row("Firma")) End If If (APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler")) Then From 01ffb03f1bedd54dedd77a1fa73f4524d250febd Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 13:15:28 +0200 Subject: [PATCH 07/10] Mailsender --- MailSender/MAILSender.vb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 636694a..10bd8ff 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -2774,11 +2774,29 @@ Module Mail Try Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "") If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then - Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + + + '------------------------------------------------------- + + Dim RechnungsString = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Dim rows() As String = RechnungsString.Split(New Char() {" "c}, StringSplitOptions.RemoveEmptyEntries) + + For Each row As String In rows + + If IsDate(row) AndAlso row.Length = 10 Then + RechnungsString = RechnungsString.Replace(row.ToString, "") + End If + + Next + + Blatt.Range("E" & cnt).Value = RechnungsString.Trim + + '------------------------------------------------------- + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ANZ_POS If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then - Blatt.Range("E" & cnt).Value = ZOLLANMELDUNG.ATCMRN + Blatt.Range("C" & cnt).Value = ZOLLANMELDUNG.ATCMRN End If End If From 4b248b9aee8a314374f45995dc7a7b6484171fd3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 15:08:17 +0200 Subject: [PATCH 08/10] Mailsender (StartOptions) --- initATLASAufschubkonten/frmStartOptions.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 656b928..fe1d124 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -6589,8 +6589,8 @@ repeatRequest: Dim empfaneger As String = "" If countMissingVerag > 0 Then empfaneger &= "as@verag.ag;" If countMissingIMEX > 0 Then empfaneger &= "Viktoria.Leirich@imex-group.at;" - If countMissingUNISPED > 0 Then empfaneger &= "sabine.muehlboeck@unisped.at;" - If countMissingAMBAR > 0 Then empfaneger &= "Buchhaltung@ambarlog.com;" + If countMissingUNISPED > 0 Then empfaneger &= "" '"sabine.muehlboeck@unisped.at;" + If countMissingAMBAR > 0 Then empfaneger &= "" '"Buchhaltung@ambarlog.com;" If empfaneger <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE - fehlende CS-IDs", "Im Anhang befinden sich eine Liste der Kunden, deren Creditsafe-ID ungültig sind/nicht gefunden wurden!" & "

" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) End If End If From 0f4aad9a21c044de462b9ef612e4776629f4a2b1 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 29 Sep 2025 16:49:46 +0200 Subject: [PATCH 09/10] creditsafe-api --- initATLASAufschubkonten/frmStartOptions.vb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index fe1d124..2804c48 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -851,6 +851,9 @@ Public Class frmStartOptions Dim sendMail As Boolean = True importCreditsafeEvents(CDate(Today().AddDays(-1)).ToShortDateString, checkDate, upateKunden, setzeInfoImKunden, sendMail, False) + + + closeMe() Case "CREDITSAFE_UPLOADS" @@ -6429,8 +6432,8 @@ weiter: Dim dtMonitoredRequest As New DataTable Dim companyDummy As New cCreditSafeAPI.Company("", "", "", "", "", "", Nothing, "", "", "", "", "", "", "", "", "", 0) - If txtCSDate.Text <> "" AndAlso IsDate(txtCSDate.Text) Then - companyDummy.lastChecked = CDate(txtCSDate.Text) + If datum <> "" AndAlso IsDate(datum) Then + companyDummy.lastChecked = CDate(datum) End If repeatRequestDaily: Dim page As Integer = 0 From 30717282089f0f850a57e957f34c299b2882a191 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 30 Sep 2025 15:48:51 +0200 Subject: [PATCH 10/10] mailinfo --- initATLASAufschubkonten/frmStartOptions.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 2804c48..e0fcaa6 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -6421,7 +6421,7 @@ weiter: Dim cs = New cCreditSafeAPI("creditsafe") - Dim Mailinfolast2Years As Boolean = False + Dim Mailinfolast1Year As Boolean = False If cs.authenticate() = "200" Then @@ -6476,7 +6476,7 @@ repeatRequestDailyPages: End If - Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-2) & "' ", "FMZOLL") + Dim dtRechnungen As DataTable = (New SQL).loadDgvBySql("select distinct(RechnungsKundenNr) from Rechnungsausgang where cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-1) & "' ", "FMZOLL") Dim dtCreditsafe As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") @@ -6519,16 +6519,16 @@ repeatRequestDailyPages: If sendMail Then If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - Mailinfolast2Years = True + Mailinfolast1Year = True Else - Mailinfolast2Years = exists + Mailinfolast1Year = exists End If End If repeatRequest: Dim APIText As String = "" If exists Then - APIText = cs.getCompanyEventsDetails(company, dt, checkDate, upateKunden, False, , setzeKundenbesonderheiten, Mailinfolast2Years, row("Firma")) + APIText = cs.getCompanyEventsDetails(company, dt, checkDate, upateKunden, False, , setzeKundenbesonderheiten, Mailinfolast1Year, row("Firma")) End If If (APIText.Contains("Error") Or APIText.Contains("Verbindungsfehler")) Then