diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 7e60fad..598e9d1 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -3681,6 +3681,7 @@ Public Class usrctlProcedures DYIMPORT.Shipmentnummer = isleernothing((currentRow(138))) DYIMPORT.Importstatus = isleernothing((currentRow(139))) DYIMPORT.Importdate = Now() + DYIMPORT.Importfile = fd.FileName If DYIMPORT.SAVE() Then TextBox10.Text &= DYIMPORT.Id & vbNewLine If Not savedDY Then savedDY = True diff --git a/initATLASAufschubkonten/cAsfinag.vb b/initATLASAufschubkonten/cAsfinag.vb index 7d49b11..64d4230 100644 --- a/initATLASAufschubkonten/cAsfinag.vb +++ b/initATLASAufschubkonten/cAsfinag.vb @@ -1754,6 +1754,12 @@ Public Class cAsfinag Dim lngPKLine As Long = 0 Dim lngRecordCount As Long + Dim counTrans As Integer = 0 + Dim savedTrans As Integer = 0 + Dim MDMEinarb As New cMDMEinarbeitung("ASFINAG", Now(), Now()) + MDMEinarb.setInvoicingDate(Now(), MDMEinarb) + + 'Datei auf Fehler prüfen Do While (objFileRead.Peek() > -1) Dim strZeile = objFileRead.ReadLine() @@ -1928,7 +1934,7 @@ Public Class cAsfinag ttrBody.amountInclVAT = 0 - ttrBody.amountInclVAT ttrBody.VATamount = 0 - ttrBody.VATamount End If - .SAVE() + If .SAVE() Then savedTrans += 1 End With @@ -1946,6 +1952,8 @@ Public Class cAsfinag .checksumAmounntInclVAT = Trim(Mid(strZeile, 29, 15)) / 100 .SAVE() + counTrans = .recordCount + End With Case Else @@ -1954,6 +1962,18 @@ Public Class cAsfinag Loop + + + MDMEinarb.ds_total = savedTrans + MDMEinarb.ds_count = counTrans + + If MDMEinarb.ds_total = MDMEinarb.ds_count Then + MDMEinarb.completed = True + MDMEinarb.completed_date = Now() + End If + + MDMEinarb.SAVE() + objFileRead.Close() Return True diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index 3f1d05b..3493814 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -5,6 +5,7 @@ Imports Renci.SshNet Imports System.Net Imports System.Text Imports System.Text.RegularExpressions +Imports VERAG_PROG_ALLGEMEIN Public Class frmMDMNachrichtenVerarbeitung Dim cntDatenEingelesen As Integer = 0 @@ -542,6 +543,11 @@ Public Class frmMDMNachrichtenVerarbeitung Dim plose_RechnungsLieferantCode = "" Dim plose_RechnungsNr = "" + + Dim counTrans As Integer = 0 + Dim savedTrans As Integer = 0 + Dim MDMEinarb As New cMDMEinarbeitung("PLOSE", Now(), Now()) + Dim plose_RechnungsDat = Nothing Dim plose_Lieferant = Nothing @@ -665,9 +671,11 @@ Public Class frmMDMNachrichtenVerarbeitung '''''''''''' If PLOSE.SAVE() Then - + savedTrans += 1 End If + counTrans += 1 + End If End Select @@ -702,9 +710,16 @@ Public Class frmMDMNachrichtenVerarbeitung addDGVEinarbeitung("PLOSE: Detail" & KdnR, readPLOSE_Detail) - ' End Using - 'End If + MDMEinarb.ds_total = counTrans + MDMEinarb.ds_count = savedTrans + + If MDMEinarb.ds_total = MDMEinarb.ds_count Then + MDMEinarb.completed = True + MDMEinarb.completed_date = Now() + End If + + MDMEinarb.SAVE() Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb index 6cee86f..64d7914 100644 --- a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb +++ b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb @@ -560,8 +560,6 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers If programName.Contains("RMC") Then - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True - Select Case i Case 1 @@ -699,7 +697,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers 'copy file to lydia 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 + If fileNamePath.ToString.ToLower.Contains("nto") Then frmStartOptions.copyFile(fileNamePath, filepathToLydia & "NETTO\") Else frmStartOptions.copyFile(fileNamePath, filepathToLydia & "BRUTTO\") diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index b7868c7..833a5cf 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -226,6 +226,7 @@ Partial Class frmStartOptions Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() Me.cbxUploadDA = New System.Windows.Forms.CheckBox() Me.RMC = New System.Windows.Forms.TabPage() + Me.LinkLabel53 = New System.Windows.Forms.LinkLabel() Me.Label29 = New System.Windows.Forms.Label() Me.Label30 = New System.Windows.Forms.Label() Me.RMC_import = New System.Windows.Forms.LinkLabel() @@ -277,6 +278,7 @@ 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.cbxEventtriggered = New System.Windows.Forms.CheckBox() Me.Label50 = New System.Windows.Forms.Label() Me.Label49 = New System.Windows.Forms.Label() Me.Label48 = New System.Windows.Forms.Label() @@ -354,7 +356,6 @@ 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.cbxEventtriggered = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -2854,6 +2855,7 @@ Partial Class frmStartOptions ' 'RMC ' + Me.RMC.Controls.Add(Me.LinkLabel53) Me.RMC.Controls.Add(Me.Label29) Me.RMC.Controls.Add(Me.Label30) Me.RMC.Controls.Add(Me.RMC_import) @@ -2867,6 +2869,17 @@ Partial Class frmStartOptions Me.RMC.Text = "RMC" Me.RMC.UseVisualStyleBackColor = True ' + 'LinkLabel53 + ' + Me.LinkLabel53.AutoSize = True + Me.LinkLabel53.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel53.Location = New System.Drawing.Point(13, 176) + Me.LinkLabel53.Name = "LinkLabel53" + Me.LinkLabel53.Size = New System.Drawing.Size(119, 13) + Me.LinkLabel53.TabIndex = 102 + Me.LinkLabel53.TabStop = True + Me.LinkLabel53.Text = "RE mit PDF verknüpfen" + ' 'Label29 ' Me.Label29.AutoSize = True @@ -3492,6 +3505,19 @@ Partial Class frmStartOptions Me.TabPage7.Text = "Creditsafe" Me.TabPage7.UseVisualStyleBackColor = True ' + 'cbxEventtriggered + ' + 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 + ' 'Label50 ' Me.Label50.AutoSize = True @@ -3597,9 +3623,9 @@ Partial Class frmStartOptions Me.lblCSPortfolio.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblCSPortfolio.Location = New System.Drawing.Point(14, 48) Me.lblCSPortfolio.Name = "lblCSPortfolio" - Me.lblCSPortfolio.Size = New System.Drawing.Size(74, 13) + Me.lblCSPortfolio.Size = New System.Drawing.Size(94, 13) Me.lblCSPortfolio.TabIndex = 159 - Me.lblCSPortfolio.Text = "im Portfolio:" + Me.lblCSPortfolio.Text = "im CS-Portfolio:" ' 'bcxKundendatenaktCS ' @@ -4739,19 +4765,6 @@ Partial Class frmStartOptions Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' - 'cbxEventtriggered - ' - 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 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -5161,4 +5174,5 @@ Partial Class frmStartOptions Friend WithEvents Label49 As Label Friend WithEvents Label50 As Label Friend WithEvents cbxEventtriggered As CheckBox + Friend WithEvents LinkLabel53 As LinkLabel End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 049c40f..8da457c 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -212,102 +212,6 @@ +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 @@ -718,6 +622,9 @@ SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC + + True + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj @@ -814,12 +721,102 @@ SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC - - True - - - True - + + + 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 diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index b77a542..ac43448 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 DocumentFormat.OpenXml.Drawing.Diagrams Imports MDM_Worker Imports Renci.SshNet Imports VERAG_PROG_ALLGEMEIN @@ -660,27 +661,45 @@ Public Class frmStartOptions Else Dim totalPages = 0 Dim batchrequestNr = 0 + Dim counTrans As Integer = 0 + Dim savedTrans As Integer = 0 + Dim MDMEinarb As New cMDMEinarbeitung("MSE", Now()) + MDMEinarb.setInvoicingDate(Now(), MDMEinarb) 'getNewestTransactions - Only returns the first page of transactions, subsequent pages are to be requested via /transactions with batch_seq_nr and page_nr. - fehler = mse.getNewestTransactions(token, dt, batchrequestNr, totalPages, 0, True) + fehler = mse.getNewestTransactions(token, dt, batchrequestNr, totalPages, 0, True, savedTrans) If fehler <> "" Then API.UPDTAE_ERR("Batch-Nr: " & batchrequestNr & "-" & totalPages, fehler, "getNewestTransactions") closeMe() Exit Sub + Else + counTrans += dt.Rows.Count End If If totalPages > 1 Then For i = 2 To totalPages If dt.Rows.Count > 0 Then dt.Clear() - fehler = mse.getTransactionsFromBatchNrAndPage(token, dt, batchrequestNr, totalPages, i) + fehler = mse.getTransactionsFromBatchNrAndPage(token, dt, batchrequestNr, totalPages, i, savedTrans) If fehler <> "" Then API.UPDTAE_ERR("Batch-Nr: " & batchrequestNr & "-" & totalPages, fehler, "getTransactionsFromBatchNrAndPage") closeMe() Exit Sub + Else + counTrans += dt.Rows.Count End If i = i + 1 Next End If API.UPDTAE_OK(,, PARAM & " Batch-Nr: " & batchrequestNr & "-" & totalPages) + MDMEinarb.ds_count += savedTrans + MDMEinarb.ds_total += counTrans + + If MDMEinarb.ds_count = MDMEinarb.ds_total Then + MDMEinarb.completed = True + MDMEinarb.completed_date = Now() + End If + + MDMEinarb.import_date = Now() + MDMEinarb.SAVE() closeMe() End If @@ -3306,7 +3325,7 @@ Public Class frmStartOptions Private Function ValidateServerCertificate(sender As Object, certificate As X509Certificate, chain As X509Chain, sslPolicyErrors As SslPolicyErrors) As Boolean Return True End Function - Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "", Optional setKundenvermerk As Boolean = False, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1000) As Boolean + Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "", Optional setKundenvermerk As Boolean = False, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1500) As Boolean Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Try VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = Mail_FIMRA @@ -4075,17 +4094,17 @@ Public Class frmStartOptions End If SDL.Sachbearbeiter = "ASFINAG" - Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) + Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) - SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber")) + SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber")) If Validto <> "" Then SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1))) End If - SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID")) - SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) - SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie")) - SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse")) - SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status")) + SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID")) + SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss")) + SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie")) + SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse")) + SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status")) SDL.SAVE() End If @@ -4131,21 +4150,21 @@ Public Class frmStartOptions End If SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "") - Dim Validto = SQl.checkNullStr(row.Item("contractDate")) + Dim Validto = SQL.checkNullStr(row.Item("contractDate")) - SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber")) + SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber")) If Validto <> "" Then 'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2)) SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken! End If - SDL.OBUID = SQl.checkNullStr(row.Item("OBUID")) - SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate")) - SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory")) - SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory")) - SDL.Status = SQl.checkNullStr(row.Item("status")) - SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality")) - SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass")) + SDL.OBUID = SQL.checkNullStr(row.Item("OBUID")) + SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate")) + SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory")) + SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory")) + SDL.Status = SQL.checkNullStr(row.Item("status")) + SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality")) + SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass")) SDL.SAVE() End If @@ -5090,7 +5109,12 @@ Public Class frmStartOptions Dim totalPages = 0 Dim batchrequestNr = 0 - fehler = mse.getNewestTransactions(token, dt, batchrequestNr, totalPages, 0, cbxOnlyBilledTransactions.Checked) + Dim counTrans As Integer = 0 + Dim savedTrans As Integer = 0 + Dim MDMEinarb As New cMDMEinarbeitung("MSE", Now()) + MDMEinarb.setInvoicingDate(Now(), MDMEinarb) + + fehler = mse.getNewestTransactions(token, dt, batchrequestNr, totalPages, 0, cbxOnlyBilledTransactions.Checked, savedTrans) If fehler <> "" Then MsgBox(fehler) @@ -5102,7 +5126,7 @@ Public Class frmStartOptions For i = 2 To totalPages If dt.Rows.Count > 0 Then dt.Clear() - fehler = mse.getTransactionsFromBatchNrAndPage(token, dt, batchrequestNr, totalPages, i) + fehler = mse.getTransactionsFromBatchNrAndPage(token, dt, batchrequestNr, totalPages, i, savedTrans) If fehler <> "" Then MsgBox(fehler) @@ -5117,6 +5141,17 @@ Public Class frmStartOptions End If + MDMEinarb.ds_count += savedTrans + MDMEinarb.ds_total += counTrans + + If MDMEinarb.ds_count = MDMEinarb.ds_total Then + MDMEinarb.completed = True + MDMEinarb.completed_date = Now() + End If + + MDMEinarb.import_date = Now() + MDMEinarb.SAVE() + End If @@ -5209,7 +5244,7 @@ Public Class frmStartOptions For i = 2 To totalPages If transactions.Rows.Count > 0 Then transactions.Clear() - fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, i) + fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, i, 0) If fehler <> "" Then MsgBox(fehler) @@ -5245,6 +5280,11 @@ Public Class frmStartOptions Dim transactions As New DataTable Dim invoice As New DataTable + Dim counTrans As Integer = 0 + Dim savedTrans As Integer = 0 + Dim MDMEinarb As New cMDMEinarbeitung("MSE", Now()) + MDMEinarb.setInvoicingDate(Now(), MDMEinarb) + If fehler <> "" Then MsgBox(fehler) Me.Visible = True @@ -5260,11 +5300,15 @@ Public Class frmStartOptions End If - fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 1) + fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 1, savedTrans) If fehler <> "" Then MsgBox(fehler) Me.Visible = True Exit Sub + Else + counTrans += transactions.Rows.Count + + End If @@ -5272,11 +5316,15 @@ Public Class frmStartOptions For i = 2 To totalPages If transactions.Rows.Count > 0 Then transactions.Rows.Clear() - fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, i) + fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, i, savedTrans) If fehler <> "" Then MsgBox(fehler) Me.Visible = True Exit Sub + + Else + counTrans += transactions.Rows.Count + End If Next @@ -5284,6 +5332,17 @@ Public Class frmStartOptions MsgBox("DONE") + MDMEinarb.ds_count += savedTrans + MDMEinarb.ds_total += counTrans + + If MDMEinarb.ds_count = MDMEinarb.ds_total Then + MDMEinarb.completed = True + MDMEinarb.completed_date = Now() + End If + + MDMEinarb.import_date = Now() + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then MDMEinarb.SAVE() + End If Me.Visible = True @@ -6347,7 +6406,7 @@ weiter: If sqlCountUploaded <> "" AndAlso IsNumeric(sqlCountUploaded) Then countUploaeded = CInt(sqlCountUploaded) - lblCS_DB.Text = sqlCountUploaded + lblCS_DB.Text = " VON " & sqlCountUploaded lblMissingCS.Text &= countMissing @@ -6648,10 +6707,14 @@ repeatRequest: Dim where As String = "" - If Not sync Then where = " and kde_CSPortfolioAdded = 0" + If Not sync Then + where = " and kde_CSPortfolioAdded = 0" + Else + addCreditsave = (New SQL).doSQL("Update tblKundenErweitert set kde_CSPortfolioAdded = 0 where kde_CSPortfolioAdded = 1", "FMZOLL") + End If 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 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 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 inner join Rechnungsausgang on Rechnungsausgang.RechnungsKundenNr = Adressen.AdressenNr where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' " & where & " and Adressen.Auswahl = 'A' and cast(RechnungsDatum as Date) >= ' " & Today().AddYears(-1) & "' group by kde_CreditSaveNo, kde_CreditSaveId" Dim dtCreditsafe_CSV As DataTable = (New SQL).loadDgvBySql(creditsave, "FMZOLL") If dtCreditsafe_CSV.Rows.Count = 0 Then @@ -6686,7 +6749,9 @@ repeatRequest: addCreditsave = (New SQL).doSQL("Update tblKundenErweitert set kde_CSPortfolioAdded = 1 where kde_CreditSaveNo in (" & CS_ID & ")", "FMZOLL") End If - If sync Then addCreditsave = False + If sync Then + addCreditsave = False + End If End While @@ -6694,7 +6759,7 @@ repeatRequest: Dim countUploaeded As Integer = 0 Dim sql As New SQL - lblCSPortfolio.Text = "im Portfolio:" + lblCSPortfolio.Text = "im CS-Portfolio:" lblMissingCS.Text = "hochzuladende Unternehmen in CS: " Dim sqlCountNotUploaded As String = sql.getValueTxtBySql("select count(distinct(kde_CreditSaveNo)) from tblKundenErweitert where isnull(tblKundenErweitert.kde_CreditSaveId,'') <> '' and kde_CreditSaveId <> 'True' and kde_CreditSaveId <>'False' and isnull(kde_CreditSaveNo,'') <> '' and kde_CSPortfolioAdded = 0", "FMZOLL") @@ -6707,11 +6772,50 @@ repeatRequest: lblMissingCS.Text &= countMissing - lblCS_DB.Text = sqlCountUploaded + lblCS_DB.Text = " VON" & sqlCountUploaded End Sub Private Sub cbCheckDate_CheckedChanged(sender As Object, e As EventArgs) Handles cbCheckDate.CheckedChanged txtCSDate.Enabled = cbCheckDate.Checked If cbCheckDate.Checked Then txtCSDate.Text = "" End Sub + + Private Sub LinkLabel53_LinkClicked_2(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel53.LinkClicked + + Dim fehlendePDFzuRE As String = "select rmc_daId,rmc_pdfFileName, Year(cast(rmc_importDatum as Date)) as rmc_importDatumYear FROM [tblRMCImport] where rmc_daId is null and cast(rmc_importDatum as Date) >= '02.10.2025' " + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim dtRechnnungsdaten As DataTable = SQL.loadDgvBySql(fehlendePDFzuRE, "FMZOLL") + + If dtRechnnungsdaten.Rows.Count > 0 Then + + For Each r As DataRow In dtRechnnungsdaten.Rows + + Dim dateinameSearch As String = r.Item("rmc_pdfFileName") + + If dateinameSearch.Contains("bto") Then + + dateinameSearch = dateinameSearch.Replace("bto.pdf", "bto%.pdf") + + ElseIf dateinameSearch.Contains("nto") Then + dateinameSearch = dateinameSearch.Replace("nto.pdf", "nto%.pdf") + End If + If dateinameSearch <> "" Then + + Dim daId As Integer = 0 + 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= 'RMC' AND da_uOrdner2= '" & r.Item("rmc_importDatumYear") & "' AND da_name like '%" & dateinameSearch & "'", "FMZOLL",,, 0)) + 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 [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "', rmc_daIdgesetztDatum = getdate() where [rmc_pdfFileName] = '" & r.Item("rmc_pdfFileName") & "' ", "FMZOLL") + + End If + End If + End If + + Next + End If + + End Sub End Class \ No newline at end of file