MDM Datenverarbeitung, automailfakt.

SDL/Fakturierung/cAutomailversand.vb

@@ -1,7 +1,5 @@
 
-Imports GrapeCity.DataVisualization.TypeScript
 Imports Microsoft.Office.Interop
-Imports Microsoft.Office.Interop.Outlook
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class cAutomailversand
@@ -117,7 +115,7 @@ Public Class cAutomailversand
 
 
 
-                If Not (MailTo = "" AndAlso MailtoCC = "" AndAlso MailtoCC = "") Then
+                If Not (MailTo = "" AndAlso MailtoCC = "" AndAlso MailtoBCC = "") Then
 
                     Dim Mailsubject As String = ""
                     Dim HTMLMail As String = ""
@@ -128,9 +126,11 @@ Public Class cAutomailversand
                     If doRechnung(row.Item("RechnungsKundenNr"), FirmaID, SammelrechungArt, Rechnungsdatum, RechnungsNr, DruckDatumZeit, MDMKopiedrucken, listPDFs) Then
                         loadAndSetAnhaenge(SR_DT, ATTACHMENTS, listPDFs)
 
+                        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Mailsubject &= " TEST"
+
                         If mailoeffnen Then
                             Dim Mail = createMail(Mailsubject, HTMLMail, ATTACHMENTS, MailTo, MailtoCC, MailtoBCC, FirmaID)
-                            If setLog(row.Item("RechnungsKundenNr"),,,,,,, Mail) Then
+                            If setLog(SR_DT, row, FirmaID, SammelrechungArt, Rechnungsdatum,,,,,,, Mail) Then
                                 Mail.Display()
                             End If
 
@@ -138,27 +138,20 @@ Public Class cAutomailversand
 
                             Dim TextHTML = ""
                             TextHTML &= HTMLMail
-                            TextHTML &= "<br>"
-                            TextHTML &= "<br>"
-                            TextHTML &= "Mit freundlichen Grüßen<br>"
-                            TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
-                            TextHTML &= "<br>"
-                            TextHTML &= cFakturierung.getSignature("DE", FirmaID, True, True)
+                            TextHTML &= cFakturierung.getSignature("DE", FirmaID, True, True,,,,, True)
                             HTMLMail = "<div style=""font-family:Calibri, Arial"">" & TextHTML & "</div>"
 
-                            If setLog(row.Item("RechnungsKundenNr"), ATTACHMENTS, Mailsubject, HTMLMail, MailTo, MailtoCC, MailtoBCC) Then
+                            If setLog(SR_DT, row, FirmaID, SammelrechungArt, Rechnungsdatum, ATTACHMENTS, Mailsubject, HTMLMail, MailTo, MailtoCC, MailtoBCC) Then
 
                             End If
 
                         End If
 
                     End If
+
                 End If
-
-
+              
             Next
-
-
         Catch ex As System.Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
 
@@ -279,9 +272,11 @@ Public Class cAutomailversand
     End Sub
 
 
-    Private Function setLog(kdNr As Integer, Optional ATTACHMENTS As List(Of cFakt_MailATTach) = Nothing, Optional Mailsubject As String = "", Optional Mailhtml As String = "", Optional MailTo As String = "", Optional MailtoCC As String = "", Optional MailtoBCC As String = "", Optional Mail As Microsoft.Office.Interop.Outlook.MailItem = Nothing) As Boolean
+    Private Function setLog(SR_DT As DataTable, row As DataRow, FirmaID As Integer, Sammelrechnungsart As Integer, Rechnungsdatum As Date, Optional ATTACHMENTS As List(Of cFakt_MailATTach) = Nothing, Optional Mailsubject As String = "", Optional Mailhtml As String = "", Optional MailTo As String = "", Optional MailtoCC As String = "", Optional MailtoBCC As String = "", Optional Mail As Microsoft.Office.Interop.Outlook.MailItem = Nothing) As Boolean
 
         Dim mailcreated As Boolean = False
+        Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+
 
         Dim EMails As String = ""
         Dim EMails_CC As String = ""
@@ -307,8 +302,20 @@ Public Class cAutomailversand
 
         End If
 
+        Dim AbfertigungsNr As Integer
+        Dim FilialenNr As Integer
 
-        Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_BELEGMAIL, "SAMMELRECHNUNG-MDM",,, kdNr)
+        If SR_DT.Rows.Count > 0 Then
+            For Each r As DataRow In SR_DT.Rows
+                AbfertigungsNr = IIf(Not IsDBNull(r.Item("AbfertigungsNr")) AndAlso IsNumeric(r.Item("AbfertigungsNr")), CInt(r.Item("AbfertigungsNr")), 0)
+                FilialenNr = IIf(Not IsDBNull(r.Item("FilialenNr")) AndAlso IsNumeric(r.Item("FilialenNr")), CInt(r.Item("FilialenNr")), 0)
+            Next
+
+        End If
+
+
+
+        Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG, "SAMMELRECHNUNG-MDM",,, row.Item("RechnungsKundenNr"), , , FilialenNr, AbfertigungsNr)
 
         API.api_EMail = EMails
         API.api_EMailCC = EMails_CC
@@ -334,11 +341,16 @@ Public Class cAutomailversand
                 mailcreated = True
             Else
                 API.UPDTAE_ERR()
+                sql.doSQL("update Rechnungsausgang set Status = 2 where Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechnungsart & "' And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) = '" & Rechnungsdatum.ToShortDateString & "'
+                                        And isnull(Rechnungsausgang.Automailversand,0) = 1 And RechnungsNr > 0  And RechnungsKundenNr = " & row.Item("RechnungsKundenNr") & " And Status = 4", "FMZOLL")
+
                 Return mailcreated
 
             End If
 
 
+
+
         End If
 
         Return mailcreated