neu
This commit is contained in:
@@ -62,8 +62,8 @@ Public Class frmHauptfenster
|
||||
End Sub
|
||||
|
||||
Private Sub frmMain_FormClosed(sender As Object, e As System.Windows.Forms.FormClosedEventArgs) Handles MyBase.FormClosed
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGOUT()
|
||||
If Not closeOK Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGOUT()
|
||||
My.Settings.frmMainSize = Me.Size
|
||||
My.Settings.frmMainPosition = Me.Location
|
||||
My.Settings.Save()
|
||||
@@ -180,7 +180,7 @@ Public Class frmHauptfenster
|
||||
UpdateUpdater.Interval = 5000
|
||||
UpdateUpdater.Enabled = True
|
||||
|
||||
lblVersion.Text = "V " & My.Resources.Version
|
||||
lblVersion.Text = "V " & Application.ProductVersion 'My.Resources.Version2
|
||||
UpdateSession.Interval = 60000
|
||||
UpdateSession.Enabled = True
|
||||
|
||||
@@ -1775,8 +1775,9 @@ Public Class frmHauptfenster
|
||||
Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr
|
||||
|
||||
Private Sub Timer1_Tick(sender As System.Object, e As System.EventArgs) Handles Timer1.Tick
|
||||
If frmLogin.AnmeldungOK Then
|
||||
|
||||
Try
|
||||
Try
|
||||
If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
|
||||
avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
|
||||
UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
|
||||
@@ -1786,28 +1787,29 @@ Public Class frmHauptfenster
|
||||
|
||||
End Try
|
||||
|
||||
If False Then 'NUR AKTUALISIEREN; WENN FENSTER AKTIV --> bei 2. Monitor PROBLEM
|
||||
Try
|
||||
If GetActiveWindow = Me.Handle Then
|
||||
If False Then 'NUR AKTUALISIEREN; WENN FENSTER AKTIV --> bei 2. Monitor PROBLEM
|
||||
Try
|
||||
If GetActiveWindow = Me.Handle Then
|
||||
|
||||
If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
|
||||
' System.Threading.Thread.Sleep(1000) '? warum??
|
||||
avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
|
||||
UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
|
||||
If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
|
||||
' System.Threading.Thread.Sleep(1000) '? warum??
|
||||
avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
|
||||
UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
|
||||
End If
|
||||
Else
|
||||
hMerkZeit = hMerkZeit.AddSeconds(-60) 'Somit wird beid er nächste Aktiveierung aktualisiert
|
||||
If DateDiff(DateInterval.Second, hMerkZeit2, Now) > 10 Then
|
||||
gridAviso.RELOAD()
|
||||
GridZeichnenAviso()
|
||||
initDauerLKWFertig()
|
||||
hMerkZeit2 = Now
|
||||
End If
|
||||
End If
|
||||
Else
|
||||
hMerkZeit = hMerkZeit.AddSeconds(-60) 'Somit wird beid er nächste Aktiveierung aktualisiert
|
||||
If DateDiff(DateInterval.Second, hMerkZeit2, Now) > 10 Then
|
||||
gridAviso.RELOAD()
|
||||
GridZeichnenAviso()
|
||||
initDauerLKWFertig()
|
||||
hMerkZeit2 = Now
|
||||
End If
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
Catch ex As Exception
|
||||
|
||||
End Try
|
||||
End Try
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -2565,6 +2567,15 @@ Public Class frmHauptfenster
|
||||
End Function
|
||||
Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click
|
||||
|
||||
|
||||
'Dim sms As New VERAG_PROG_ALLGEMEIN.cSMS
|
||||
'sms.sms_Handynummer = "00436644178557"
|
||||
'sms.sms_Nachricht = "Das ist ein TEST"
|
||||
'sms.sms_Firma = "FRONTOFFICE"
|
||||
'sms.sms_Account = "EX0252513"
|
||||
'sms.sendWhatsApp(sms.sms_Firma)
|
||||
|
||||
'Exit Sub
|
||||
cHMRC.hmrcTEST()
|
||||
|
||||
Exit Sub
|
||||
@@ -2581,7 +2592,7 @@ Public Class frmHauptfenster
|
||||
Dim mailTo = "al@verag.ag"
|
||||
Dim betreff = "Betreff - TESTMAIL"
|
||||
Dim htmlBody = "E-Mail Body <b> HTML </b>"
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailTo, betreff, htmlBody, , False, False)
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailTo, betreff, htmlBody, , False, False, ,,, 2)
|
||||
Exit Sub
|
||||
|
||||
Exit Sub
|
||||
@@ -3006,7 +3017,8 @@ Public Class frmHauptfenster
|
||||
|
||||
Private Sub TimerUPDATE_Tick(sender As Object, e As EventArgs) Handles TimerUPDATE.Tick
|
||||
Dim cADMIN As New cADMIN
|
||||
If CInt(cADMIN.getAktuelleVersion().Replace(".", "")) > CInt(My.Resources.Version.Replace(".", "")) Then
|
||||
' If CInt(cADMIN.getAktuelleVersion().Replace(".", "")) > CInt(My.Resources.Version2.Replace(".", "")) Then
|
||||
If CInt(cADMIN.getAktuelleVersion().Replace(".", "")) > CInt(Application.ProductVersion.Replace(".", "")) Then
|
||||
Label9.Visible = True
|
||||
End If
|
||||
End Sub
|
||||
@@ -3190,7 +3202,7 @@ Public Class frmHauptfenster
|
||||
End Sub
|
||||
|
||||
Private Sub EMAILTESTToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EMAILTESTToolStripMenuItem.Click
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("luxbauer@gmail.com", "TESTMAIL", "TESTMAIL", , False, True)
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("luxbauer@gmail.com", "TESTMAIL", "TESTMAIL",, False, True, ,,, 2)
|
||||
|
||||
|
||||
End Sub
|
||||
@@ -3560,35 +3572,38 @@ Public Class frmHauptfenster
|
||||
Exit Sub
|
||||
End If
|
||||
Try
|
||||
If frmLogin.AnmeldungOK Then
|
||||
' newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "XXX Chat-Nachricht!", -1) 'TEST
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ChatBenutzer And picAVISOMessenger.Visible Then
|
||||
Dim newMsg = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT()
|
||||
Label20.Text = newMsg
|
||||
Label20.Visible = (newMsg > 0)
|
||||
If newMsg Then
|
||||
Me.Icon = My.Resources.avisoNewMsg
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ChatBenutzer And picAVISOMessenger.Visible Then
|
||||
Dim newMsg = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT()
|
||||
Label20.Text = newMsg
|
||||
Label20.Visible = (newMsg > 0)
|
||||
If newMsg Then
|
||||
Me.Icon = My.Resources.avisoNewMsg
|
||||
|
||||
Dim isshown = False
|
||||
For Each openForm In Application.OpenForms()
|
||||
If TypeOf (openForm) Is frmNotify Then
|
||||
isshown = True
|
||||
End If
|
||||
Next
|
||||
|
||||
Dim isInFront = False
|
||||
For Each openForm In Application.OpenForms()
|
||||
If TypeOf (openForm) Is VERAG_PROG_ALLGEMEIN.frmMessenger Then
|
||||
' If DirectCast(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).Focused Then
|
||||
If GetActiveWindow = DirectCast(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).Handle Then
|
||||
isInFront = True
|
||||
Dim isshown = False
|
||||
For Each openForm In Application.OpenForms()
|
||||
If TypeOf (openForm) Is frmNotify Then
|
||||
isshown = True
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
If Not isshown And Not isInFront Then newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "Neue Chat-Nachricht!", -1)
|
||||
Else
|
||||
Me.Icon = My.Resources.Aviso
|
||||
Next
|
||||
|
||||
Dim isInFront = False
|
||||
For Each openForm In Application.OpenForms()
|
||||
If TypeOf (openForm) Is VERAG_PROG_ALLGEMEIN.frmMessenger Then
|
||||
' If DirectCast(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).Focused Then
|
||||
If GetActiveWindow = DirectCast(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).Handle Then
|
||||
isInFront = True
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
If Not isshown And Not isInFront Then newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "Neue Chat-Nachricht!", -1)
|
||||
Else
|
||||
Me.Icon = My.Resources.Aviso
|
||||
End If
|
||||
If Label20.Visible Then Label20.BringToFront()
|
||||
End If
|
||||
If Label20.Visible Then Label20.BringToFront()
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -3816,7 +3831,45 @@ Public Class frmHauptfenster
|
||||
ToolStripMenuItem17.Visible = (VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX")
|
||||
End Sub
|
||||
|
||||
Private Sub GVMSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSToolStripMenuItem.Click
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "AVISO") Then
|
||||
Dim f As New frmGVMS
|
||||
f.Show()
|
||||
Else
|
||||
MsgBox("Noch nicht verfügbar")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ZEVerfahrensanleitungGestellungSumAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Click
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "ZE_Verfahrensanleitung")
|
||||
DS.OPEN_SINGLE()
|
||||
End Sub
|
||||
|
||||
Private Sub ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Click
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "ZE_Verfahrensanleitung_Fremdpersonal")
|
||||
DS.OPEN_SINGLE()
|
||||
End Sub
|
||||
|
||||
Private Sub WOCHECKLISTEZVAllgemeinToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles WOCHECKLISTEZVAllgemeinToolStripMenuItem.Click
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "ZV_Checkliste")
|
||||
DS.OPEN_SINGLE()
|
||||
End Sub
|
||||
|
||||
Private Sub ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Click
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "ZV_Verfahrensanleitung")
|
||||
DS.OPEN_SINGLE()
|
||||
End Sub
|
||||
|
||||
Private Sub AlleStatusMailsSchickenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleStatusMailsSchickenToolStripMenuItem.Click
|
||||
Dim dt = VERAGSQL.loadDgvBySql("SELECT [AvisoID] FROM [AVISO].[dbo].[Aviso] where datum >= '05.03.2022'
|
||||
and Firma IN ('VERAG','IMEX') and (SELECT COUNT(*) FROM Vermerke where Vermerke.AvisoID=aviso.AvisoID and Hinweis_Vermerk LIKE 'Status E-Mail gesendet an:%') =0 and status NOT IN (1,2)", "AVISO")
|
||||
|
||||
For Each r In dt.Rows
|
||||
'MsgBox("SO: " & (r("AvisoID")))
|
||||
Dim AVISO = AvisoDAL.LesenAviso(r("AvisoID"), "")
|
||||
AvisoStatusFunctions.SendStatusEmail(AVISO)
|
||||
Next
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Public Class AvisoStatusFunctions
|
||||
@@ -4003,7 +4056,7 @@ Public Class AvisoStatusFunctions
|
||||
End Function
|
||||
|
||||
|
||||
Shared Sub SendAnkunftEmail(AVISO As cAviso)
|
||||
Shared Sub SendAnkunftEmail(AVISO As cAviso, Optional ForceMail As String = "")
|
||||
Dim AvisoDAL As New cAvisoDAL
|
||||
Dim art = 1
|
||||
If AVISO.ImEx = "EXPORT" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then art = 3
|
||||
@@ -4020,12 +4073,11 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr)
|
||||
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr, ForceMail)
|
||||
'Frächter und Avisierer werden getrennt voneinander eingelesen, damit es kein Problem mit gesendeten VBD/Steuerbescheiden gibt!
|
||||
If AVISO.Frächter_KdNr <> AVISO.Auftraggeber_KdNr Then
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr, ForceMail)
|
||||
End If
|
||||
|
||||
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
|
||||
@@ -4034,14 +4086,14 @@ Public Class AvisoStatusFunctions
|
||||
Next
|
||||
For Each s In SENDUNG_LIST
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr, ForceMail)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr)
|
||||
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr, ForceMail)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr, ForceMail)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr, ForceMail)
|
||||
|
||||
Next
|
||||
|
||||
End Select
|
||||
@@ -4076,6 +4128,7 @@ Public Class AvisoStatusFunctions
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr, ForceMail)
|
||||
End If
|
||||
|
||||
|
||||
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
|
||||
For Each r In AvisoDAL.loadDataTableBySQL("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AVISO.AvisoID).Rows
|
||||
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
|
||||
@@ -4096,11 +4149,61 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
End Sub
|
||||
|
||||
Shared Sub SendStatusEmail(AVISO As cAviso, Optional ForceMail As String = "")
|
||||
Dim AvisoDAL As New cAvisoDAL
|
||||
Dim art = 5
|
||||
' If AVISO.ImEx = "EXPORT" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then art = 4
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
|
||||
Case "ATILLA"
|
||||
'NED!
|
||||
|
||||
'Case "VERAG", "IMEX"
|
||||
Case "VERAG", "IMEX"
|
||||
|
||||
'Mail-Adressen aus Firmentabelle holen
|
||||
Dim EMails As String = ""
|
||||
Dim EMails_CC As String = ""
|
||||
Dim EMails_BCC As String = ""
|
||||
|
||||
|
||||
Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr, ForceMail)
|
||||
'Frächter und Avisierer werden getrennt voneinander eingelesen, damit es kein Problem mit gesendeten VBD/Steuerbescheiden gibt!
|
||||
If AVISO.Frächter_KdNr <> AVISO.Auftraggeber_KdNr Then
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr, ForceMail)
|
||||
End If
|
||||
|
||||
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
|
||||
For Each r In AvisoDAL.loadDataTableBySQL("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AVISO.AvisoID).Rows
|
||||
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
|
||||
Next
|
||||
For Each s In SENDUNG_LIST
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr, ForceMail)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr, ForceMail)
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr, ForceMail)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr, ForceMail)
|
||||
Next
|
||||
|
||||
End Select
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Shared Sub Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, KundenNr, Optional ForceMail = "")
|
||||
'art = 1 : Ankunft
|
||||
'art = 2 : Freigabe
|
||||
'art = 3 : Ankunft Export
|
||||
'art = 4 : Freigabe Export
|
||||
'art = 5 : Status
|
||||
If KundenNr Is Nothing OrElse Not IsNumeric(KundenNr) Then Exit Sub
|
||||
If KundenNr <= 0 Then Exit Sub
|
||||
|
||||
@@ -4111,17 +4214,47 @@ Public Class AvisoStatusFunctions
|
||||
Exit Sub ' Keine Freigabe-Mail, wenn "BELEG" bei Freigabe gewählt wurde --> Der STB wird indem Fall pro Beleg geschickt.
|
||||
End If
|
||||
End If
|
||||
If art = 4 Then ' Freigabe Export
|
||||
'Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(KundenNr)
|
||||
Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KundenNr)
|
||||
If KUNDE_ERW.EmailFreigabe_Export And KUNDE_ERW.EmailFreigabe_Export_Art = "BLG" Then
|
||||
Exit Sub ' Keine Freigabe-Mail, wenn "BELEG" bei Freigabe gewählt wurde --> Der STB wird indem Fall pro Beleg geschickt.
|
||||
End If
|
||||
End If
|
||||
|
||||
Dim Standorte As New cStandorteDAL
|
||||
'nur Mail erstellen, falls mindestens ein Empfänger vorhanden
|
||||
|
||||
If EMails <> "" Or EMails_CC <> "" Or EMails_BCC <> "" Then
|
||||
|
||||
Dim hBetreff As String = If(art = 1 Or art = 3, VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Ankunft_Betreff, VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Freigabe_Betreff)
|
||||
Dim hBody As String = If(art = 1 Or art = 3, VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Ankunft_Text, VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Freigabe_Text)
|
||||
|
||||
Select Case art 'DEFAULT!!
|
||||
Case 1, 3
|
||||
hBetreff = VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Ankunft_Betreff
|
||||
hBody = VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Ankunft_Text
|
||||
Case 2, 4
|
||||
hBetreff = VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Freigabe_Betreff
|
||||
hBody = VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Freigabe_Text
|
||||
Case 5
|
||||
hBetreff = VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Status_Betreff
|
||||
hBody = VERAG_PROG_ALLGEMEIN.cGlobal.Optionen.eMail_Status_Text
|
||||
End Select
|
||||
|
||||
'jetzt nachsehen, ob indiv. eMail-Text für Standort vorhanden
|
||||
|
||||
Dim GrenzstelleMail = AVISO.Grenzstelle.replace("?", "")
|
||||
If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
|
||||
GrenzstelleMail = GrenzstelleMail.replace("WO_GE", "") 'KEINE MAIL
|
||||
GrenzstelleMail = GrenzstelleMail.replace("WO_KITA", "") 'KEINE MAIL
|
||||
|
||||
|
||||
|
||||
If GrenzstelleMail = "" And art <> 5 Then
|
||||
'----------------------------------------
|
||||
Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL!
|
||||
'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO"
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI"
|
||||
@@ -4143,8 +4276,14 @@ Public Class AvisoStatusFunctions
|
||||
hBetreff = Standort.eMail_Freigabe_Betreff
|
||||
hBody = Standort.eMail_Freigabe_Text
|
||||
End If
|
||||
Case 5
|
||||
If Standort.eMail_Status_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Status_Betreff
|
||||
hBody = Standort.eMail_Status_Text
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Dim anhaenge As New List(Of String)
|
||||
@@ -4162,6 +4301,16 @@ Public Class AvisoStatusFunctions
|
||||
' hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz
|
||||
'End Select
|
||||
|
||||
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_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId)
|
||||
|
||||
API.api_EMail = EMails
|
||||
API.api_EMailCC = EMails_CC
|
||||
API.api_EMailBCC = EMails_BCC
|
||||
API.api_EMailSubject = hBetreff
|
||||
API.api_EMailText = hBody
|
||||
API.api_EMailAttCnt = anhaenge.Count
|
||||
|
||||
|
||||
If ForceMail <> "" Then
|
||||
Dim mailsTXT = ""
|
||||
mailsTXT &= "TO: " & EMails & "<br>"
|
||||
@@ -4169,21 +4318,35 @@ Public Class AvisoStatusFunctions
|
||||
mailsTXT &= "BCC: " & EMails_BCC & "<br><br>"
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge)
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge, art) Then
|
||||
API.UPDTAE_OK()
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
End If
|
||||
|
||||
Else
|
||||
|
||||
|
||||
EMails_BCC &= If(EMails_BCC <> "", ";", "") & VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail() 'Damit Mails gespeichert werden.
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge) Then
|
||||
Dim MailArt = ""
|
||||
Select Case art
|
||||
Case 1, 3 : MailArt = "Ankunft"
|
||||
Case 2, 4 : MailArt = "Freigabe"
|
||||
Case 5 : MailArt = "Status"
|
||||
End Select
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge, art) Then
|
||||
API.UPDTAE_OK()
|
||||
Dim txt = " E-Mail gesendet an: " & EMails
|
||||
If EMails_CC.ToString.Trim <> "" Then txt &= " CC: " & EMails_CC
|
||||
If EMails_BCC.ToString.Trim <> "" Then txt &= " BCC: " & EMails_BCC
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, If(art = 1 Or art = 3, "Ankunft", "Freigabe") & txt, 46, , "(AUTO)")
|
||||
|
||||
|
||||
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, MailArt & txt, 46, , "(AUTO)")
|
||||
Else
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & If(art = 1 Or art = 3, "Ankunft", "Freigabe") & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
|
||||
API.UPDTAE_ERR()
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -4869,8 +5032,6 @@ Public Class AvisoStatusFunctions
|
||||
SendFreigabeEmail(Aviso)
|
||||
|
||||
|
||||
|
||||
|
||||
If True Then
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUTONACHERFASSUNG", CONTROL.FindForm) Then
|
||||
@@ -5279,10 +5440,16 @@ Public Class AvisoStatusFunctions
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
|
||||
SENDUNG_TMP.tblSnd_Vorgeschrieben = Now 'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
|
||||
AvisoDAL.addAenderung(AvisoID, "Sendung auf VORGESCHRIEBEN gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORGESCHRIEBEN gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kreditlimit_Check_SND_Vorgeschrieben", "AVISO") Then
|
||||
frmSendungsdetailsNEU.checkKreditlimit_ID(frmHauptfenster, AvisoID, SendungsId, True, False) 'NOCH NICHT..
|
||||
End If
|
||||
Else
|
||||
SENDUNG_TMP.tblSnd_Vorgeschrieben = Nothing
|
||||
AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT VORGESCHRIEBEN gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORGESCHRIEBEN gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
End If
|
||||
|
||||
|
||||
Return SENDUNG_TMP.SAVE()
|
||||
|
||||
End Function
|
||||
@@ -5355,7 +5522,7 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
End Function
|
||||
|
||||
Public Function setSendungAbfertigungTR(SendungsId, AvisoID, Optional anzahl = 1) As Boolean
|
||||
Public Function setSendungAbfertigungTR(SendungsId, AvisoID, Optional anzahl = 1, Optional anzahlPos = 1) As Boolean
|
||||
|
||||
If SendungsId Is Nothing Then Return False
|
||||
If Not IsNumeric(SendungsId) Then Return False
|
||||
@@ -5376,6 +5543,7 @@ Public Class AvisoStatusFunctions
|
||||
'End If
|
||||
|
||||
SENDUNG_TMP.tblSnd_anzahlHandling = anzahl
|
||||
SENDUNG_TMP.tblSnd_anzahlHandlingPos = anzahlPos
|
||||
|
||||
If SENDUNG_TMP.tblSnd_AbfertigungTR Is Nothing Then
|
||||
SENDUNG_TMP.tblSnd_AbfertigungTR_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
||||
@@ -5474,62 +5642,72 @@ Public Class AvisoStatusFunctions
|
||||
Exit Function
|
||||
End If
|
||||
|
||||
'hier werden alle möglichen Platzhalter ersetzt
|
||||
hText = hText.Replace("%LKW%", hLKW)
|
||||
|
||||
hText = hText.Replace("%Standort%", getGrenzstelleZollstelle(hGrenzstelle, AVISO))
|
||||
hText = hText.Replace("%Uhrzeit%", Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
hText = hText.Replace("&", "und")
|
||||
Select Case art
|
||||
Case "5"
|
||||
Dim linkAviso = "https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)
|
||||
hText = hText.Replace("%Link%", "<div style=""border: 1px solid #333;width:300px;height:50px;background-color:#eee;color:#003680""><br> <a href=""" & linkAviso & """><b>Tracking shipment status<br></b></a></div>")
|
||||
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Case "IMEX"
|
||||
hText = hText.Replace("%Firma_simple%", "IMEX")
|
||||
hText = hText.Replace("%Firma%", "IMEX Customs Service GmbH")
|
||||
hText = hText.Replace("%Platzhalter2%", "<br><br><span style=""font-family: calibri;font-size:14px"">Freundliche Grüße / Saygilarimizla / Best Regards<br>
|
||||
<b>IMEX Customs Service GmbH</b><br>
|
||||
Abteilung: Zollabfertigung<br>
|
||||
Tel.: +43 7711 31630<br>
|
||||
Fax: +43 7711 31630 - 1<br>
|
||||
Mail: <a href=""mailto:info@imex-group.at"">info@imex-group.at</a><br>
|
||||
</span>")
|
||||
Case "UNISPED"
|
||||
hText = hText.Replace("%Firma_simple%", "UNISPED")
|
||||
hText = hText.Replace("%Firma%", "UNISPED Speditions GmbH")
|
||||
hText = hText.Replace("%Platzhalter2%", "<br><br><span style=""font-family: calibri;font-size:14px"">Freundliche Grüße / Saygilarimizla / Best Regards<br>
|
||||
<b>UNISPED Speditions GmbH</b><br>
|
||||
Abteilung: Zollabfertigung<br>
|
||||
Tel.: +43 7711 2677-0<br>
|
||||
Mail: <a href=""mailto:office@unisped.at"">office@unisped.at</a><br>
|
||||
</span>")
|
||||
Case "ATILLA"
|
||||
|
||||
hText = hText.Replace("%Firma_simple%", "ATILLA")
|
||||
hText = hText.Replace("%Firma%", "ATILLA Spedition GmbH")
|
||||
Case "AMBAR"
|
||||
|
||||
hText = hText.Replace("%Firma_simple%", "AMBAR")
|
||||
hText = hText.Replace("%FirmaTR%", "<b>Ambar Logistic Bad Reichenhall</b>")
|
||||
hText = hText.Replace("%Firma%", "<b>Ambar Logistic in Bad Reichenhall</b>")
|
||||
Case Else
|
||||
hText = hText.Replace("%Platzhalter2%", "")
|
||||
|
||||
hText = hText.Replace("%Firma_simple%", "VERAG")
|
||||
hText = hText.Replace("%Firma%", "VERAG Spedition AG")
|
||||
End Select
|
||||
|
||||
hText = hText.Replace("%AbfertigungsNr%", abfertigungsNr)
|
||||
'hier werden alle möglichen Platzhalter ersetzt
|
||||
|
||||
Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KundenNr)
|
||||
|
||||
If (art = 2 Or art = 4) And (KUNDE_ERW.EmailFreigabeSendungsListe Or KUNDE_ERW.EmailFreigabe_VBDPDF Or KUNDE_ERW.EmailFreigabe_SteuerbescheidPDF) Then 'Freigabe
|
||||
hText = hText.Replace("%Standort%", getGrenzstelleZollstelle(hGrenzstelle, AVISO))
|
||||
hText = hText.Replace("%Uhrzeit%", Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
hText = hText.Replace("&", "und")
|
||||
|
||||
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
|
||||
VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AVISO.AvisoID) 'LÄDT alle SENDUNGSDATEN
|
||||
If SENDUNG_LIST.Count > 0 Then
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Case "IMEX"
|
||||
hText = hText.Replace("%Firma_simple%", "IMEX")
|
||||
hText = hText.Replace("%Firma%", "IMEX Customs Service GmbH")
|
||||
hText = hText.Replace("%Platzhalter2%", "<br><br><span style=""font-family: calibri;font-size:14px"">Freundliche Grüße / Saygilarimizla / Best Regards<br>
|
||||
<b>IMEX Customs Service GmbH</b><br>
|
||||
Abteilung: Zollabfertigung<br>
|
||||
Tel.: +43 7711 31630<br>
|
||||
Fax: +43 7711 31630 - 1<br>
|
||||
Mail: <a href=""mailto:info@imex-group.at"">info@imex-group.at</a><br>
|
||||
</span>")
|
||||
Case "UNISPED"
|
||||
hText = hText.Replace("%Firma_simple%", "UNISPED")
|
||||
hText = hText.Replace("%Firma%", "UNISPED Speditions GmbH")
|
||||
hText = hText.Replace("%Platzhalter2%", "<br><br><span style=""font-family: calibri;font-size:14px"">Freundliche Grüße / Saygilarimizla / Best Regards<br>
|
||||
<b>UNISPED Speditions GmbH</b><br>
|
||||
Abteilung: Zollabfertigung<br>
|
||||
Tel.: +43 7711 2677-0<br>
|
||||
Mail: <a href=""mailto:office@unisped.at"">office@unisped.at</a><br>
|
||||
</span>")
|
||||
Case "ATILLA"
|
||||
|
||||
Dim SendungslistTXT = ""
|
||||
SendungslistTXT &= "<span style=""font-family:calibri;font-size:14""><b>Sendungsliste:</b><br></span>"
|
||||
SendungslistTXT &= "<table style=""font-family:calibri;font-size:18;background-color:#F2F8FE;padding:0;min-width:600px;"" border=""1"" bordercolor=""#003680"" cellspacing=""0"">"
|
||||
hText = hText.Replace("%Firma_simple%", "ATILLA")
|
||||
hText = hText.Replace("%Firma%", "ATILLA Spedition GmbH")
|
||||
Case "AMBAR"
|
||||
|
||||
hText = hText.Replace("%Firma_simple%", "AMBAR")
|
||||
hText = hText.Replace("%FirmaTR%", "<b>Ambar Logistic Bad Reichenhall</b>")
|
||||
hText = hText.Replace("%Firma%", "<b>Ambar Logistic in Bad Reichenhall</b>")
|
||||
Case Else
|
||||
hText = hText.Replace("%Platzhalter2%", "")
|
||||
|
||||
hText = hText.Replace("%Firma_simple%", "VERAG")
|
||||
hText = hText.Replace("%Firma%", "VERAG Spedition AG")
|
||||
End Select
|
||||
|
||||
hText = hText.Replace("%AbfertigungsNr%", abfertigungsNr)
|
||||
|
||||
Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KundenNr)
|
||||
|
||||
If (art = 2 Or art = 4) And (KUNDE_ERW.EmailFreigabeSendungsListe Or KUNDE_ERW.EmailFreigabe_VBDPDF Or KUNDE_ERW.EmailFreigabe_SteuerbescheidPDF) Then 'Freigabe
|
||||
|
||||
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
|
||||
VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AVISO.AvisoID) 'LÄDT alle SENDUNGSDATEN
|
||||
If SENDUNG_LIST.Count > 0 Then
|
||||
|
||||
Dim SendungslistTXT = ""
|
||||
SendungslistTXT &= "<span style=""font-family:calibri;font-size:14""><b>Sendungsliste:</b><br></span>"
|
||||
SendungslistTXT &= "<table style=""font-family:calibri;font-size:18;background-color:#F2F8FE;padding:0;min-width:600px;"" border=""1"" bordercolor=""#003680"" cellspacing=""0"">"
|
||||
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
|
||||
' SendungslistTXT &= "<tr style=""font-size:18;min-width:180;font-weight: bolder""><td> Nr. </td><td>Spedition</td><td> PosNr </td><td> Art </td><td> Empfänger </td><td> ATC/MRN </td><td> Frist (T1/T2) </td></tr>"
|
||||
@@ -5569,8 +5747,8 @@ Public Class AvisoStatusFunctions
|
||||
Case 7 'Ausfuhr
|
||||
|
||||
getDataFronDY_AES(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2)
|
||||
MsgBox(DsId)
|
||||
If KUNDE_ERW.EmailFreigabe_ABDPDF And IsNumeric(DsId) Then 'VBD anhängen
|
||||
' MsgBox(DsId)
|
||||
If KUNDE_ERW.EmailFreigabe_ABDPDF And IsNumeric(DsId) Then 'VBD anhängen
|
||||
Try
|
||||
Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False)
|
||||
If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True
|
||||
@@ -5586,51 +5764,51 @@ Public Class AvisoStatusFunctions
|
||||
If s.tblSnd_Abfertigungsart_ID = 23 Then
|
||||
s.LOAD_HANDLING()
|
||||
For Each hd In s.HANDLING
|
||||
AtcMrn &= hd.sndhdg_nr & ", "
|
||||
Next
|
||||
If AtcMrn.EndsWith(", ") Then AtcMrn = AtcMrn.Substring(0, AtcMrn.Length - 2)
|
||||
AtcMrn &= hd.sndhdg_nr & ", "
|
||||
Next
|
||||
If AtcMrn.EndsWith(", ") Then AtcMrn = AtcMrn.Substring(0, AtcMrn.Length - 2)
|
||||
|
||||
'If If(s.tblSnd_ATCMRN_Fremd, "") <> "" Then AtcMrn = s.tblSnd_ATCMRN_Fremd
|
||||
End If
|
||||
If KUNDE_ERW.EmailFreigabe_SteuerbescheidPDF And (IsNumeric(DsId) Or IsNumeric(DsId2)) Then 'Steuerbescheid anhängen
|
||||
If checkSteuerbescheidbedingung(KundenNr, DsId) Or checkSteuerbescheidbedingung(KundenNr, DsId2) Then
|
||||
Try
|
||||
If IsNumeric(DsId) Then
|
||||
Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False)
|
||||
If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True
|
||||
End If
|
||||
If IsNumeric(DsId) Then
|
||||
Dim PathTmp2 = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId2)).GET_TOP1_PATH(False)
|
||||
If PathTmp2 <> "" Then anhaenge.Add(PathTmp2) : found = True
|
||||
End If
|
||||
Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) : End Try
|
||||
If Not found Then
|
||||
AvisoStatusFunctions.insertSendungsVermerk(s.tblSnd_SendungID, AVISO.AvisoID, "ERR: Steuerbescheid nicht gefunden: " & s.FilialenNr & "/" & s.AbfertigungsNr, 47)
|
||||
' AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoID, "ERR: Steuerbescheid nicht gefunden: " & s.FilialenNr & "/" & s.AbfertigungsNr, 46, , "(AUTO)")
|
||||
MsgBox("ACHTUNG: Der Steuerbescheid konnte nicht automatisiert ermittelt werden." & vbNewLine & "Bitte dem Kunden den Steuerbescheid per E-Mail zustellen!" & vbNewLine & vbNewLine & "Sendung: " & s.FilialenNr & "/" & s.AbfertigungsNr)
|
||||
'If If(s.tblSnd_ATCMRN_Fremd, "") <> "" Then AtcMrn = s.tblSnd_ATCMRN_Fremd
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End Select
|
||||
If IsDate(frist) Then frist = CDate(frist).ToShortDateString
|
||||
If KUNDE_ERW.EmailFreigabe_SteuerbescheidPDF And (IsNumeric(DsId) Or IsNumeric(DsId2)) Then 'Steuerbescheid anhängen
|
||||
If checkSteuerbescheidbedingung(KundenNr, DsId) Or checkSteuerbescheidbedingung(KundenNr, DsId2) Then
|
||||
Try
|
||||
If IsNumeric(DsId) Then
|
||||
Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False)
|
||||
If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True
|
||||
End If
|
||||
If IsNumeric(DsId) Then
|
||||
Dim PathTmp2 = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId2)).GET_TOP1_PATH(False)
|
||||
If PathTmp2 <> "" Then anhaenge.Add(PathTmp2) : found = True
|
||||
End If
|
||||
Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) : End Try
|
||||
If Not found Then
|
||||
AvisoStatusFunctions.insertSendungsVermerk(s.tblSnd_SendungID, AVISO.AvisoID, "ERR: Steuerbescheid nicht gefunden: " & s.FilialenNr & "/" & s.AbfertigungsNr, 47)
|
||||
' AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoID, "ERR: Steuerbescheid nicht gefunden: " & s.FilialenNr & "/" & s.AbfertigungsNr, 46, , "(AUTO)")
|
||||
MsgBox("ACHTUNG: Der Steuerbescheid konnte nicht automatisiert ermittelt werden." & vbNewLine & "Bitte dem Kunden den Steuerbescheid per E-Mail zustellen!" & vbNewLine & vbNewLine & "Sendung: " & s.FilialenNr & "/" & s.AbfertigungsNr)
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End Select
|
||||
If IsDate(frist) Then frist = CDate(frist).ToShortDateString
|
||||
|
||||
Dim txtCluster = ""
|
||||
' If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then txtCluster = "<td>" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(s.FilialenNr, False) & "</td>"
|
||||
txtCluster = "<td>" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(s.FilialenNr, False) & "</td>"
|
||||
SendungslistTXT &= "<tr style=""font-size:18;min-width:180;""><td>" & cnt & "</td>" & txtCluster & "<td>" & If(s.FilialenNr > 0, s.FilialenNr, "") & "/" & If(s.AbfertigungsNr > 0, s.AbfertigungsNr, "") & "</td><td>" & getAbfertBez(s) & "</td><td>" & If(s.tblSnd_Empfaenger, "") & "</td><td>" & AtcMrn & "</td><td>" & frist & "</td>" & If(showNCTSAdress, gestellungsadresse, "") & "</tr> "
|
||||
cnt += 1
|
||||
Dim txtCluster = ""
|
||||
' If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then txtCluster = "<td>" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(s.FilialenNr, False) & "</td>"
|
||||
txtCluster = "<td>" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(s.FilialenNr, False) & "</td>"
|
||||
SendungslistTXT &= "<tr style=""font-size:18;min-width:180;""><td>" & cnt & "</td>" & txtCluster & "<td>" & If(s.FilialenNr > 0, s.FilialenNr, "") & "/" & If(s.AbfertigungsNr > 0, s.AbfertigungsNr, "") & "</td><td>" & getAbfertBez(s) & "</td><td>" & If(s.tblSnd_Empfaenger, "") & "</td><td>" & AtcMrn & "</td><td>" & frist & "</td>" & If(showNCTSAdress, gestellungsadresse, "") & "</tr> "
|
||||
cnt += 1
|
||||
End If
|
||||
Next
|
||||
|
||||
SendungslistTXT &= "</table>"
|
||||
SendungslistTXT &= "<br><br>"
|
||||
If cnt = 1 Then ' wurde nicht erhöht -> keine Einträge
|
||||
SendungslistTXT = ""
|
||||
End If
|
||||
If KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT)
|
||||
End If
|
||||
Next
|
||||
|
||||
SendungslistTXT &= "</table>"
|
||||
SendungslistTXT &= "<br><br>"
|
||||
If cnt = 1 Then ' wurde nicht erhöht -> keine Einträge
|
||||
SendungslistTXT = ""
|
||||
End If
|
||||
If KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT)
|
||||
End If
|
||||
End If
|
||||
|
||||
End Select
|
||||
hText = hText.Replace("%Platzhalter%", "")
|
||||
|
||||
Platzhalter_ersetzen = hText
|
||||
@@ -5888,13 +6066,13 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
End Sub
|
||||
|
||||
Shared Sub insertSendungsVermerk(SendungID As Integer, AvisoID As Integer, Text As String, VermerkCodeId As Integer, Optional Beschreibung As String = "", Optional VorauskasseId As Object = Nothing)
|
||||
Shared Sub insertSendungsVermerk(SendungID As Integer, AvisoID As Integer, Text As String, VermerkCodeId As Integer, Optional Beschreibung As String = "", Optional VorauskasseId As Object = Nothing, Optional addAuto As Boolean = False)
|
||||
'Daten zuweisen und speichern
|
||||
Dim myVermerk As New cVermerk
|
||||
myVermerk.VermerkID = 0
|
||||
myVermerk.AvisoID = AvisoID
|
||||
myVermerk.Datum = Now
|
||||
myVermerk.Mitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter
|
||||
myVermerk.Mitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter & If(addAuto, " (AUTO)", "")
|
||||
myVermerk.MitarbeiterId = cGlobal.AktiverMitarbeiter.MitarbeiterID
|
||||
myVermerk.Hinweis_Vermerk = Text
|
||||
myVermerk.VermerkCodeId = VermerkCodeId
|
||||
|
||||
Reference in New Issue
Block a user