merge
This commit is contained in:
@@ -14,6 +14,7 @@ Imports Renci.SshNet
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
|
||||
|
||||
Public Class frmStartOptions
|
||||
Dim WithEvents timer As New Timer
|
||||
|
||||
@@ -544,7 +545,7 @@ Public Class frmStartOptions
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Dim f As New frmInfo(PARAM)
|
||||
f.Show()
|
||||
doAASVermerke_Schwelle()
|
||||
doAASVermerke_Schwelle(Nothing)
|
||||
|
||||
closeMe()
|
||||
'------------------------------
|
||||
@@ -3953,27 +3954,33 @@ Public Class frmStartOptions
|
||||
End Sub
|
||||
|
||||
Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click
|
||||
doAASVermerke_Schwelle()
|
||||
Dim abDatum = Nothing
|
||||
If MyTextBox4._value <> "" Then abDatum = CDate(MyTextBox4._value)
|
||||
doAASVermerke_Schwelle(abDatum)
|
||||
|
||||
End Sub
|
||||
|
||||
Function doAASVermerke_Schwelle()
|
||||
Function doAASVermerke_Schwelle(Optional abDatum = Nothing)
|
||||
Try
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim dt = SQL.loadDgvBySql("
|
||||
SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk]
|
||||
,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr
|
||||
SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk],Vermerke.SendungID SendungsId
|
||||
,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr,VermerkID
|
||||
FROM [Aviso]
|
||||
inner join Vermerke on [Aviso].AvisoID=Vermerke.AvisoID
|
||||
inner join VermerkeCodes on Vermerke.VermerkeCode=VermerkeCodes.VermerkCodeId
|
||||
WHERE [Aviso].Status NOT IN (1,2) AND AAS_Warnsystem=1 and AAS_Warnstufe=0 and DATEDIFF(HOUR,Vermerke.Datum,GETDATE())>AAS_SchwelleStunden and [VermerkIDAufgehoben] is null
|
||||
and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945))
|
||||
AND Aviso.Datum > DATEADD( day,-1,GETDATE())
|
||||
/*and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945))*/
|
||||
AND Aviso.Datum > " & If(abDatum IsNot Nothing, "'" & CDate(abDatum).ToShortDateString & "'", " DATEADD( day,-1,GETDATE())") & "
|
||||
AND Geloescht=0
|
||||
", "AVISO")
|
||||
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1)
|
||||
MsgBox(r("AvisoId"))
|
||||
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"))
|
||||
cVermerkeDAL.increaseWarnstufe(r("VermerkID"))
|
||||
Next
|
||||
End If
|
||||
Catch ex As Exception
|
||||
@@ -3996,7 +4003,9 @@ Public Class frmStartOptions
|
||||
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER 24h", "REMINDER: " & r("Hinweis_Vermerk"), 0)
|
||||
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER 24h", "REMINDER: " & r("Hinweis_Vermerk"), 0)
|
||||
insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk"))
|
||||
|
||||
Next
|
||||
End If
|
||||
Catch ex As Exception
|
||||
@@ -4021,7 +4030,9 @@ Public Class frmStartOptions
|
||||
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 0)
|
||||
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"), 0)
|
||||
insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk"))
|
||||
|
||||
Next
|
||||
End If
|
||||
Catch ex As Exception
|
||||
@@ -4034,50 +4045,68 @@ Public Class frmStartOptions
|
||||
Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio)
|
||||
'
|
||||
'Benachrichtigung
|
||||
If SendungsId Is DBNull.Value Then SendungsId = Nothing
|
||||
Try
|
||||
'Benutzer vorschreiben der Sendung...
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim sendToID As String = SQL.DLookup("tblSnd_VG_MA", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1)
|
||||
Dim art = "B"
|
||||
'MsgBox("Benutzer vorschreiben" & sendToID)
|
||||
|
||||
'Wenn Benutzer vorschreiben nicht online, dann Benutzer der Sendung...
|
||||
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
|
||||
sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1)
|
||||
art = "B"
|
||||
End If
|
||||
' MsgBox("Benutzer der Sendung" & sendToID)
|
||||
|
||||
'Wenn Benutzer der Sendung nicht online, dann Benutzer des LKW ..
|
||||
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
|
||||
sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO", -1)
|
||||
art = "B"
|
||||
End If
|
||||
' MsgBox("Benutzer der LKW" & sendToID)
|
||||
|
||||
'Wenn Benutzer des LKWs nicht online, Team...
|
||||
'Wenn Benutzer des LKWs nicht online, Team der Sendung...
|
||||
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
|
||||
sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1)
|
||||
art = "T"
|
||||
End If
|
||||
' MsgBox("Team der Sendung" & sendToID)
|
||||
|
||||
'Wenn TEAM nicht gefunden, Firma...
|
||||
'Wenn Team der Sendung nicht gefunden, Team des LKW...
|
||||
If sendToID <= 0 Then
|
||||
sendToID = SQL.DLookup("TeamId", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO", -1)
|
||||
art = "T"
|
||||
End If
|
||||
' MsgBox("Team LKW " & sendToID)
|
||||
|
||||
'Wenn TEAM LKW nicht gefunden, Firma...
|
||||
If sendToID <= 0 Then
|
||||
If firma IsNot Nothing AndAlso firma <> "" Then
|
||||
sendToID = firma
|
||||
art = "F"
|
||||
End If
|
||||
End If
|
||||
' MsgBox("XXXX" & sendToID)
|
||||
|
||||
|
||||
'Wenn gefunden
|
||||
If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then
|
||||
Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO")
|
||||
Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO")
|
||||
If GrenzstelleAVISO = "???" Then
|
||||
Select Case statusAVISO
|
||||
' If GrenzstelleAVISO = "???" Then
|
||||
Select Case statusAVISO
|
||||
Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
|
||||
'Nicht
|
||||
Case Else
|
||||
MsgBox("!!!!!" & sendToID)
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma)
|
||||
End Select
|
||||
End If
|
||||
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma)
|
||||
insertVermerk(AvisoId, SendungsId, 115, "(AAS) " & TXT_AAS_BODY)
|
||||
|
||||
End Select
|
||||
' End If
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -4087,6 +4116,27 @@ Public Class frmStartOptions
|
||||
Return True
|
||||
End Function
|
||||
|
||||
|
||||
Sub insertVermerk(AvisoID, SendungID, VermerkCodeId, VermerkText)
|
||||
If SendungID Is DBNull.Value Then SendungID = -1
|
||||
|
||||
Dim myVermerk As New cVermerk
|
||||
myVermerk.VermerkID = 0
|
||||
myVermerk.AvisoID = AvisoID
|
||||
myVermerk.Datum = Now
|
||||
myVermerk.Mitarbeiter = "AAS (AUTO)"
|
||||
myVermerk.MitarbeiterId = -1
|
||||
myVermerk.Hinweis_Vermerk = VermerkText
|
||||
myVermerk.VermerkCodeId = VermerkCodeId
|
||||
myVermerk.SendungID = SendungID
|
||||
myVermerk.HintergrundVermerk = True
|
||||
If SendungID > 0 Then myVermerk.VermerkArt = "S" Else myVermerk.VermerkArt = "A"
|
||||
Dim VermerkeDAL As New cVermerkeDAL
|
||||
|
||||
VermerkeDAL.SpeichernVermerk(myVermerk)
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click
|
||||
doAASVermerke_24h()
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user