diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index ab92c60..9357f3d 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -62,7 +62,7 @@
false
- On
+ Off
Binary
@@ -1397,6 +1397,7 @@
+
@@ -1756,7 +1757,8 @@
- \\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "Aviso.exe"
+
+
diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
index 4827574..9d88def 100644
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
@@ -64,6 +64,13 @@ Public Class usrCntlBenachrichtigungen
End Select
End If
+ If cbxTaskForce.Checked Then
+ Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ Case "VERAG"
+ whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='7') " 'TEAM_TASKFORCE --> VERAG
+ End Select
+ End If
+
If cbxTeams.Checked Then
whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
Else
@@ -232,6 +239,11 @@ Public Class usrCntlBenachrichtigungen
cbxVerwarung.Checked = True
End If
+ If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeTaskForce", "AVISO") Then
+ cbxTaskForce.Visible = True
+ cbxTaskForce.Checked = True
+ End If
+
'NEIN; weils zB Waidhaus dann alles sieht und übernimmt
'If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
@@ -348,7 +360,7 @@ Public Class usrCntlBenachrichtigungen
initDgvAvisoBenachrichtigungen(True, Me.Font)
End Sub
- Private Sub cbxNeukunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNeukunden.CheckedChanged
+ Private Sub cbxNeukunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNeukunden.CheckedChanged, cbxVerwarung.CheckedChanged, cbxTaskForce.CheckedChanged
initDgvAvisoBenachrichtigungen(True, Me.Font)
End Sub
diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index 3cf6774..53a313c 100644
--- a/Aviso/My Project/AssemblyInfo.vb
+++ b/Aviso/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
-
+
+
diff --git a/Aviso/My Project/app.manifest b/Aviso/My Project/app.manifest
index 15353fb..4ff9a17 100644
--- a/Aviso/My Project/app.manifest
+++ b/Aviso/My Project/app.manifest
@@ -1,6 +1,6 @@
-
+
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index c5eeb18..757da48 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -4910,6 +4910,32 @@ Public Class AvisoStatusFunctions
End Sub
+ Shared Sub SendStatusEmailByKdNr(AVISO As cAviso, KdNr As Integer)
+ Dim AvisoDAL As New cAvisoDAL
+ Dim art = 5
+ Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+ Case "ATILLA"
+ 'NED!
+ 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(KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+ If Emails_list_sent.LIST.Count > 0 Then
+ Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, KdNr, "")
+ ' VERAG_PROG_ALLGEMEIN.cAvisoStatusMails.INSERT_INTO(AVISO.AvisoID, KdNr, art)
+ End If
+
+ End Select
+
+ End Sub
+
Shared Sub Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, KundenNr, Optional ForceMail = "")
diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb
index 865da56..fe6a387 100644
--- a/Aviso/frmLogin.vb
+++ b/Aviso/frmLogin.vb
@@ -167,14 +167,34 @@ Public Class frmLogin
Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL
Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
- Dim dt = VERAGSQL.loadDgvBySql("SELECT [AvisoID] FROM [Aviso] where datum >= '19.04.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")
+
+ Dim SQLSTR = "
+ SELECT AVISOID,KDNR FROM
+ (
+ SELECT AvisoId,Auftraggeber_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
+ UNION
+ SELECT AvisoId,Frächter_KdNr as KDNR FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
+ UNION
+ SELECT AvisoId,tblSnd_AvisiererKdNr as KDNR FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
+ UNION
+ SELECT AvisoId,tblSnd_FrachtfuehrerKdNr as KDNR FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and cast(datum as date)> '29.01.2024' and status NOT IN (1,2)
+ ) as T1
+ where KDNR is not null and kdnr >0
+ /*and(SELECT COUNT(*) FROM tblAvisoStatusMails where asm_AvisoId=AvisoID AND asm_KdNr=KdNr and asm_StatuscodeSent=5) =0 */
+ and(SELECT COUNT(*) FROM ADMIN.dbo.[tblAPI] where [api_AvisoId]=AvisoID AND [api_KundenNr]=KdNr and [api_Type]='MAIL' and api_status='1' and [api_apiArt]='1' and [api_apiUArt]='5') =0
+ GROUP BY AVISOID,KDNR
+ order by AvisoID "
+
+ 'Dim dt = VERAGSQL.loadDgvBySql("SELECT [AvisoID] FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE())
+ ' 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")
+
+ Dim dt = VERAGSQL.loadDgvBySql(SQLSTR, "AVISO")
For Each r In dt.Rows
'MsgBox("SO: " & (r("AvisoID")))
Dim AVISO = AvisoDAL.LesenAviso(r("AvisoID"), "")
If AVISO IsNot Nothing Then
- AvisoStatusFunctions.SendStatusEmail(AVISO)
+ AvisoStatusFunctions.SendStatusEmailByKdNr(AVISO, r("KDNR"))
End If
Next
Catch ex As Exception