Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
@@ -6158,17 +6158,31 @@ weiter:
|
||||
|
||||
Dim fehlendeRechnungen As New DataTable
|
||||
Dim datumString = ""
|
||||
Dim von As Date
|
||||
Dim bis As Date
|
||||
|
||||
If txtUTADate.Text = "" AndAlso txtUTAYear.Text <> "" Then
|
||||
datumString = txtUTAYear.Text
|
||||
fehlendeRechnungen = (New SQL).loadDgvBySql(" SELECT A.AdressenNr, A.[Name 1], U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.LandKz FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer WHERE U.daId IS NULL AND YEAR(U.Rechnungsdatum) = '" & datumString & "' AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY A.AdressenNr, A.[Name 1], U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.LandKz", "FMZOLL")
|
||||
'fehlendeRechnungen = (New SQL).loadDgvBySql(" SELECT A.AdressenNr, A.[Name 1], U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.LandKz FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer WHERE U.daId IS NULL AND YEAR(U.Rechnungsdatum) = '" & datumString & "' AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY A.AdressenNr, A.[Name 1], U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.LandKz", "FMZOLL")
|
||||
|
||||
von = New Date(datumString, 1, 1)
|
||||
bis = New Date(datumString, 12, 31)
|
||||
|
||||
ElseIf txtUTADate.Text <> "" AndAlso IsDate(txtUTADate.Text) Then
|
||||
datumString = txtUTADate.Text
|
||||
fehlendeRechnungen = (New SQL).loadDgvBySql("SELECT A.AdressenNr, A.[Name 1], U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.LandKz FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer WHERE U.daId IS NULL AND CAST(U.Rechnungsdatum AS date) = '" & datumString & "' AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY A.AdressenNr, A.[Name 1], U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.LandKz", "FMZOLL")
|
||||
'fehlendeRechnungen = (New SQL).loadDgvBySql("SELECT A.AdressenNr, A.[Name 1], U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.LandKz FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer WHERE U.daId IS NULL AND CAST(U.Rechnungsdatum AS date) = '" & datumString & "' AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY A.AdressenNr, A.[Name 1], U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.LandKz", "FMZOLL")
|
||||
von = New Date(datumString)
|
||||
bis = New Date(datumString)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
Dim uta As New cUTA
|
||||
uta.checkPDFInvoices(von, bis, ,,, True, fehlendeRechnungen)
|
||||
|
||||
|
||||
|
||||
If fehlendeRechnungen.Rows.Count > 0 Then
|
||||
|
||||
If vbYes = MsgBox("Details der " & fehlendeRechnungen.Rows.Count & " fehlenden Rechnungszuweisungen anzeigen?", vbYesNo) Then
|
||||
@@ -6388,21 +6402,31 @@ weiter:
|
||||
|
||||
Dim datumString = ""
|
||||
Dim SQLWhere As String = ""
|
||||
|
||||
Dim von As Date
|
||||
Dim bis As Date
|
||||
If txtUTADate.Text = "" AndAlso txtUTAYear.Text <> "" Then
|
||||
datumString = txtUTAYear.Text
|
||||
SQLWhere = "And YEAR(U.Rechnungsdatum) = '" & datumString & "'"
|
||||
von = New Date("01.01." & txtUTAYear.Text)
|
||||
bis = New Date("31.12." & txtUTAYear.Text)
|
||||
ElseIf txtUTADate.Text <> "" AndAlso IsDate(txtUTADate.Text) Then
|
||||
datumString = txtUTADate.Text
|
||||
SQLWhere = "And CAST(U.Rechnungsdatum AS date) = '" & datumString & "'"
|
||||
von = New Date(datumString)
|
||||
bis = New Date(datumString)
|
||||
End If
|
||||
|
||||
|
||||
Dim uta As New cUTA
|
||||
Dim dtRechnnungsdaten As New DataTable
|
||||
|
||||
Dim fehlendePDFzuRE As String = " SELECT U.Abrechnungsnummer AS Abrechnungsnummer,U.Kundennummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.LandKz FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer WHERE U.daId IS NULL " & SQLWhere & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Kundennummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.LandKz "
|
||||
uta.checkPDFInvoices(von, bis, ,,, True, dtRechnnungsdaten)
|
||||
|
||||
|
||||
'Dim fehlendePDFzuRE As String = " SELECT U.Abrechnungsnummer AS Abrechnungsnummer,U.Kundennummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.LandKz FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer WHERE U.daId IS NULL " & SQLWhere & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Kundennummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.LandKz "
|
||||
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim dtRechnnungsdaten As DataTable = SQL.loadDgvBySql(fehlendePDFzuRE, "FMZOLL")
|
||||
'Dim dtRechnnungsdaten As DataTable = SQL.loadDgvBySql(fehlendePDFzuRE, "FMZOLL")
|
||||
|
||||
|
||||
Dim counter As Integer = 0
|
||||
@@ -6419,12 +6443,12 @@ weiter:
|
||||
|
||||
|
||||
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= 'UTA' AND da_uOrdner2= '" & utaYear & "' AND da_name like '%ZUGFERD.pdf' AND da_name like '%" & r.Item("Kundennummer") & "_" & r.Item("Abrechnungsnummer") & "_" & r.Item("Rechnungsnummer_pro_Lieferland") & "%'", "FMZOLL",,, 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= 'UTA' AND da_uOrdner2= '" & utaYear & "' AND da_name like '%ZUGFERD.pdf' AND da_name like '%" & r.Item("UTAKundenNr") & "_" & r.Item("Abrechnungsnummer") & "_" & r.Item("Rechnungsnummer_pro_Lieferland") & "%'", "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 [tblUTAImportNew] SET [daId]='" & DS.da_id & "', daIdgesetztDatum = getdate() where [Rechnungsnummer_pro_Lieferland] = '" & r.Item("Rechnungsnummer_pro_Lieferland") & "' AND cast(Rechnungsdatum as Date) = '" & utaDate & "' AND Kundennummer =" & r.Item("Kundennummer") & " and Abrechnungsnummer =" & r.Item("Abrechnungsnummer") & " and daId is null", "FMZOLL")
|
||||
SQL.doSQL("Update [tblUTAImportNew] SET [daId]='" & DS.da_id & "', daIdgesetztDatum = getdate() where [Rechnungsnummer_pro_Lieferland] = '" & r.Item("Rechnungsnummer_pro_Lieferland") & "' AND cast(Rechnungsdatum as Date) = '" & utaDate & "' AND Kundennummer =" & r.Item("UTAKundenNr") & " and Abrechnungsnummer =" & r.Item("Abrechnungsnummer") & " and daId is null", "FMZOLL")
|
||||
counter += 1
|
||||
End If
|
||||
End If
|
||||
@@ -6599,6 +6623,10 @@ weiter:
|
||||
|
||||
MsgBox(counter & " von " & dtRechnnungsdaten.Rows.Count & " IDS- Rechnungsdaten gesetzt!")
|
||||
|
||||
|
||||
Else
|
||||
MsgBox("keine fehlenden Rechnungen vorhanden!")
|
||||
|
||||
End If
|
||||
|
||||
|
||||
@@ -8196,21 +8224,22 @@ repeatRequest:
|
||||
|
||||
|
||||
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
|
||||
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
'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()))"
|
||||
Dim DateString = " CONVERT(DATE, GETDATE())"
|
||||
Dim top As String = ""
|
||||
If InvoicesUntilYesterday Then
|
||||
top = " top(2500) "
|
||||
DateString = "CONVERT(DATE, DATEADD(DAY, -1, GETDATE()))"
|
||||
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, 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", 1000, True)
|
||||
|
||||
Dim sumTotal_IMEX As Integer = 0
|
||||
Dim sumTotal_VERAG As Integer = 0
|
||||
@@ -8252,155 +8281,190 @@ repeatRequest:
|
||||
Dim fileName = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_JAVA")
|
||||
Dim arguments = Paramslist.GET_PARAMETER_VALUE("ZUGFeRD_Check_Pfad_CMD")
|
||||
|
||||
Dim errorCounter = 0
|
||||
|
||||
For Each row In dt.Rows
|
||||
Dim CounterRows = 0
|
||||
|
||||
Dim rkObj As Object = row("RK_ID")
|
||||
Dim dsObj As Object = row("dsId")
|
||||
|
||||
If rkObj IsNot DBNull.Value AndAlso dsObj IsNot DBNull.Value Then
|
||||
|
||||
Dim rkId As Integer
|
||||
Dim dsId As Integer
|
||||
|
||||
If Integer.TryParse(rkObj.ToString(), rkId) AndAlso
|
||||
Integer.TryParse(dsObj.ToString(), dsId) AndAlso
|
||||
dsId > 0 Then
|
||||
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsId)
|
||||
Dim Path As String = DS.GET_TOP1_PATH()
|
||||
If Path <> "" And System.IO.File.Exists(Path) Then
|
||||
|
||||
Try
|
||||
|
||||
|
||||
Dim psi As New ProcessStartInfo()
|
||||
|
||||
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
|
||||
For Each row In dt.Rows
|
||||
|
||||
|
||||
|
||||
Dim rkObj As Object = row("RK_ID")
|
||||
Dim dsObj As Object = row("dsId")
|
||||
|
||||
If rkObj IsNot DBNull.Value AndAlso dsObj IsNot DBNull.Value Then
|
||||
|
||||
Dim rkId As Integer
|
||||
Dim dsId As Integer
|
||||
|
||||
If Integer.TryParse(rkObj.ToString(), rkId) AndAlso Integer.TryParse(dsObj.ToString(), dsId) AndAlso dsId > 0 Then
|
||||
|
||||
|
||||
Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dsId)
|
||||
|
||||
psi.RedirectStandardOutput = True
|
||||
psi.RedirectStandardError = True
|
||||
psi.UseShellExecute = False
|
||||
psi.CreateNoWindow = True
|
||||
CounterRows += 1
|
||||
|
||||
Using p As Process = Process.Start(psi)
|
||||
Dim output = p.StandardOutput.ReadToEnd()
|
||||
Dim err = p.StandardError.ReadToEnd()
|
||||
p.WaitForExit()
|
||||
If Path <> "" AndAlso System.IO.File.Exists(Path) Then
|
||||
|
||||
If output <> "" Then
|
||||
Dim tmpPath_Report = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("MUSTANG-REPORT_" & rkObj & ".pdf", ".pdf", , False)
|
||||
Dim PruefungOK = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.CreateValidationPdf(output, Path, rkId, tmpPath_Report)
|
||||
If tmpPath_Report <> "" Then
|
||||
'Process.Start(tmpPath_Report)
|
||||
|
||||
Dim fileInfo_ZP As New FileInfo(tmpPath_Report)
|
||||
Dim ZUGF_DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "ZUGFERD", Now().Year, "", "", fileInfo_ZP.Name, -1, False)
|
||||
ZUGF_DS.uploadDataToDATENSERVER(tmpPath_Report, fileInfo_ZP.Name & ".pdf", fileInfo_ZP.Extension,,,, True)
|
||||
SQL.doSQL("Update [Rechnungsausgang] SET zugferdcheck_datetime=getDate(),zugferdcheck = " & IIf(PruefungOK, "1", "0") & ", zugferdcheck_daid = " & ZUGF_DS.da_id & " where RK_ID = " & rkId, "FMZOLL")
|
||||
Try
|
||||
|
||||
|
||||
Select Case row("Firma_ID")
|
||||
Case 11
|
||||
sumTotal_CS += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_CS += 1
|
||||
Else
|
||||
sumInvalid_CS += 1
|
||||
Dim psi As New ProcessStartInfo()
|
||||
|
||||
dtCS.ImportRow(row)
|
||||
End If
|
||||
Case 24
|
||||
sumTotal_AMBAR += 1
|
||||
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
|
||||
|
||||
If PruefungOK Then
|
||||
sumvalid_AMBAR += 1
|
||||
Else
|
||||
sumInvalid_AMBAR += 1
|
||||
dtAMBAR.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 21, 22, 23
|
||||
sumTotal_US += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_US += 1
|
||||
Else
|
||||
sumInvalid_US += 1
|
||||
dtUNISPED.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 20
|
||||
sumTotal_IMEX += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_IMEX += 1
|
||||
Else
|
||||
sumInvalid_IMEX += 1
|
||||
dtIMEX.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 19
|
||||
sumTotal_360 += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_360 += 1
|
||||
Else
|
||||
sumInvalid_360 += 1
|
||||
dt360.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 7
|
||||
sumTotal_ATILLA += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_ATILLA += 1
|
||||
Else
|
||||
sumInvalid_ATILLA += 1
|
||||
dtATILLA.ImportRow(row)
|
||||
End If
|
||||
Case Else
|
||||
sumTotal_VERAG += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_VERAG += 1
|
||||
Else
|
||||
sumInvalid_VERAG += 1
|
||||
dtVerag.ImportRow(row)
|
||||
End If
|
||||
|
||||
|
||||
End Select
|
||||
|
||||
End If
|
||||
Else
|
||||
psi.FileName = fileName
|
||||
psi.Arguments = arguments & Path
|
||||
End If
|
||||
|
||||
|
||||
End Using
|
||||
psi.RedirectStandardOutput = True
|
||||
psi.RedirectStandardError = True
|
||||
psi.UseShellExecute = False
|
||||
psi.CreateNoWindow = True
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
Return False
|
||||
End Try
|
||||
'MsgBox("START Mustang")
|
||||
'MsgBox("Java: " & psi.FileName)
|
||||
'MsgBox("Args: " & psi.Arguments)
|
||||
|
||||
Using p As Process = Process.Start(psi)
|
||||
|
||||
'MsgBox("PROCESS STARTED, PID=" & p.Id)
|
||||
|
||||
Dim outputTask = p.StandardOutput.ReadToEndAsync()
|
||||
Dim errorTask = p.StandardError.ReadToEndAsync()
|
||||
|
||||
'MsgBox("READERS STARTED")
|
||||
|
||||
If Not p.WaitForExit(60000) Then
|
||||
'MsgBox("TIMEOUT")
|
||||
Try
|
||||
p.Kill()
|
||||
Catch
|
||||
End Try
|
||||
|
||||
Throw New TimeoutException("Der Prozess wurde nach 60 Sekunden beendet." & vbNewLine & "Filename: " & psi.FileName & vbNewLine & "Arguments: " & psi.Arguments)
|
||||
|
||||
End If
|
||||
|
||||
Dim output = outputTask.Result
|
||||
Dim err = errorTask.Result
|
||||
|
||||
If output <> "" Then
|
||||
Dim tmpPath_Report = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("MUSTANG-REPORT_" & rkObj & ".pdf", ".pdf", , False)
|
||||
Dim PruefungOK = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.CreateValidationPdf(output, Path, rkId, tmpPath_Report)
|
||||
If tmpPath_Report <> "" Then
|
||||
'Process.Start(tmpPath_Report)
|
||||
|
||||
Dim fileInfo_ZP As New FileInfo(tmpPath_Report)
|
||||
Dim ZUGF_DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "ZUGFERD", Now().Year, "", "", fileInfo_ZP.Name, -1, False)
|
||||
ZUGF_DS.uploadDataToDATENSERVER(tmpPath_Report, fileInfo_ZP.Name & ".pdf", fileInfo_ZP.Extension,,,, True)
|
||||
SQL.doSQL("Update [Rechnungsausgang] SET zugferdcheck_datetime=getDate(),zugferdcheck = " & IIf(PruefungOK, "1", "0") & ", zugferdcheck_daid = " & ZUGF_DS.da_id & " where RK_ID = " & rkId, "FMZOLL")
|
||||
|
||||
|
||||
Select Case row("Firma_ID")
|
||||
Case 11
|
||||
sumTotal_CS += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_CS += 1
|
||||
Else
|
||||
sumInvalid_CS += 1
|
||||
|
||||
dtCS.ImportRow(row)
|
||||
End If
|
||||
Case 24
|
||||
sumTotal_AMBAR += 1
|
||||
|
||||
If PruefungOK Then
|
||||
sumvalid_AMBAR += 1
|
||||
Else
|
||||
sumInvalid_AMBAR += 1
|
||||
dtAMBAR.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 21, 22, 23
|
||||
sumTotal_US += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_US += 1
|
||||
Else
|
||||
sumInvalid_US += 1
|
||||
dtUNISPED.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 20
|
||||
sumTotal_IMEX += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_IMEX += 1
|
||||
Else
|
||||
sumInvalid_IMEX += 1
|
||||
dtIMEX.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 19
|
||||
sumTotal_360 += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_360 += 1
|
||||
Else
|
||||
sumInvalid_360 += 1
|
||||
dt360.ImportRow(row)
|
||||
End If
|
||||
|
||||
Case 7
|
||||
sumTotal_ATILLA += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_ATILLA += 1
|
||||
Else
|
||||
sumInvalid_ATILLA += 1
|
||||
dtATILLA.ImportRow(row)
|
||||
End If
|
||||
Case Else
|
||||
sumTotal_VERAG += 1
|
||||
If PruefungOK Then
|
||||
sumvalid_VERAG += 1
|
||||
Else
|
||||
sumInvalid_VERAG += 1
|
||||
dtVerag.ImportRow(row)
|
||||
End If
|
||||
|
||||
|
||||
End Select
|
||||
|
||||
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 >= 3 Then
|
||||
Return False
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End Using
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, ERROR_OP.MAIL)
|
||||
Continue For
|
||||
End Try
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Next
|
||||
Next
|
||||
|
||||
|
||||
If dt.Rows.Count > 0 Then
|
||||
If dt.Rows.Count > 0 Then
|
||||
|
||||
If Not sendNotificationEmails Then
|
||||
If Environment.MachineName = "H6CCWP3" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, True,,, True)
|
||||
@@ -8417,8 +8481,8 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtVerag,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
If dtIMEX.Rows.Count > 0 Then
|
||||
@@ -8427,8 +8491,8 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtIMEX,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
If dtAMBAR.Rows.Count > 0 Then
|
||||
@@ -8437,8 +8501,8 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtAMBAR,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
If dtUNISPED.Rows.Count > 0 Then
|
||||
@@ -8447,8 +8511,8 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtUNISPED,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
If dtATILLA.Rows.Count > 0 Then
|
||||
@@ -8457,8 +8521,8 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtATILLA,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
If dt360.Rows.Count > 0 Then
|
||||
@@ -8467,8 +8531,8 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt360,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
If dtCS.Rows.Count > 0 Then
|
||||
@@ -8477,28 +8541,31 @@ repeatRequest:
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtCS,,,,, False,,, True)
|
||||
Dim anhenge As New List(Of String)
|
||||
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)
|
||||
End If
|
||||
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
|
||||
|
||||
|
||||
'hier alle Prüfungen
|
||||
'hier alle Prüfungen
|
||||
|
||||
Dim empfanegerALL = cMitarbeiter.GetEMailRecipientForEmailNotification("ZUGFERD-Check_ALL",)
|
||||
If empfanegerALL <> "" Then
|
||||
Dim empfanegerALL = cMitarbeiter.GetEMailRecipientForEmailNotification("ZUGFERD-Check_ALL",)
|
||||
If empfanegerALL <> "" Then
|
||||
|
||||
sumTotal_Total = sumTotal_VERAG + sumTotal_ATILLA + sumTotal_AMBAR + sumTotal_360 + sumTotal_CS + sumTotal_IMEX + sumTotal_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
|
||||
|
||||
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)
|
||||
End If
|
||||
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 & "/" & CounterRows), getAbsenderEmail(), True, False)
|
||||
End If
|
||||
|
||||
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
|
||||
@@ -8506,7 +8573,7 @@ repeatRequest:
|
||||
|
||||
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 String) As String
|
||||
|
||||
Dim MailText = "Auflistung der gültigen/ungültigen ZUGFeRD-Prüfungen vom " & Today.ToShortDateString & " für " & Firma & " <br><br>"
|
||||
MailText &= "<table border=1>"
|
||||
@@ -8517,6 +8584,11 @@ repeatRequest:
|
||||
MailText &= "<td><b>" & total & "</b></td>"
|
||||
MailText &= "</tr>"
|
||||
MailText &= "</table>"
|
||||
|
||||
If Firma = "ALL" Then
|
||||
MailText &= "<br><br>Anzahl laut Liste/davon mit Pfad: " & AnzahlLautListe
|
||||
End If
|
||||
|
||||
MailText &= "<br><br>Erstellt am: " & Now.ToShortDateString & " um " & Now.ToShortTimeString
|
||||
MailText &= "<br><br>Automatisch generiertes E-Mail."
|
||||
|
||||
|
||||
Reference in New Issue
Block a user