merge
This commit is contained in:
@@ -1140,39 +1140,39 @@ Public Class frmStartOptions
|
||||
|
||||
|
||||
Dim betreff = cStandort.eMail_Zollbeleg_Betreff '"Zollbeleg"
|
||||
betreff = betreff.Replace("%LKW%", AVISO.LKW_Nr)
|
||||
betreff = betreff.Replace("%AbfertigungsNr%", SND.FilialenNr & "/" & SND.AbfertigungsNr)
|
||||
betreff = betreff.Replace("%Standort%", "")
|
||||
betreff = betreff.Replace("%Uhrzeit%", "")
|
||||
betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
|
||||
betreff = betreff.Replace("%LKW%", AVISO.LKW_Nr)
|
||||
betreff = betreff.Replace("%AbfertigungsNr%", SND.FilialenNr & "/" & SND.AbfertigungsNr)
|
||||
betreff = betreff.Replace("%Standort%", "")
|
||||
betreff = betreff.Replace("%Uhrzeit%", "")
|
||||
betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
|
||||
|
||||
|
||||
Dim body = cStandort.eMail_Zollbeleg_Text
|
||||
Dim body = cStandort.eMail_Zollbeleg_Text
|
||||
|
||||
|
||||
Dim EMails As String = ""
|
||||
Dim EMails_CC As String = ""
|
||||
Dim EMails_BCC As String = ""
|
||||
Dim EMails As String = ""
|
||||
Dim EMails_CC As String = ""
|
||||
Dim EMails_BCC As String = ""
|
||||
|
||||
Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
|
||||
Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
|
||||
|
||||
Dim Mail_Art = -1
|
||||
Select Case art
|
||||
Case "AVM", "ABD" 'Export
|
||||
Mail_Art = 4 ' Freigabe Export
|
||||
Dim Mail_Art = -1
|
||||
Select Case art
|
||||
Case "AVM", "ABD" 'Export
|
||||
Mail_Art = 4 ' Freigabe Export
|
||||
|
||||
'If EMails_BCC = "" Then
|
||||
' EMails_BCC = "al@verag.ag"
|
||||
'Else
|
||||
' EMails_BCC &= ";al@verag.ag"
|
||||
'End If
|
||||
Case Else
|
||||
Mail_Art = 2
|
||||
End Select
|
||||
Select Case SND.tblSnd_Abfertigungsart_ID
|
||||
Case 6, 7, 33, 34, 37, 40, 43
|
||||
Mail_Art = 4 ' Freigabe Export
|
||||
End Select
|
||||
'If EMails_BCC = "" Then
|
||||
' EMails_BCC = "al@verag.ag"
|
||||
'Else
|
||||
' EMails_BCC &= ";al@verag.ag"
|
||||
'End If
|
||||
Case Else
|
||||
Mail_Art = 2
|
||||
End Select
|
||||
Select Case SND.tblSnd_Abfertigungsart_ID
|
||||
Case 6, 7, 33, 34, 37, 40, 43
|
||||
Mail_Art = 4 ' Freigabe Export
|
||||
End Select
|
||||
|
||||
|
||||
|
||||
@@ -1196,119 +1196,119 @@ Public Class frmStartOptions
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(KundenNr, Mail_Art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
' body = body.Replace("%Platzhalter%", "E-Mails: " & EMails & " CC: " & EMails_CC & " BCC:" & EMails_BCC)
|
||||
body = body.Replace("%Platzhalter%", "")
|
||||
' body = body.Replace("%Platzhalter%", "E-Mails: " & EMails & " CC: " & EMails_CC & " BCC:" & EMails_BCC)
|
||||
body = body.Replace("%Platzhalter%", "")
|
||||
|
||||
body = body.Replace("%LKW%", AVISO.LKW_Nr)
|
||||
body = body.Replace("%AbfertigungsNr%", SND.FilialenNr & "/" & SND.AbfertigungsNr)
|
||||
body = body.Replace("%Standort%", getStandortTXT(AVISO))
|
||||
body = body.Replace("%Uhrzeit%", Now.ToShortDateString & " " & Now.ToShortTimeString & " Uhr")
|
||||
body = body.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
|
||||
body = body.Replace("%LKW%", AVISO.LKW_Nr)
|
||||
body = body.Replace("%AbfertigungsNr%", SND.FilialenNr & "/" & SND.AbfertigungsNr)
|
||||
body = body.Replace("%Standort%", getStandortTXT(AVISO))
|
||||
body = body.Replace("%Uhrzeit%", Now.ToShortDateString & " " & Now.ToShortTimeString & " Uhr")
|
||||
body = body.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("!!!!!!!!!!!!!!!!!!!!!!!!!: " & vbNewLine & EMails & vbNewLine & EMails_CC, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("!!!!!!!!!!!!!!!!!!!!!!!!!: " & vbNewLine & EMails & vbNewLine & EMails_CC, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
'!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'EMails = "luxbauer@gmail.com"
|
||||
'EMails_CC = ""
|
||||
'EMails_BCC = ""
|
||||
'!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'EMails = "luxbauer@gmail.com"
|
||||
'EMails_CC = ""
|
||||
'EMails_BCC = ""
|
||||
'!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
'If EMails_BCC = "" Then
|
||||
' EMails_BCC = "al@verag.ag"
|
||||
'Else
|
||||
' EMails_BCC &= ";al@verag.ag"
|
||||
''End If
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'If KundenNr = 706113 Then
|
||||
' EMails = "al@verag.ag"
|
||||
' EMails_CC = ""
|
||||
' EMails_BCC = ""
|
||||
'End If
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'If EMails_BCC = "" Then
|
||||
' EMails_BCC = "al@verag.ag"
|
||||
'Else
|
||||
' EMails_BCC &= ";al@verag.ag"
|
||||
''End If
|
||||
''!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
'If KundenNr = 706113 Then
|
||||
' EMails = "al@verag.ag"
|
||||
' EMails_CC = ""
|
||||
' EMails_BCC = ""
|
||||
'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.AVISO_OUT_BELEGMAIL, art,,, KundenNr, SND.tblSnd_AvisoID, SND.tblSnd_SendungID, SND.FilialenNr, SND.AbfertigungsNr)
|
||||
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, art,,, KundenNr, SND.tblSnd_AvisoID, SND.tblSnd_SendungID, SND.FilialenNr, SND.AbfertigungsNr)
|
||||
|
||||
API.api_EMail = EMails
|
||||
API.api_EMailCC = EMails_CC
|
||||
API.api_EMailBCC = EMails_BCC
|
||||
API.api_EMailSubject = betreff
|
||||
API.api_EMailText = body
|
||||
API.api_EMailAttCnt = pfadList.Count
|
||||
API.api_EMail = EMails
|
||||
API.api_EMailCC = EMails_CC
|
||||
API.api_EMailBCC = EMails_BCC
|
||||
API.api_EMailSubject = betreff
|
||||
API.api_EMailText = body
|
||||
API.api_EMailAttCnt = pfadList.Count
|
||||
|
||||
betreff = betreff.Replace(vbNewLine, "").Replace(vbCr, "").Replace(vbLf, "").Replace(vbCrLf, "").Replace(System.Environment.NewLine, " ")
|
||||
betreff = betreff.Replace(vbNewLine, "").Replace(vbCr, "").Replace(vbLf, "").Replace(vbCrLf, "").Replace(System.Environment.NewLine, " ")
|
||||
|
||||
|
||||
|
||||
Select Case art
|
||||
Case "STB"
|
||||
Select Case artKunde
|
||||
Case "FRÄCHTER", "AVISIERER" 'Die bekommen keine Steuerbescheide..
|
||||
Case Else
|
||||
Select Case art
|
||||
Case "STB"
|
||||
Select Case artKunde
|
||||
Case "FRÄCHTER", "AVISIERER" 'Die bekommen keine Steuerbescheide..
|
||||
Case Else
|
||||
|
||||
If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then
|
||||
If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then
|
||||
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
End If
|
||||
|
||||
End Select
|
||||
Case "VBD"
|
||||
If (KD_ERW.EmailFreigabe_Export And KD_ERW.EmailFreigabe_Export_Art = "BLG") Or KD_ERW.EmailFreigabe_VBDPDF Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Versandbegleitdokument " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
End Select
|
||||
Case "VBD"
|
||||
If (KD_ERW.EmailFreigabe_Export And KD_ERW.EmailFreigabe_Export_Art = "BLG") Or KD_ERW.EmailFreigabe_VBDPDF Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Versandbegleitdokument " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
Case "ZNV"
|
||||
If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid ZNV " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
End If
|
||||
Case "ZNV"
|
||||
If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid ZNV " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
Case "ABD"
|
||||
If KD_ERW.EmailFreigabe_Export Or KD_ERW.EmailFreigabe_ABDPDF Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Ausfuhrbegleitdokument " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
End If
|
||||
Case "ABD"
|
||||
If KD_ERW.EmailFreigabe_Export Or KD_ERW.EmailFreigabe_ABDPDF Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Ausfuhrbegleitdokument " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
Case "AVM"
|
||||
If KD_ERW.EmailFreigabe_Export Or KD_ERW.Email_AVM Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Ausgangsvermerk " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
End If
|
||||
Case "AVM"
|
||||
If KD_ERW.EmailFreigabe_Export Or KD_ERW.Email_AVM Then
|
||||
betreff = betreff.Replace("%Zollbeleg%", "Ausgangsvermerk " & BezugsNr)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then
|
||||
API.UPDTAE_OK()
|
||||
insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46)
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
End Select
|
||||
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
|
||||
Reference in New Issue
Block a user