edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
d.breimaier
2026-10-06 15:22:56 +02:00
parent a1c4ea449b
commit 2d2d855eac
1 changed files with 179 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -8196,6 +8196,7 @@ repeatRequest:
Private Function checkZugferd(sendNotificationEmails As Boolean, Optional InvoicesUntilYesterday As Boolean = False) As Boolean Private Function checkZugferd(sendNotificationEmails As Boolean, Optional InvoicesUntilYesterday As Boolean = False) As Boolean
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
@@ -8206,11 +8207,11 @@ repeatRequest:
Dim DateString = " CONVERT(DATE, GETDATE())" Dim DateString = " CONVERT(DATE, GETDATE())"
Dim top As String = "" Dim top As String = ""
If InvoicesUntilYesterday Then If InvoicesUntilYesterday Then
top = " top(1000) " top = " top(500) "
DateString = "CONVERT(DATE, DATEADD(DAY, -1, GETDATE()))" DateString = "CONVERT(DATE, DATEADD(DAY, -1, GETDATE()))"
End If End If
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, True) 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", 1000, True)
Dim sumTotal_IMEX As Integer = 0 Dim sumTotal_IMEX As Integer = 0
Dim sumTotal_VERAG As Integer = 0 Dim sumTotal_VERAG As Integer = 0
@@ -8252,6 +8253,7 @@ repeatRequest:
Dim fileName = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_JAVA") Dim fileName = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_JAVA")
Dim arguments = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_CMD") Dim arguments = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_CMD")
Dim errorCounter = 0
For Each row In dt.Rows For Each row In dt.Rows
@@ -8263,9 +8265,7 @@ repeatRequest:
Dim rkId As Integer Dim rkId As Integer
Dim dsId As Integer Dim dsId As Integer
If Integer.TryParse(rkObj.ToString(), rkId) AndAlso If Integer.TryParse(rkObj.ToString(), rkId) AndAlso Integer.TryParse(dsObj.ToString(), dsId) AndAlso dsId > 0 Then
Integer.TryParse(dsObj.ToString(), dsId) AndAlso
dsId > 0 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsId) Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsId)
Dim Path As String = DS.GET_TOP1_PATH() Dim Path As String = DS.GET_TOP1_PATH()
@@ -8276,15 +8276,15 @@ repeatRequest:
Dim psi As New ProcessStartInfo() Dim psi As New ProcessStartInfo()
If Environment.MachineName = "H6CCWP3" Then 'If Environment.MachineName = "H6CCWP3" Then
'Workstation Daniel ' 'Workstation Daniel
psi.FileName = "C:\Program Files\Eclipse Adoptium\jre-11.0.32.101-hotspot\bin\java.exe" ' 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 ' psi.Arguments = "-jar ""C:\Users\d.breimaier\Downloads\Mustang-CLI-2.21.0.jar"" --no-notices --action validate --source " & Path
Else 'Else
psi.FileName = fileName psi.FileName = fileName
psi.Arguments = arguments & Path psi.Arguments = arguments & Path
End If 'End If
psi.RedirectStandardOutput = True psi.RedirectStandardOutput = True
psi.RedirectStandardError = True psi.RedirectStandardError = True
@@ -8320,7 +8320,6 @@ repeatRequest:
Dim err = errorTask.Result Dim err = errorTask.Result
'MsgBox("STDOUT:" & output) 'MsgBox("STDOUT:" & output)
'MsgBox("STDERR:" & err) 'MsgBox("STDERR:" & err)
@@ -8405,14 +8404,25 @@ repeatRequest:
End Select End Select
End If End If
Else
errorCounter += 1
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(err, err & vbNewLine & "Maschine: " & Environment.MachineName, System.Reflection.MethodInfo.GetCurrentMethod.Name, ERROR_OP.MAIL)
If errorCounter >= 5 Then
Return False
End If
End If End If
End Using End Using
Catch ex As Exception Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, ERROR_OP.MAIL)
Return False Continue For
End Try End Try
End If End If
@@ -8441,7 +8451,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtVerag,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtVerag,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " VERAG", createMailTextZugferd(sumTotal_VERAG, sumvalid_VERAG, sumInvalid_VERAG, "VERAG"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " VERAG", createMailTextZugferd(sumTotal_VERAG, sumvalid_VERAG, sumInvalid_VERAG, "VERAG", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8451,7 +8461,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtIMEX,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtIMEX,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " IMEX", createMailTextZugferd(sumTotal_IMEX, sumvalid_IMEX, sumInvalid_IMEX, "IMEX"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " IMEX", createMailTextZugferd(sumTotal_IMEX, sumvalid_IMEX, sumInvalid_IMEX, "IMEX", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8461,7 +8471,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtAMBAR,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtAMBAR,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " AMBAR", createMailTextZugferd(sumTotal_AMBAR, sumvalid_AMBAR, sumInvalid_AMBAR, "AMBAR"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " AMBAR", createMailTextZugferd(sumTotal_AMBAR, sumvalid_AMBAR, sumInvalid_AMBAR, "AMBAR", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8471,7 +8481,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtUNISPED,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtUNISPED,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " UNISPED", createMailTextZugferd(sumTotal_US, sumvalid_US, sumInvalid_US, "UNISPED"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " UNISPED", createMailTextZugferd(sumTotal_US, sumvalid_US, sumInvalid_US, "UNISPED", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8481,7 +8491,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtATILLA,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtATILLA,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " ATILLA", createMailTextZugferd(sumTotal_ATILLA, sumvalid_ATILLA, sumInvalid_ATILLA, "ATILLA"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " ATILLA", createMailTextZugferd(sumTotal_ATILLA, sumvalid_ATILLA, sumInvalid_ATILLA, "ATILLA", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8491,7 +8501,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt360,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt360,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " VERAG 360", createMailTextZugferd(sumTotal_360, sumvalid_360, sumInvalid_360, "VERAG 360"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " VERAG 360", createMailTextZugferd(sumTotal_360, sumvalid_360, sumInvalid_360, "VERAG 360", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8501,7 +8511,7 @@ repeatRequest:
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtCS,,,,, False,,, True) Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtCS,,,,, False,,, True)
Dim anhenge As New List(Of String) Dim anhenge As New List(Of String)
anhenge.Add(path) anhenge.Add(path)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & "VERAG CS", createMailTextZugferd(sumTotal_CS, sumvalid_CS, sumInvalid_CS, "VERAG CS"), getAbsenderEmail(), True, False,,, anhenge) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfaneger, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & "VERAG CS", createMailTextZugferd(sumTotal_CS, sumvalid_CS, sumInvalid_CS, "VERAG CS", dt.Rows.Count), getAbsenderEmail(), True, False,,, anhenge)
End If End If
End If End If
@@ -8515,7 +8525,7 @@ repeatRequest:
sumInvalid_Total = sumInvalid_VERAG + sumInvalid_ATILLA + sumInvalid_AMBAR + sumInvalid_360 + sumInvalid_CS + sumInvalid_IMEX + sumInvalid_US sumInvalid_Total = sumInvalid_VERAG + sumInvalid_ATILLA + sumInvalid_AMBAR + sumInvalid_360 + sumInvalid_CS + sumInvalid_IMEX + sumInvalid_US
sumvalid_Total = sumvalid_VERAG + sumvalid_ATILLA + sumvalid_AMBAR + sumvalid_360 + sumvalid_CS + sumvalid_IMEX + sumvalid_US sumvalid_Total = sumvalid_VERAG + sumvalid_ATILLA + sumvalid_AMBAR + sumvalid_360 + sumvalid_CS + sumvalid_IMEX + sumvalid_US
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerALL, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " ALL", createMailTextZugferd(sumTotal_Total, sumvalid_Total, sumInvalid_Total, "ALL"), getAbsenderEmail(), True, False) VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerALL, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & Betreff & " ALL", createMailTextZugferd(sumTotal_Total, sumvalid_Total, sumInvalid_Total, "ALL", dt.Rows.Count), getAbsenderEmail(), True, False)
End If End If
End If End If
@@ -8523,6 +8533,9 @@ repeatRequest:
End If End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, ERROR_OP.MAIL)
End Try
Return True Return True
@@ -8530,7 +8543,7 @@ repeatRequest:
End Function End Function
Private Function createMailTextZugferd(total As Integer, valid As Integer, invalid As Integer, Firma As String) As String Private Function createMailTextZugferd(total As Integer, valid As Integer, invalid As Integer, Firma As String, AnzahlLautListe As Integer) As String
Dim MailText = "Auflistung der gültigen/ungültigen ZUGFeRD-Prüfungen vom " & Today.ToShortDateString & " für " & Firma & " <br><br>" Dim MailText = "Auflistung der gültigen/ungültigen ZUGFeRD-Prüfungen vom " & Today.ToShortDateString & " für " & Firma & " <br><br>"
MailText &= "<table border=1>" MailText &= "<table border=1>"
@@ -8541,6 +8554,11 @@ repeatRequest:
MailText &= "<td><b>" & total & "</b></td>" MailText &= "<td><b>" & total & "</b></td>"
MailText &= "</tr>" MailText &= "</tr>"
MailText &= "</table>" MailText &= "</table>"
If Firma = "ALL" Then
MailText &= "<br><br>Anzahl laut Liste: " & AnzahlLautListe
End If
MailText &= "<br><br>Erstellt am: " & Now.ToShortDateString & " um " & Now.ToShortTimeString MailText &= "<br><br>Erstellt am: " & Now.ToShortDateString & " um " & Now.ToShortTimeString
MailText &= "<br><br>Automatisch generiertes E-Mail." MailText &= "<br><br>Automatisch generiertes E-Mail."
@@ -8559,7 +8577,7 @@ repeatRequest:
End Select End Select
checkZugferd(sendNotificationEmails, True) checkZugferd(sendNotificationEmails, False)
End Sub End Sub
Private Sub LinkLabel54_LinkClicked_2(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel54.LinkClicked Private Sub LinkLabel54_LinkClicked_2(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel54.LinkClicked