Merge branch 'master' of https://verag.visualstudio.com/ADMIN/_git/ADMIN
This commit is contained in:
ja
@@ -35,6 +35,38 @@ Module Mail
|
||||
|
||||
|
||||
|
||||
'Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG("ATILLA/VERAG", "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", CDate("01.08.2021 00:00:00"), CDate("12.08.2021 23:59:59"), True)
|
||||
'Dim _list As New List(Of String) : _list.Add(_erg)
|
||||
'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & "ATILLA/VERAG", "*Automatic generated e-mail*",,,, "", "al@verag.ag", _list)
|
||||
|
||||
'_erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG("IMEX", "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", CDate("01.08.2021 00:00:00"), CDate("12.08.2021 23:59:59"), True)
|
||||
'_list.Clear() : _list.Add(_erg)
|
||||
'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & "IMEX", "*Automatic generated e-mail*",,,, "", "al@verag.ag", _list)
|
||||
|
||||
'Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG("UNISPED", "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", CDate("01.08.2021 00:00:00"), CDate("12.08.2021 23:59:59"), True)
|
||||
'Dim _list As New List(Of String) : _list.Add(_erg)
|
||||
'' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & "UNISPED", "*Automatic generated e-mail*",,,, "", "al@verag.ag", _list)
|
||||
'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr", "TOBB " & "UNISPED", "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list)
|
||||
'Exit Sub
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
'SendEmail_QS_Auswertung("01.01.2021", "31.01.2021")
|
||||
'SendEmail_QS_Auswertung("01.02.2021", "28.02.2021")
|
||||
'SendEmail_QS_Auswertung("01.03.2021", "31.03.2021")
|
||||
'SendEmail_QS_Auswertung("01.04.2021", "30.04.2021")
|
||||
'SendEmail_QS_Auswertung("01.05.2021", "31.05.2021")
|
||||
'SendEmail_QS_Auswertung("01.06.2021", "30.06.2021")
|
||||
'SendEmail_QS_Auswertung("01.07.2021", "31.07.2021")
|
||||
|
||||
'Threading.Thread.Sleep(165000)
|
||||
|
||||
|
||||
|
||||
'Exit Sub
|
||||
|
||||
|
||||
|
||||
'------------------------------------------------------------------------------------
|
||||
@@ -44,7 +76,10 @@ Module Mail
|
||||
|
||||
|
||||
|
||||
|
||||
'Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG("VERAG/ATILLA", "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", CDate("07.06.2021 00:00:00"), CDate("07.06.2021 23:59:59"), True)
|
||||
'Dim _list As New List(Of String) : _list.Add(_erg)
|
||||
'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & "VERAG/ATILLA test", "*Automatic generated e-mail*",,,, , , _list)
|
||||
'Exit Sub
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +99,6 @@ Module Mail
|
||||
System.Console.WriteLine("MailSender konnte nicht gestartet werden, da eine Insatanz noch läuft...")
|
||||
Else
|
||||
|
||||
|
||||
'Select Case firma
|
||||
' Case "ATILLA"
|
||||
' Msg.Subject = "Kunden TR - Offene Rechnungen - ATILLA"
|
||||
@@ -148,7 +182,11 @@ Module Mail
|
||||
Case "QS_AUFTEILUNG"
|
||||
System.Console.WriteLine("OPTION erkannt: QS_AUFTEILUNG _ Erstellt die Auswertung der QS-AUFTEILUNG.")
|
||||
System.Console.WriteLine("Auswertung gestartet...")
|
||||
If SendEmail_QS_Auswertung() Then 'für Andreas Details
|
||||
|
||||
Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year)
|
||||
Dim bis = CDate("01." & Now.Month & "." & Now.Year).AddDays(-1)
|
||||
|
||||
If SendEmail_QS_Auswertung(von, bis) Then 'für Andreas Details
|
||||
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
|
||||
End If
|
||||
Case "CS_AUFTEILUNG"
|
||||
@@ -218,7 +256,7 @@ Module Mail
|
||||
End Sub
|
||||
|
||||
Sub sendTOBB(FirmaTmp, datVon, datBis)
|
||||
Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG(FirmaTmp, "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", datVon, datBis, True)
|
||||
Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG(FirmaTmp, "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 / 21TR0004000079552 / 21TR0004000078157", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518','21TR0004000079552','21TR0004000078157'", datVon, datBis, True)
|
||||
Select Case _erg
|
||||
Case "NO_RESULT"
|
||||
System.Console.WriteLine("Keine Einträge gefunden.")
|
||||
@@ -495,7 +533,7 @@ Module Mail
|
||||
Return False
|
||||
End Function
|
||||
|
||||
Private Function SendEmail_QS_Auswertung() As Boolean
|
||||
Private Function SendEmail_QS_Auswertung(von, bis) As Boolean
|
||||
Dim Msg As New MailMessage
|
||||
Dim myCredentials As New System.Net.NetworkCredential
|
||||
myCredentials.UserName = "al@verag.ag"
|
||||
@@ -515,15 +553,15 @@ Module Mail
|
||||
Try
|
||||
Dim datum As String = Now.AddDays(-1).ToShortDateString
|
||||
System.Console.WriteLine("Erstelle EXCEL...")
|
||||
Dim excel As String = genEXCEL_QS()
|
||||
System.Console.WriteLine("EXCEL erstellt...")
|
||||
Dim excel As String = genEXCEL_QS(von, bis)
|
||||
System.Console.WriteLine("EXCEL erstellt..." & excel)
|
||||
If excel <> "" And Not excel.StartsWith("ERROR: ") Then
|
||||
|
||||
System.Console.WriteLine("Sende E-Mail...")
|
||||
Msg.From = New MailAddress("al@verag.ag")
|
||||
|
||||
|
||||
Msg.To.Add("jl@verag.ag")
|
||||
Msg.To.Add("al@verag.ag")
|
||||
Msg.Bcc.Add("al@verag.ag")
|
||||
' Msg.Bcc.Add("ga@verag.ag")
|
||||
|
||||
@@ -995,28 +1033,25 @@ Module Mail
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Public Function genEXCEL_QS() As String
|
||||
Public Function genEXCEL_QS(von As Date, bis As Date) As String
|
||||
Try
|
||||
|
||||
Dim sqlstr As String = ""
|
||||
|
||||
Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year)
|
||||
Dim bis = CDate("01." & Now.Month & "." & Now.Year).AddDays(-1)
|
||||
|
||||
'sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN [SQLGUIDE01.verag.ost.dmn].AVISO.dbo.AVISO on Aviso.avisoid=Speditionsbuch.AvisoID "
|
||||
'sqlstr &= " WHERE PersonalnummerQS is not null "
|
||||
'sqlstr &= " and FilialenNr NOT IN ( 4801,4806,5501 ) "
|
||||
'sqlstr &= " WHERE PersonalnummerQS is not null "
|
||||
'sqlstr &= " and FilialenNr NOT IN ( 4801,4806,5501 ) "
|
||||
'sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " &
|
||||
' " GROUP BY Aviso.[Grenzstelle]" &
|
||||
' " ORDER BY Anzahl DESC"
|
||||
|
||||
sqlstr &= " SELECT [Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch "
|
||||
sqlstr &= " SELECT Speditionsbuch.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch inner join Filialen on filialen.FilialenNr=Speditionsbuch.FilialenNr "
|
||||
sqlstr &= " WHERE FilialenNrAbklaerung ='4803' " 'QS SUB
|
||||
' sqlstr &= " WHERE Filiale "
|
||||
sqlstr &= " and FilialenNr NOT IN ( 4801,4806,5501 ) "
|
||||
sqlstr &= " and Filialen.Firma='VERAG' "
|
||||
|
||||
sqlstr &= " and Abfertigungsdatum between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " &
|
||||
" GROUP BY [Grenzstelle]" &
|
||||
" GROUP BY Speditionsbuch.[Grenzstelle]" &
|
||||
" ORDER BY Anzahl DESC"
|
||||
|
||||
Dim dt As DataTable = loadDgvBySqlFMZOLL(sqlstr)
|
||||
@@ -1029,6 +1064,9 @@ Module Mail
|
||||
With exclApp
|
||||
.Visible = False
|
||||
Dim filepath = sPath & "QS_Auswertung.xlsx"
|
||||
While IO.File.Exists(filepath)
|
||||
filepath = sPath & "QS_Auswertung_" & Now.ToString("ddMMyyy_HHmmss_fff") & ".xlsx"
|
||||
End While
|
||||
Try
|
||||
My.Computer.FileSystem.WriteAllBytes(filepath, My.Resources.QS_Aufteilung, False)
|
||||
Catch ex As System.Exception
|
||||
@@ -1049,9 +1087,14 @@ Module Mail
|
||||
Blatt.Range("F1").Value = bis.ToShortDateString
|
||||
|
||||
Datei.Save()
|
||||
Try : Datei.close() : Catch ex As System.Exception
|
||||
Return "ERROR 03: " & ex.Message & vbNewLine & ex.StackTrace
|
||||
End Try
|
||||
.DisplayAlerts = False
|
||||
.quit()
|
||||
Try : Datei.close(True) : Catch : End Try
|
||||
releaseObject(exclApp)
|
||||
releaseObject(Datei)
|
||||
|
||||
|
||||
Return filepath
|
||||
End With
|
||||
@@ -1061,6 +1104,16 @@ Module Mail
|
||||
End Try
|
||||
|
||||
End Function
|
||||
Private Sub releaseObject(ByVal obj As Object)
|
||||
Try
|
||||
System.Runtime.InteropServices.Marshal.ReleaseComObject(obj)
|
||||
obj = Nothing
|
||||
Catch ex As Exception
|
||||
obj = Nothing
|
||||
Finally
|
||||
GC.Collect()
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Public Function genEXCEL_CS() As String
|
||||
Try
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user