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

Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
d.breimaier
2024-09-19 13:53:47 +02:00
parent 4ffae61bfb e20b5df374
commit 15abdd7dbe
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -3981,6 +3981,7 @@ Public Class frmStartOptions
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1) insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1)
insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk")) insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk"))
cVermerkeDAL.increaseWarnstufe(r("VermerkID")) cVermerkeDAL.increaseWarnstufe(r("VermerkID"))
MsgBox("done")
Next Next
End If End If
Catch ex As Exception Catch ex As Exception
@@ -3995,10 +3996,10 @@ Public Class frmStartOptions
Dim dt = SQL.loadDgvBySql(" Dim dt = SQL.loadDgvBySql("
SELECT TOP 1000 aviso.AvisoID, Datum SELECT TOP 1000 aviso.AvisoID, Datum
FROM [Aviso] FROM [Aviso]
WHERE [Aviso].Status NOT IN (1,2) WHERE [Aviso].Status NOT IN (1,2,5)
and DATEDIFF(HOUR, (select top 1 Datum from Vermerke where Vermerke.AvisoID=aviso.AvisoID order by Vermerke.Datum desc),GETDATE())>24 and DATEDIFF(HOUR, (select top 1 Datum from Vermerke where Vermerke.AvisoID=aviso.AvisoID order by Vermerke.Datum desc),GETDATE())>24
and DATEDIFF(HOUR, (select top 1 Datum from Aenderungen where Aenderungen.AvisoID=aviso.AvisoID order by Aenderungen.Datum desc),GETDATE())>24 and DATEDIFF(HOUR, (select top 1 Datum from Aenderungen where Aenderungen.AvisoID=aviso.AvisoID order by Aenderungen.Datum desc),GETDATE())>24
AND Datum > DATEADD( day,-2,GETDATE()) AND Datum > DATEADD( day,-2,GETDATE()) AND [Aviso].Firma not in ( 'ATILLA')
", "AVISO") ", "AVISO")
If dt IsNot Nothing Then If dt IsNot Nothing Then
@@ -4042,7 +4043,7 @@ Public Class frmStartOptions
Return True Return True
End Function End Function
Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio) Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio, VermerkID)
' '
'Benachrichtigung 'Benachrichtigung
If SendungsId Is DBNull.Value Then SendungsId = Nothing If SendungsId Is DBNull.Value Then SendungsId = Nothing
@@ -4097,12 +4098,12 @@ Public Class frmStartOptions
Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO")
' If GrenzstelleAVISO = "???" Then ' If GrenzstelleAVISO = "???" Then
Select Case statusAVISO Select Case statusAVISO
Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
'Nicht 'Nicht
Case Else Case Else
MsgBox("!!!!!" & sendToID) MsgBox("!!!!!" & sendToID)
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma) VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma, VermerkID)
insertVermerk(AvisoId, SendungsId, 115, "(AAS) " & TXT_AAS_BODY) insertVermerk(AvisoId, SendungsId, 115, "(AAS) " & TXT_AAS_BODY)
End Select End Select