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

WARENORT-AVISO, EN-Anpassung, Benachrichtigungen, ATILLA-Indonesien, AVISO-TV

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-12-14 21:20:36 +01:00
parent 4b2dca43dd
commit 2c1de3334b
22 changed files with 1582 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AvisoTV/frmAnzeige.vb
View File

@@ -211,19 +211,20 @@ Public Class frmAnzeige
If StandortATILLA Then
buero = " , Buero "
End If
Dim stat_tmp As String = cGlobal.Status_Ankunft.ToString
Dim stat_tmp As String = cGlobal.Status_Ankunft.ToString & ", " & cGlobal.Status_ATILLA_VERIMEX.ToString & ", " & cGlobal.Status_ATILLA_INDONESIEN.ToString
Dim ank_tmp As String = ""
If seiten Then ank_tmp = " And Ankunft > " & SQLDatumZeitSekunden(Merk_Ankunftsdatum)
If onlyOK Then ank_tmp = " And LKW_fertig = 1 "
If False Then 'alle Staten
stat_tmp = "3,99,4,5,0"
stat_tmp = "3,6,7,99,4,5,0"
ank_tmp = ""
End If
where = " WHERE "
Dim hSQL As String = "SELECT AvisoID, Status, UPPER(LKW_Nr) as LKW_Nr, Ankunft, Dauer, letzterMitarbeiter,WeiterleitungTextTV, LKW_fertig " & buero & " , AvisoTVHinweis, ImEx, ZOLLDigitalEingereicht FROM Aviso "
where &= " Status IN( " & stat_tmp & ") "
where &= " AND Ankunft is not null "
If CLUSTER <> "" Then
where &= " AND (Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster= '" & CLUSTER & "') "
ElseIf Standort <> "WAI" And Standort <> "SBG" And Standort <> "NKD" Then
@@ -235,6 +236,8 @@ Public Class frmAnzeige
hSQL &= where
hSQL += ank_tmp & " ORDER BY CASE " &
" when [Status] =3 then 1 " &
" when [Status] =6 then 0.5 " &
" when [Status] =7 then 0.5 " &
" when [Status] =99 then 2 " &
" when [Status] =4 then 3 " &
" when [Status] =5 then 4 " &