diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index f28e695..bf73407 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -57,7 +57,7 @@ Module Mail ' PARAM = "MDM_IT_Verguetung" 'PARAM = "JAHRESABRECHNUNG AG-ZS" - 'PARAM = "TETRAPAK" + 'PARAM = "" '------------------------------------------------------------------------------------ @@ -275,6 +275,84 @@ Module Mail End If + + Case "KANADEVIA_DETAIL" + + Dim von = CDate("01.01." & Now.Year) + Dim bis As Date = New Date(Now.Year, Now.Month, 1).AddDays(-1) + + Dim mailTo = "Julie.Garton@kanadevia-inova.com; Mark.Stauffer@kanadevia-inova.com;Sevda.Aksoy@kanadevia-inova.com; Iryna.Hauser@kanadevia-inova.com" + Dim mailToBCC = "ml@verag.ag;al@verag.ag" + + 'mailToBCC = "d.breimaier@verag.ag;" + 'mailTo = "d.breimaier@verag.ag;" + + + Dim ListOfKdNr As New List(Of Integer) + Dim Body As String = "Please find attached the reports on customs declarations for the period from " & von.ToShortDateString & " to " & bis.ToShortDateString & "." & + "

Generated on: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString & + "


This is an automatically generated email. Please do not reply to this email." & + "

VERAG SPEDITION AG" + + ListOfKdNr.Add(770931) + ListOfKdNr.Add(772819) + ListOfKdNr.Add(773157) + ListOfKdNr.Add(773143) + + For Each kdNr As Integer In ListOfKdNr + + Dim RPT As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuchReport + + System.Console.WriteLine("Auswertung " & PARAM & " gestartet...") + + If SendEmail_KANADEVIA(mailTo, RPT.RunReport_VERAG_ZA_DETAIL(kdNr, von, bis, , False,, False), von, bis,, mailToBCC, PARAM, Body) Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + Next + + + + + + Case "KANADEVIA_GENERAL" + + Dim von = CDate("01.01." & Now.Year) + Dim bis As Date = New Date(Now.Year, Now.Month, 1).AddDays(-1) + + Dim mailTo = "Julie.Garton@kanadevia-inova.com; Mark.Stauffer@kanadevia-inova.com;Sevda.Aksoy@kanadevia-inova.com; Iryna.Hauser@kanadevia-inova.com;" + Dim mailToBCC = "ml@verag.ag;al@verag.ag;" + + 'mailToBCC = "d.breimaier@verag.ag;" + 'mailTo = "d.breimaier@verag.ag;" + + + Dim ListOfKdNr As New List(Of Integer) + Dim Body As String = "Please find attached the reports on customs declarations for the period from " & von.ToShortDateString & " to " & bis.ToShortDateString & "." & + "

Generated on: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString & + "


This is an automatically generated email. Please do not reply to this email." & + "

VERAG SPEDITION AG" + + + ListOfKdNr.Add(770931) + ListOfKdNr.Add(772819) + ListOfKdNr.Add(773157) + ListOfKdNr.Add(773143) + + For Each kdNr As Integer In ListOfKdNr + + Dim RPT As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuchReport + System.Console.WriteLine("Auswertung " & PARAM & " gestartet...") + + If SendEmail_KANADEVIA(mailTo, RPT.RunReport_VERAG_ZA_GENERAL(kdNr, von, bis, , False, True,, False), von, bis,, mailToBCC, PARAM, Body) Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If + + Next + + + + + Case "ZF" 'umgebaut auf neue Mailsender-Logik Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year) Dim bis = CDate("01." & Now.Month & "." & Now.Year).AddDays(-1) @@ -328,7 +406,7 @@ Module Mail Else - System.Console.WriteLine("OPTION erkannt: ZF _ Erstellt eine monaltiche Auswertung der Abfertigungen für ZF.") + System.Console.WriteLine("OPTION erkannt: ZF _ Erstellt eine monatliche Auswertung der Abfertigungen für ZF.") System.Console.WriteLine("Auswertung Details gestartet...") If SendEmail_ZF("teresa.elster@zf.com;manfred.lindbichler@zf.com;walter.gnadlinger@zf.com", KdNr, von, bis, "monthly") Then @@ -1019,6 +1097,48 @@ Module Mail End Try End Function + Private Function SendEmail_KANADEVIA(Mailto As String, Path As String, von As Date, bis As Date, Optional cc As String = "", Optional bcc As String = "", Optional Subject As String = "", Optional Body As String = "") As Boolean + Try + Dim excel As String = Path + System.Console.WriteLine("EXCEL erstellt...") + If excel <> "" And Not excel.StartsWith("ERROR: ") Then + + System.Console.WriteLine("Sende E-Mail...") + + If Subject = "" Then + Subject = "Auswertungen KANADEVIA" + End If + + If Body = "" Then + Body = "Anbei befinden sich die Auswertungen Zollanmeldungen von " & von.ToShortDateString & " bis " & bis.ToShortDateString & "." & + "

Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString & + "


Automatisch generiertes E-Mail. Bitte Antworten Sie nicht an dieses E-Mail." & + "

VERAG SPEDITION AG" + Else + Body = replaceBodyVariable(Body, von, bis) + End If + + Dim anhenge As New List(Of String) + anhenge.Add(excel) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body, getAbsenderEmail(),, False, cc, bcc, anhenge) Then + System.Console.WriteLine("E-Mail gesendet.") + System.Console.WriteLine("Erfolgreich!") + Else + System.Console.WriteLine("ERROR BEIM SENDEN DER MAIL!") + + End If + + Return True + Else + System.Console.WriteLine(excel) + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + System.Console.WriteLine(ex.Message & ex.StackTrace) + Return False + End Try + End Function + Private Function SendEmail_ZF(Mailto As String, KdNr As String, von As Date, bis As Date, Auswertungstyp As String, Optional cc As String = "", Optional bcc As String = "", Optional Subject As String = "", Optional Body As String = "") As Boolean Try Dim excel As String = genEXCEL_ZF(KdNr, von, bis, Auswertungstyp) diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index c655931..4195c35 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -249,6 +249,7 @@ Public Class usrCntlMitarbeiter ' MsgBox("ALLE:" & dt.Rows.Count & vbNewLine & "AKIVE:" & dt_onlyActive.Rows.Count) End If + With dgvTimasNew .RowTemplate.Height = 20 @@ -263,9 +264,22 @@ Public Class usrCntlMitarbeiter .SelectionMode = DataGridViewSelectionMode.FullRowSelect .AllowUserToOrderColumns = True If .ColumnCount > 5 Then .Columns(6).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + + For i As Integer = 0 To .Rows.Count - 1 + + .Rows(i).DefaultCellStyle.BackColor = If(.Rows(i).Cells("Ausweis-Nr").Value = "0", Color.IndianRed, Color.LightBlue) + + + Next + + + End With + + End Sub @@ -1005,6 +1019,7 @@ Public Class usrCntlMitarbeiter dt_Employee.Columns.Add("employeeId", GetType(Integer)) dt_Employee.Columns.Add("Vorname", GetType(String)) dt_Employee.Columns.Add("Nachname", GetType(String)) + dt_Employee.Columns.Add("Ausweis-Nr", GetType(Integer)) Dim dt_result As New DataTable @@ -1022,6 +1037,7 @@ Public Class usrCntlMitarbeiter ROW("employeeId") = r.Cells("Id").Value ROW("Vorname") = r.Cells("Vorname").Value ROW("Nachname") = r.Cells("Nachname").Value + ROW("Ausweis-Nr") = r.Cells("Ausweis-Nr").Value dt_Employee.Rows.Add(ROW) Next @@ -1053,7 +1069,7 @@ Public Class usrCntlMitarbeiter Else dt_result_temp = dt_result.Select("multiplier = '-'", "date").CopyToDataTable - Info = "falsch ausbezahlte Überstunden (ÜS sind negativ -> Erhöhen den Saldo)" + Info = "falsch ausbezahlte Überstunden (ÜS sind negativ -> Erhöhen den Saldo); Ausweis-Nr = 0 -> Mitarbeiter archiviert" End If If dt_result_temp.Rows.Count = 0 Then @@ -1063,7 +1079,7 @@ Public Class usrCntlMitarbeiter Dim query = From fa In dt_result_temp.AsEnumerable() Join emp In dt_Employee.AsEnumerable() On fa.Field(Of Integer)("employeeId") Equals emp.Field(Of Integer)("employeeId") - Select result = fa.ItemArray.Concat({emp.Field(Of String)("Vorname"), emp.Field(Of String)("Nachname")}).ToArray() + Select result = fa.ItemArray.Concat({emp.Field(Of String)("Vorname"), emp.Field(Of String)("Nachname"), emp.Field(Of Integer)("Ausweis-Nr")}).ToArray() ' Neue Tabelle erstellen (Struktur erweitern) Dim dt_merged As New DataTable @@ -1075,10 +1091,11 @@ Public Class usrCntlMitarbeiter ' Neue Spalten hinzufügen dt_merged.Columns.Add("Vorname", GetType(String)) - dt_merged.Columns.Add("Nachname", GetType(String)) + dt_merged.Columns.Add("Nachname", GetType(String)) + dt_merged.Columns.Add("Ausweis-Nr", GetType(Integer)) - ' Daten einfügen - For Each row In query + ' Daten einfügen + For Each row In query dt_merged.Rows.Add(row) Next diff --git a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb index 42ade2b..c5452ab 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 @@ -599,7 +600,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers 'File in Datenarchiv sichern: '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! + '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änzen! 'd.breimaier: 2025-09-15 laut Christian Schuster erhalten wir nun die Rechnungen mit folgenden Aufbau: '• fixwert invoice @@ -629,11 +630,11 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers 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 + 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 If fi.Name.ToString.StartsWith("invoice_") Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath)) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath)) 'RMC Eigenrechnungen DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True) @@ -643,7 +644,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name) dgvEinarbeitung.Refresh() found = True - ElseIf (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'EasyTrip IT Rechnungen + ElseIf (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'EasyTrip Italy Rechnungen Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath)) @@ -723,28 +724,15 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers End If - 'copy file to lydia - nicht mehr notwendig!!! - 'If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - ' Dim filepathToLydia = IIf(rmc.PDFRECHNUNGEN <> "", rmc.PDFRECHNUNGEN, "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\") - ' If fileNamePath.ToString.ToLower.Contains("nto") Then - ' frmStartOptions.copyFile(fileNamePath, filepathToLydia & "NETTO\") - ' Else - ' frmStartOptions.copyFile(fileNamePath, filepathToLydia & "BRUTTO\") - ' End If - 'End If - - - End If Case 3 - If (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso fi.Name.ToString.Contains("ALL")) Then + + If (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso fi.Name.ToString.Contains("ALL")) Then 'bekommen wir diese PDFS noch?? Dim fileNamePath As String = d - - Dim fileNameEasyTrip As String = fi.Name fileNameEasyTrip = fileNameEasyTrip.Replace("maut_", "") @@ -773,6 +761,41 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name) dgvEinarbeitung.Refresh() found = True + + ElseIf (fi.Name.ToString.StartsWith("mauteets_")) Then + + Dim fileNamePath As String = d + Dim fileNameMauteets As String = fi.Name + fileNameMauteets = fileNameMauteets.Replace("mauteets_", "") + + Dim kdNr As String = fileNameMauteets.Substring(0, 5) + Dim mautteetsDate As String = "" + Dim mauteetsCountry As String = "" + + '22424_302753_20260808_IT_orig_bto.pdf + + mautteetsDate = fileNameMauteets.Substring(13, 8) + mauteetsCountry = fileNameMauteets.Substring(23, 2) + + Dim parsedDate As DateTime = DateTime.ParseExact(fileNameMauteets, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture) + + Dim isBTO As Boolean = False + If fileNameMauteets.ToString.ToLower.Contains("bto") Then + isBTO = True + End If + + + + Dim RMC As New cRMC(kdNr, parsedDate.ToString("dd.MM.yyyy"), mauteetsCountry, isBTO) + If RMC.hasEntry AndAlso RMC.rmc_daId_InvAtt Is Nothing Then + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_ATT", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath)) + DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True) + RMC.rmc_daId_InvAtt = DS.da_id + RMC.SAVE() + End If + + End If @@ -1441,6 +1464,12 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers RMC.rmc_betragMWST = SQL.isleernothing(currentRow(10)) RMC.rmc_betragBrutto = SQL.isleernothing(currentRow(11)) + If fileType = "brutto" Then + RMC.rmc_isBTO = True + Else + RMC.rmc_isBTO = False + End If + Dim waherung = SQL.isleernothing(currentRow(12)) If waherung IsNot Nothing Then RMC.rmc_waehrung = IIf(waherung.ToString.Length > 3, waherung.ToString.Substring(0, 3), waherung) diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index a5d89d1..63b7ab1 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -83,6 +83,9 @@ Partial Class frmStartOptions Me.Label13 = New System.Windows.Forms.Label() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.ll_MIC_Einarbeitung_TEST = New System.Windows.Forms.LinkLabel() + Me.ll_MIC_Einarbeitung_PROD = New System.Windows.Forms.LinkLabel() + Me.Label67 = New System.Windows.Forms.Label() Me.cbxGESTELLUNG_TESTLAUF = New System.Windows.Forms.CheckBox() Me.cbxVW_Infomail = New System.Windows.Forms.CheckBox() Me.LinkLabel68 = New System.Windows.Forms.LinkLabel() @@ -412,9 +415,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.Label67 = New System.Windows.Forms.Label() - Me.ll_MIC_Einarbeitung_TEST = New System.Windows.Forms.LinkLabel() - Me.ll_MIC_Einarbeitung_PROD = New System.Windows.Forms.LinkLabel() + Me.Button36 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.pbEmailscheck, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit() @@ -474,6 +475,7 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button36) Me.pnl.Controls.Add(Me.Button35) Me.pnl.Controls.Add(Me.Button33) Me.pnl.Controls.Add(Me.LinkLabel54) @@ -570,11 +572,11 @@ Partial Class frmStartOptions Me.Button35.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button35.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button35.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button35.Location = New System.Drawing.Point(996, 312) + Me.Button35.Location = New System.Drawing.Point(1036, 207) Me.Button35.Name = "Button35" - Me.Button35.Size = New System.Drawing.Size(103, 40) + Me.Button35.Size = New System.Drawing.Size(185, 40) Me.Button35.TabIndex = 152 - Me.Button35.Text = "check Sped-Einrtäge" + Me.Button35.Text = "Sped-Einträge prüfen (grünes S)" Me.Button35.UseVisualStyleBackColor = True ' 'Button33 @@ -582,12 +584,13 @@ Partial Class frmStartOptions Me.Button33.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button33.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button33.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button33.Location = New System.Drawing.Point(1126, 155) + Me.Button33.Location = New System.Drawing.Point(1118, 120) Me.Button33.Name = "Button33" - Me.Button33.Size = New System.Drawing.Size(90, 40) + Me.Button33.Size = New System.Drawing.Size(105, 40) Me.Button33.TabIndex = 151 Me.Button33.Text = "EB-Highway" Me.Button33.UseVisualStyleBackColor = True + Me.Button33.Visible = False ' 'LinkLabel54 ' @@ -605,9 +608,9 @@ Partial Class frmStartOptions Me.Button32.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button32.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button32.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button32.Location = New System.Drawing.Point(996, 269) + Me.Button32.Location = New System.Drawing.Point(1118, 162) Me.Button32.Name = "Button32" - Me.Button32.Size = New System.Drawing.Size(103, 40) + Me.Button32.Size = New System.Drawing.Size(105, 40) Me.Button32.TabIndex = 148 Me.Button32.Text = "ZuGFerD-Check" Me.Button32.UseVisualStyleBackColor = True @@ -663,12 +666,13 @@ Partial Class frmStartOptions Me.Button30.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button30.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button30.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button30.Location = New System.Drawing.Point(1014, 147) + Me.Button30.Location = New System.Drawing.Point(1118, 55) Me.Button30.Name = "Button30" Me.Button30.Size = New System.Drawing.Size(105, 59) Me.Button30.TabIndex = 143 Me.Button30.Text = "Preislisten - Übersetzungen einfügen" Me.Button30.UseVisualStyleBackColor = True + Me.Button30.Visible = False ' 'pbEmailscheck ' @@ -1279,6 +1283,38 @@ Partial Class frmStartOptions Me.TabPage1.Text = "Zollverfahren" Me.TabPage1.UseVisualStyleBackColor = True ' + 'll_MIC_Einarbeitung_TEST + ' + Me.ll_MIC_Einarbeitung_TEST.AutoSize = True + Me.ll_MIC_Einarbeitung_TEST.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.ll_MIC_Einarbeitung_TEST.Location = New System.Drawing.Point(284, 323) + Me.ll_MIC_Einarbeitung_TEST.Name = "ll_MIC_Einarbeitung_TEST" + Me.ll_MIC_Einarbeitung_TEST.Size = New System.Drawing.Size(177, 13) + Me.ll_MIC_Einarbeitung_TEST.TabIndex = 155 + Me.ll_MIC_Einarbeitung_TEST.TabStop = True + Me.ll_MIC_Einarbeitung_TEST.Text = "Eingangsnachrichten abrufen TEST" + ' + 'll_MIC_Einarbeitung_PROD + ' + Me.ll_MIC_Einarbeitung_PROD.AutoSize = True + Me.ll_MIC_Einarbeitung_PROD.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.ll_MIC_Einarbeitung_PROD.Location = New System.Drawing.Point(284, 348) + Me.ll_MIC_Einarbeitung_PROD.Name = "ll_MIC_Einarbeitung_PROD" + Me.ll_MIC_Einarbeitung_PROD.Size = New System.Drawing.Size(180, 13) + Me.ll_MIC_Einarbeitung_PROD.TabIndex = 156 + Me.ll_MIC_Einarbeitung_PROD.TabStop = True + Me.ll_MIC_Einarbeitung_PROD.Text = "Eingangsnachrichten abrufen PROD" + ' + 'Label67 + ' + Me.Label67.AutoSize = True + Me.Label67.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label67.Location = New System.Drawing.Point(284, 296) + Me.Label67.Name = "Label67" + Me.Label67.Size = New System.Drawing.Size(177, 13) + Me.Label67.TabIndex = 154 + Me.Label67.Text = "MIC Nachrichtenverarbeitung:" + ' 'cbxGESTELLUNG_TESTLAUF ' Me.cbxGESTELLUNG_TESTLAUF.AutoSize = True @@ -5559,37 +5595,17 @@ Partial Class frmStartOptions Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' - 'Label67 + 'Button36 ' - Me.Label67.AutoSize = True - Me.Label67.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label67.Location = New System.Drawing.Point(284, 296) - Me.Label67.Name = "Label67" - Me.Label67.Size = New System.Drawing.Size(177, 13) - Me.Label67.TabIndex = 154 - Me.Label67.Text = "MIC Nachrichtenverarbeitung:" - ' - 'll_MIC_Einarbeitung_TEST - ' - Me.ll_MIC_Einarbeitung_TEST.AutoSize = True - Me.ll_MIC_Einarbeitung_TEST.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.ll_MIC_Einarbeitung_TEST.Location = New System.Drawing.Point(284, 323) - Me.ll_MIC_Einarbeitung_TEST.Name = "ll_MIC_Einarbeitung_TEST" - Me.ll_MIC_Einarbeitung_TEST.Size = New System.Drawing.Size(177, 13) - Me.ll_MIC_Einarbeitung_TEST.TabIndex = 155 - Me.ll_MIC_Einarbeitung_TEST.TabStop = True - Me.ll_MIC_Einarbeitung_TEST.Text = "Eingangsnachrichten abrufen TEST" - ' - 'll_MIC_Einarbeitung_PROD - ' - Me.ll_MIC_Einarbeitung_PROD.AutoSize = True - Me.ll_MIC_Einarbeitung_PROD.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.ll_MIC_Einarbeitung_PROD.Location = New System.Drawing.Point(284, 348) - Me.ll_MIC_Einarbeitung_PROD.Name = "ll_MIC_Einarbeitung_PROD" - Me.ll_MIC_Einarbeitung_PROD.Size = New System.Drawing.Size(180, 13) - Me.ll_MIC_Einarbeitung_PROD.TabIndex = 156 - Me.ll_MIC_Einarbeitung_PROD.TabStop = True - Me.ll_MIC_Einarbeitung_PROD.Text = "Eingangsnachrichten abrufen PROD" + Me.Button36.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button36.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button36.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button36.Location = New System.Drawing.Point(1118, 253) + Me.Button36.Name = "Button36" + Me.Button36.Size = New System.Drawing.Size(103, 40) + Me.Button36.TabIndex = 153 + Me.Button36.Text = "QS-Mitarbeiter in SPED-BUCH" + Me.Button36.UseVisualStyleBackColor = True ' 'frmStartOptions ' @@ -6068,4 +6084,5 @@ Partial Class frmStartOptions Friend WithEvents ll_MIC_Einarbeitung_TEST As LinkLabel Friend WithEvents ll_MIC_Einarbeitung_PROD As LinkLabel Friend WithEvents Label67 As Label + Friend WithEvents Button36 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 035e3eb..feb2890 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -236,6 +236,102 @@ +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 @@ -596,102 +692,6 @@ +z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj - YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV - BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/ - FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy - Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf - 6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu - Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR - 2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd - j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM - 1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl - WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc - qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P - LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7 - GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F - g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY - BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw - cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q - +z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu - RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK - SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj - YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV - BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/ - FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy - Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf - 6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu - Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR - 2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd - j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM - 1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl - WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc - qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P - LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7 - GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F - g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY - BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw - cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q - +z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu - RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK - SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj - YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV - BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/ - FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy - Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf - 6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu - Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR - 2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd - j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM - 1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl - WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc - qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P - LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7 - GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F - g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY - BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw - cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q - +z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu - RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK - SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj - YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV - BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/ - FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy - Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf - 6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu - Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR - 2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd - j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM - 1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl - WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc - qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P - LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7 - GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F - g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY - BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw - cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q - +z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu - RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK - SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 555ce48..60ba586 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 iTextSharp.text Imports javax Imports MDM_Worker @@ -8203,12 +8204,13 @@ repeatRequest: 'aktuell verwendet Verag360 kein Zugferd und Sammelrechnung 6 geht aktuell noch nicht - 29.04.2026 Start der neuen Funktion! Dim DateString = "and CONVERT(DATE, GETDATE())" - + Dim top As String = "" If InvoicesUntilYesterday Then + top = " top(1000) " DateString = "CONVERT(DATE, DATEADD(DAY, -1, GETDATE()))" End If - Dim dt As DataTable = SQL.loadDgvBySql("SELECT RK_ID, dsId, Firma_ID, RechnungsNr FROM [Rechnungsausgang] where [zugferdcheck_daid] is null and [zugferdcheck_datetime] is null and dsId is not null and cast(RechnungsDatum as Date) between '29.04.2026' and " & DateString & " and Sammelrechnung <> 6 and Firma_ID <> 19 ", "FMZOLL", 100, False) + Dim dt As DataTable = SQL.loadDgvBySql("SELECT " & top & " RK_ID, dsId, Firma_ID, RechnungsNr FROM [Rechnungsausgang] where [zugferdcheck_daid] is null and [zugferdcheck_datetime] is null and dsId is not null and cast(RechnungsDatum as Date) between '29.04.2026' and " & DateString & " and Sammelrechnung <> 6 and Firma_ID <> 19 order by ReErfZeitstempel desc", "FMZOLL", 100, False) Dim sumTotal_IMEX As Integer = 0 Dim sumTotal_VERAG As Integer = 0 @@ -8273,12 +8275,21 @@ repeatRequest: Dim psi As New ProcessStartInfo() - psi.FileName = fileName - psi.Arguments = arguments & Path - 'Workstation Daniel - 'psi.FileName = "C:\Program Files\Eclipse Adoptium\jre-11.0.28.6-hotspot\bin\java.exe" - 'psi.Arguments = "-jar ""C:\Users\d.breimaier\Downloads\Mustang-CLI-2.21.0.jar"" --no-notices --action validate --source " & Path & "" + If Environment.MachineName = "H6CCWP3" Then + 'Workstation Daniel + psi.FileName = "C:\Program Files\Eclipse Adoptium\jre-11.0.32.101-hotspot\bin\java.exe" + psi.Arguments = "-jar ""C:\Users\d.breimaier\Downloads\Mustang-CLI-2.21.0.jar"" --no-notices --action validate --source " & Path + + Else + psi.FileName = fileName + psi.Arguments = arguments & Path + End If + + + + + psi.RedirectStandardOutput = True psi.RedirectStandardError = True @@ -8392,7 +8403,7 @@ repeatRequest: If dt.Rows.Count > 0 Then If Not sendNotificationEmails Then - 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, True,,, True) + If Environment.MachineName = "H6CCWP3" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, True,,, True) Else @@ -8497,7 +8508,7 @@ repeatRequest: Private Function createMailTextZugferd(total As Integer, valid As Integer, invalid As Integer, Firma As String) As String - Dim MailText = "Auflistung der gültigen/ungültigen ZUGFeRD-Prüfungen vom " & Today.AddDays(-1).ToShortDateString & " für " & Firma & "

" + Dim MailText = "Auflistung der gültigen/ungültigen ZUGFeRD-Prüfungen vom " & Today.ToShortDateString & " für " & Firma & "

" MailText &= "" MailText &= "" MailText &= "" @@ -8655,9 +8666,9 @@ repeatRequest: bestellung.eb_gesendetVon = "AUTO" If IsDBNull(bestellung.eb_gesendetFirst_am) Then bestellung.eb_gesendetFirst_am = Now() bestellung.SAVE() - End If - End If + + End If Next @@ -9016,5 +9027,57 @@ repeatRequest: Dim f As New frmMICNachrichtenVerarbeitung f.ShowDialog() Me.Visible = True + End Sub + + Private Sub Button36_Click(sender As Object, e As EventArgs) Handles Button36.Click + + + + Dim input = InputBox("Bitte geben Sie die FilialNr für die zu prüfenden SPED-Einträge an:", "FilialNr angeben") + If input <> "" AndAlso IsNumeric(input) AndAlso input.Length = 4 Then + + Else + Exit Sub + + End If + + + Dim sqlString = "SELECT count(*) FROM Speditionsbuch AS sb INNER JOIN [AVISO].dbo.tblSendungen AS s ON s.tblSnd_SendungID = sb.SendungID WHERE sb.PersonalnummerQS IS NULL AND s.tblSnd_QS_MA IS NOT NULL AND YEAR(sb.Abfertigungsdatum) = Year(GETDATE()) AND sb.FilialenNr = " & input + + + Dim MissingEntries As Integer = CInt((New SQL).getValueTxtBySql(sqlString, "FMZOLL",,, "0")) + + If MissingEntries > 0 Then + + + If Not vbYes = MsgBox("Aktuell ist in " & MissingEntries & " Speditionsbucheinträgen des aktuellen Jahres der QS-Sachbearbeiter nicht gesetzt." & vbNewLine & "Sollen diese nachträglich vervollständigt werden?", vbYesNoCancel) Then + Me.Visible = True + Exit Sub + + Else + + Dim SQLStringUpdate = " UPDATE sb SET sb.PersonalnummerQS = s.tblSnd_QS_MA FROM Speditionsbuch AS sb INNER JOIN [AVISO].dbo.tblSendungen AS s ON s.tblSnd_SendungID = sb.SendungID WHERE sb.PersonalnummerQS IS NULL AND s.tblSnd_QS_MA IS NOT NULL AND YEAR(sb.Abfertigungsdatum) = Year(GETDATE()) AND sb.FilialenNr = " & input + + Dim result = (New SQL).doSQL(SQLStringUpdate, "FMZOLL") + + If result Then + + Else + + End If + + + + End If + + Else + + MsgBox("keine fehlenden Einträge für FilialenNr " & input & " gefunden") + + End If + + + + End Sub End Class
GültigUngültigGesamt