Mailsender fix

This commit is contained in:
2025-08-01 08:45:14 +02:00
parent 429958d2d8
commit 773ccd4162

View File

@@ -58,7 +58,7 @@ Module Mail
' PARAM = "NCTSLIST_TOBB" ' PARAM = "NCTSLIST_TOBB"
' PARAM = "NCTSLIST_TOBB" ' PARAM = "NCTSLIST_TOBB"
'------------------------------------------------------------------------------------ '------------------------------------------------------------------------------------
'PARAM = "ZF_QUARTER" 'PARAM = "TETRAPAK"
If PARAM = "" Then If PARAM = "" Then
System.Console.WriteLine("OPTION nicht erkannt!") System.Console.WriteLine("OPTION nicht erkannt!")
@@ -457,7 +457,7 @@ Module Mail
End If End If
Else Else
System.Console.WriteLine("OPTION erkannt: TETRA_PACK _ Erstellt eine monatliche Auswertung der DAKSOY/EZOLL-Abfertigungen für TETRAPAK.") System.Console.WriteLine("OPTION erkannt: TETRA_PAK _ Erstellt eine monatliche Auswertung der DAKSOY/EZOLL-Abfertigungen für TETRAPAK.")
System.Console.WriteLine("Auswertung Details gestartet...") System.Console.WriteLine("Auswertung Details gestartet...")
If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com", von, bis, "AT") Then If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com", von, bis, "AT") Then
@@ -1734,6 +1734,8 @@ Module Mail
Subject = "Import Customs Statistics " & Report & " " & von & "-" & bis Subject = "Import Customs Statistics " & Report & " " & von & "-" & bis
Else Else
Subject = Subject.Replace("%report%", Report) Subject = Subject.Replace("%report%", Report)
Subject = Subject.Replace("%von%", von)
Subject = Subject.Replace("%bis%", bis)
Subject = replaceBodyVariable(Subject) Subject = replaceBodyVariable(Subject)
End If End If
@@ -2982,8 +2984,8 @@ Module Mail
Dim dt As DataTable = loadDgvBySqlFMZOLL(sqlstr) Dim dt As DataTable = loadDgvBySqlFMZOLL(sqlstr)
System.Console.WriteLine("Vorhandene Datensätze: " & dt.Rows.Count) System.Console.WriteLine("Vorhandene Datensätze: " & dt.Rows.Count)
Dim excelBez = "TETRAPACK_DE_" & von.ToShortDateString.Replace(".", "-") & "_to_ " & bis.ToShortDateString.Replace(".", "-") Dim excelBez = "TETRAPAK_DE_" & von.ToShortDateString.Replace(".", "-") & "_to_ " & bis.ToShortDateString.Replace(".", "-")
genExcel(dt, excelBez, "TETRAPACK") genExcel(dt, excelBez, "TETRAPAK")
Return sPath & excelBez & ".xlsx" Return sPath & excelBez & ".xlsx"
@@ -3023,8 +3025,8 @@ Module Mail
Dim dt As DataTable = sql.loadDgvBySql(sqlstr, "EZOLL") Dim dt As DataTable = sql.loadDgvBySql(sqlstr, "EZOLL")
System.Console.WriteLine("Vorhandene Datensätze: " & dt.Rows.Count) System.Console.WriteLine("Vorhandene Datensätze: " & dt.Rows.Count)
Dim excelBez = "TETRAPACK_AT_" & von.ToShortDateString.Replace(".", "-") & "_to_ " & bis.ToShortDateString.Replace(".", "-") Dim excelBez = "TETRAPAK_AT_" & von.ToShortDateString.Replace(".", "-") & "_to_ " & bis.ToShortDateString.Replace(".", "-")
genExcel(dt, excelBez, "TETRAPACK") genExcel(dt, excelBez, "TETRAPAK")
Return sPath & excelBez & ".xlsx" Return sPath & excelBez & ".xlsx"