edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
d.breimaier
2025-07-28 09:04:28 +02:00
parent 3c1532cda5
commit 39a14b2942
1 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
initATLASAufschubkonten/frmStartOptions.vb
View File

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