From 5aa8232db72af86aded2b3dac4187fbdd5ec8042 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 11 Oct 2023 14:55:50 +0200 Subject: [PATCH] =?UTF-8?q?Automatischer=20EMail-Versand=20f=C3=BCr=20ZF-A?= =?UTF-8?q?uswertung,=20Errors=20GUI=20verbessert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MailSender/MAILSender.vb | 146 +++++++++++++++++++- MailSender/MailSender.vbproj | 5 + MailSender/My Project/Resources.Designer.vb | 12 +- MailSender/My Project/Resources.resx | 3 + MailSender/Resources/RG_ZF.xlsx | Bin 0 -> 9833 bytes UID/frmERS.vb | 2 +- UID/usrCntlERS.Designer.vb | 80 ++++++++--- UID/usrCntlERS.vb | 13 ++ 8 files changed, 235 insertions(+), 26 deletions(-) create mode 100644 MailSender/Resources/RG_ZF.xlsx diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index c223c91..5b3cbf9 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -4,6 +4,7 @@ Imports System.Data.SqlClient Imports ClosedXML.Excel Imports DocumentFormat Imports System.Net +Imports DAKOSY_Worker Module Mail Dim sPath As String = System.AppDomain.CurrentDomain.BaseDirectory @@ -69,6 +70,7 @@ Module Mail 'PARAM = "THYSSENKRUPP_AUSWERTUNG" 'PARAM = "RED_BULL" + 'PARAM = "ZF" '------------------------------------------------------------------------------------ ' PARAM = "NCTSLIST_TOBB" @@ -97,7 +99,7 @@ Module Mail ' cnt += 1 'End While If cnt >= 20 Then - System.Console.WriteLine("MailSender konnte nicht gestartet werden, da eine Insatanz noch läuft...") + System.Console.WriteLine("MailSender konnte nicht gestartet werden, da eine Instanz noch läuft...") Else 'Select Case firma @@ -205,6 +207,16 @@ Module Mail If SendEmail_RED_BULL("customs.documents.ata@redbull.com", KdNr, von, bis) Then 'für Andreas Details System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") End If + Case "ZF" + Dim von = CDate("01." & Now.AddMonths(-1).Month & "." & Now.AddMonths(-1).Year) + Dim bis = CDate("01." & Now.Month & "." & Now.Year).AddDays(-1) + + Dim KdNr As String = "714869" + System.Console.WriteLine("OPTION erkannt: ZF _ Erstellt eine monaltiche Auswertung der DAKSOY-Abfertigungen für ZF.") + System.Console.WriteLine("Auswertung Details gestartet...") + If SendEmail_ZF("robert.buchbauer@zf.com; christina.eggerl@zf.com; teresa.elster@zf.com", KdNr, von, bis) Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If Case "QS_AUFTEILUNG" System.Console.WriteLine("OPTION erkannt: QS_AUFTEILUNG _ Erstellt die Auswertung der QS-AUFTEILUNG.") System.Console.WriteLine("Auswertung gestartet...") @@ -556,6 +568,43 @@ Module Mail End Try End Function + Private Function SendEmail_ZF(Mailto As String, KdNr As String, von As Date, bis As Date) As Boolean + Try + Dim excel As String = genEXCEL_ZF(KdNr, von, bis) + System.Console.WriteLine("EXCEL erstellt...") + If excel <> "" And Not excel.StartsWith("ERROR: ") Then + + System.Console.WriteLine("Sende E-Mail...") + + Dim Subject = "Auswertungen Zollanmeldungen ZF Friedrichshafen AG " + Dim 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" + + + Dim anhenge As New List(Of String) + anhenge.Add(excel) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mailto, Subject, Body,,, False,, "d.breimaier@verag.ag;ra@verag.ag", 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.LOG) + System.Console.WriteLine(ex.Message & ex.StackTrace) + Return False + End Try + End Function + + Private Function SendEmail_BRG_Auswertung(Optional wochenAuswertung As Boolean = False, Optional details As Boolean = False) As Boolean Dim Msg As New MailMessage Dim myCredentials As New System.Net.NetworkCredential @@ -1375,6 +1424,97 @@ Module Mail End Function + + Public Function genEXCEL_ZF(KdNr As String, von As Date, bis As Date) As String + Try + + Dim KUNDENADR = New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr) + Dim sqlstr As String = "" + + sqlstr &= "SELECT CAST([FilialenNr] as varchar) + '/' + CAST([AbfertigungsNr] as varchar) Abfertigungsnummer,cast([Abfertigungsdatum] as date)Abfertigungsdatum,Absender,Rechnungsbetrag Betrag ,BelegNr,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung" + sqlstr &= " FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart" + sqlstr &= " where EmpfängerKundenNr IN (" & KdNr & ") and Abfertigungsdatum BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "' And Speditionsbuch.Abfertigungsart IN (1,29)" + + Dim dt As DataTable = loadDgvBySqlFMZOLL(sqlstr) + + + Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SR\" + If Not My.Computer.FileSystem.DirectoryExists(sPath) Then + My.Computer.FileSystem.CreateDirectory(sPath) + End If + + Dim Path = "" + Dim exclApp As Object 'as Application + Dim Datei As Object 'as WorkBook + Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + exclApp = CreateObject("Excel.Application") + + With exclApp + .Visible = False + + Try + Path = sPath & "ZF_" & von.ToShortDateString & "-" & bis.ToShortDateString & "" & " .xlsx" + While System.IO.File.Exists(Path) + Path = sPath & "ZF_" & von.ToShortDateString & "-" & bis.ToShortDateString & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" + End While + My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.RG_ZF, False) + Catch ex As System.Exception + ' MsgBox(ex.Message) + MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace) + + + Return "" + End Try + + Datei = .Workbooks.Open(Path) 'Anpassen + Blatt = Datei.Worksheets(1) 'Anpassen + + Blatt.Range("I1").Value = von.ToShortDateString & "-" & bis.ToShortDateString + + Dim cnt = 3 + For Each r In dt.Rows + Blatt.Range("A" & cnt).Value = cnt - 2 + Blatt.Range("B" & cnt).Value = r("Abfertigungsnummer") + ' Blatt.Range("C" & cnt).Value = r("RechnungsNr") + Blatt.Range("C" & cnt).Value = r("Abfertigungsdatum") + Blatt.Range("D" & cnt).Value = r("Abfertigungsbezeichnung") + Blatt.Range("E" & cnt).Value = r("Absender") + Blatt.Range("F" & cnt).Value = "" 'r("Betrag") + Blatt.Range("H" & cnt).Value = r("BelegNr") + + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" + + Dim ZOLLANMELDUNG As New cZollsysteme_Aktenbeschriftung + If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False) Then + Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.Rechnungspreis + Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine) + Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL + Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS + End If + + cnt += 1 + + Next + + Datei.Save() + .DisplayAlerts = False + .quit() + Try : Datei.close(True) : Catch : End Try + End With + + + 'Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, "Report Data_" & KUNDENADR.FullName & "_" & von.ToShortDateString & "-" & bis.ToShortDateString) + Dim filepath = Path + If filepath = "" Then Return "ERROR 01: Fehler beim Erzeugen des XLS." + + Return filepath + Catch ex As System.Exception + ' MsgBox(ex.Message) + Return "ERROR 02: " & ex.Message & vbNewLine & ex.StackTrace + End Try + + End Function + Private Sub releaseObject(ByVal obj As Object) Try System.Runtime.InteropServices.Marshal.ReleaseComObject(obj) @@ -1417,7 +1557,7 @@ Module Mail .Visible = False Dim filepath = sPath & "CS_Auswertung.xlsx" Try - My.Computer.FileSystem.WriteAllBytes(filepath, My.Resources.cs_Aufteilung, False) + My.Computer.FileSystem.WriteAllBytes(filepath, My.Resources.CS_Aufteilung, False) Catch ex As System.Exception ' MsgBox(ex.Message) Return "ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace @@ -1563,7 +1703,7 @@ Module Mail .Visible = False Dim filepath = sPath & "\Depot.xlsx" Try - My.Computer.FileSystem.WriteAllBytes(filepath, My.Resources.depot, False) + My.Computer.FileSystem.WriteAllBytes(filepath, My.Resources.Depot, False) Catch ex As System.Exception ' MsgBox(ex.Message) Return "ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace diff --git a/MailSender/MailSender.vbproj b/MailSender/MailSender.vbproj index 0275e9e..c471987 100644 --- a/MailSender/MailSender.vbproj +++ b/MailSender/MailSender.vbproj @@ -128,6 +128,7 @@ Always + @@ -137,6 +138,10 @@ {a3b497bd-842c-4a2b-b398-ed1976849df1} VERAG_PROG_ALLGEMEIN + + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F} + DAKOSY_Worker_lib + {6eb4d3a4-3cf2-4651-9af9-ad5f727df403} ADMIN diff --git a/MailSender/My Project/Resources.Designer.vb b/MailSender/My Project/Resources.Designer.vb index fde27c0..e533f9e 100644 --- a/MailSender/My Project/Resources.Designer.vb +++ b/MailSender/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -99,5 +99,15 @@ Namespace My.Resources Return CType(obj,Byte()) End Get End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. + ''' + Friend ReadOnly Property RG_ZF() As Byte() + Get + Dim obj As Object = ResourceManager.GetObject("RG_ZF", resourceCulture) + Return CType(obj,Byte()) + End Get + End Property End Module End Namespace diff --git a/MailSender/My Project/Resources.resx b/MailSender/My Project/Resources.resx index 5798ab4..770048e 100644 --- a/MailSender/My Project/Resources.resx +++ b/MailSender/My Project/Resources.resx @@ -130,4 +130,7 @@ ..\Resources\QS_Aufteilung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/MailSender/Resources/RG_ZF.xlsx b/MailSender/Resources/RG_ZF.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..77b361cb2f7ad5712064eda95bfc7985aa6fe8d8 GIT binary patch literal 9833 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 literal 0 HcmV?d00001 diff --git a/UID/frmERS.vb b/UID/frmERS.vb index a5dbfef..27567e5 100644 --- a/UID/frmERS.vb +++ b/UID/frmERS.vb @@ -16,7 +16,7 @@ Private Sub frmERS_Load(sender As Object, e As EventArgs) Handles MyBase.Load lblProgramm.Text = progId & " - " & progName & IIf(progVersion <> "", " (" & progVersion & ")", "") - lblFirma.Text = firma + lblFirma.Text = IIf(firma IsNot DBNull.Value, firma, "") txtUser.Text = maId & " " & userName txtType.Text = type txtMethode.Text = errMethodName diff --git a/UID/usrCntlERS.Designer.vb b/UID/usrCntlERS.Designer.vb index a9eabd4..fa7a7c9 100644 --- a/UID/usrCntlERS.Designer.vb +++ b/UID/usrCntlERS.Designer.vb @@ -26,6 +26,9 @@ Partial Class usrCntlERS Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.pnlSearch = New System.Windows.Forms.Panel() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.txtFehlersuche = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.cbxTestSys = New System.Windows.Forms.CheckBox() Me.Label9 = New System.Windows.Forms.Label() Me.txtUser = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.cboType = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -61,7 +64,6 @@ Partial Class usrCntlERS Me.Panel3 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() - Me.cbxTestSys = New System.Windows.Forms.CheckBox() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -117,6 +119,8 @@ Partial Class usrCntlERS ' 'SplitContainer1.Panel1 ' + Me.SplitContainer1.Panel1.Controls.Add(Me.txtFehlersuche) + Me.SplitContainer1.Panel1.Controls.Add(Me.Label2) Me.SplitContainer1.Panel1.Controls.Add(Me.cbxTestSys) Me.SplitContainer1.Panel1.Controls.Add(Me.Label9) Me.SplitContainer1.Panel1.Controls.Add(Me.txtUser) @@ -148,10 +152,56 @@ Partial Class usrCntlERS Me.SplitContainer1.SplitterDistance = 125 Me.SplitContainer1.TabIndex = 0 ' + 'txtFehlersuche + ' + Me.txtFehlersuche._DateTimeOnly = False + Me.txtFehlersuche._numbersOnly = False + Me.txtFehlersuche._numbersOnlyKommastellen = "" + Me.txtFehlersuche._numbersOnlyTrennzeichen = True + Me.txtFehlersuche._Prozent = False + Me.txtFehlersuche._ShortDateNew = False + Me.txtFehlersuche._ShortDateOnly = False + Me.txtFehlersuche._TimeOnly = False + Me.txtFehlersuche._TimeOnly_Seconds = False + Me.txtFehlersuche._value = "" + Me.txtFehlersuche._Waehrung = False + Me.txtFehlersuche._WaehrungZeichen = True + Me.txtFehlersuche.ForeColor = System.Drawing.Color.Black + Me.txtFehlersuche.Location = New System.Drawing.Point(532, 79) + Me.txtFehlersuche.MaxLineLength = -1 + Me.txtFehlersuche.MaxLines_Warning = "" + Me.txtFehlersuche.MaxLines_Warning_Label = Nothing + Me.txtFehlersuche.Name = "txtFehlersuche" + Me.txtFehlersuche.Size = New System.Drawing.Size(217, 20) + Me.txtFehlersuche.TabIndex = 52 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(449, 83) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(72, 13) + Me.Label2.TabIndex = 51 + Me.Label2.Text = "Fehlersuche*:" + ' + 'cbxTestSys + ' + Me.cbxTestSys.AutoSize = True + Me.cbxTestSys.BackColor = System.Drawing.Color.White + Me.cbxTestSys.Checked = True + Me.cbxTestSys.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxTestSys.Location = New System.Drawing.Point(487, 3) + Me.cbxTestSys.Name = "cbxTestSys" + Me.cbxTestSys.Size = New System.Drawing.Size(79, 17) + Me.cbxTestSys.TabIndex = 50 + Me.cbxTestSys.Text = "Testsystem" + Me.cbxTestSys.ThreeState = True + Me.cbxTestSys.UseVisualStyleBackColor = False + ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(330, 62) + Me.Label9.Location = New System.Drawing.Point(449, 39) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(32, 13) Me.Label9.TabIndex = 47 @@ -176,7 +226,7 @@ Partial Class usrCntlERS Me.txtUser.KdNr = "-1" Me.txtUser.kdNrField = Nothing Me.txtUser.KdNrNullInt = Nothing - Me.txtUser.Location = New System.Drawing.Point(368, 58) + Me.txtUser.Location = New System.Drawing.Point(532, 35) Me.txtUser.Name = "txtUser" Me.txtUser.nurAktive = False Me.txtUser.searchActive = True @@ -193,7 +243,7 @@ Partial Class usrCntlERS Me.cboType.DropDownWidth = 250 Me.cboType.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboType.FormattingEnabled = True - Me.cboType.Location = New System.Drawing.Point(451, 30) + Me.cboType.Location = New System.Drawing.Point(333, 79) Me.cboType.Name = "cboType" Me.cboType.Size = New System.Drawing.Size(105, 22) Me.cboType.TabIndex = 42 @@ -202,7 +252,7 @@ Partial Class usrCntlERS ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(448, 12) + Me.Label6.Location = New System.Drawing.Point(330, 61) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(35, 13) Me.Label6.TabIndex = 41 @@ -462,7 +512,7 @@ Partial Class usrCntlERS Me.cboFirma.DropDownWidth = 250 Me.cboFirma.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboFirma.FormattingEnabled = True - Me.cboFirma.Location = New System.Drawing.Point(575, 26) + Me.cboFirma.Location = New System.Drawing.Point(334, 124) Me.cboFirma.Name = "cboFirma" Me.cboFirma.Size = New System.Drawing.Size(104, 22) Me.cboFirma.TabIndex = 20 @@ -471,7 +521,7 @@ Partial Class usrCntlERS ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(572, 8) + Me.Label1.Location = New System.Drawing.Point(331, 106) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(37, 13) Me.Label1.TabIndex = 6 @@ -633,20 +683,6 @@ Partial Class usrCntlERS Me.Button11.TabIndex = 4 Me.Button11.UseVisualStyleBackColor = True ' - 'cbxTestSys - ' - Me.cbxTestSys.AutoSize = True - Me.cbxTestSys.BackColor = System.Drawing.Color.White - Me.cbxTestSys.Checked = True - Me.cbxTestSys.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxTestSys.Location = New System.Drawing.Point(530, 64) - Me.cbxTestSys.Name = "cbxTestSys" - Me.cbxTestSys.Size = New System.Drawing.Size(79, 17) - Me.cbxTestSys.TabIndex = 50 - Me.cbxTestSys.Text = "Testsystem" - Me.cbxTestSys.ThreeState = True - Me.cbxTestSys.UseVisualStyleBackColor = False - ' 'usrCntlERS ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -711,4 +747,6 @@ Partial Class usrCntlERS Friend WithEvents txtUser As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents lblErgebnis As Label Friend WithEvents cbxTestSys As CheckBox + Friend WithEvents Label2 As Label + Friend WithEvents txtFehlersuche As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/UID/usrCntlERS.vb b/UID/usrCntlERS.vb index f099d60..81487c3 100644 --- a/UID/usrCntlERS.vb +++ b/UID/usrCntlERS.vb @@ -226,6 +226,10 @@ Public Class usrCntlERS sqlstr &= " AND [ers_Testsystem] = @ersTestsystem " End If + If txtFehlersuche.Text <> "" Then + sqlstr &= " AND ([ers_errStack] like '" & txtFehlersuche.Text.Replace("*", "%") & "' Or [ers_errMessage] like '" & txtFehlersuche.Text.Replace("*", "%") & "' OR [ers_errMethodName] like '" & txtFehlersuche.Text.Replace("*", "%") & "') " + + End If Return sqlstr End Function @@ -270,4 +274,13 @@ Public Class usrCntlERS sender.RELOAD() Me.Cursor = Cursors.Default End Sub + + Private Sub txtFehlersuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtFehlersuche.KeyDown + If e.KeyCode = Keys.Enter Then + + Me.btnSuche_Click(sender, e) + e.Handled = True + End If + + End Sub End Class