This commit is contained in:
2021-10-20 22:24:56 +02:00
parent 787491cf6b
commit 2d7bb951d2
26 changed files with 1204 additions and 415 deletions

View File

@@ -71,8 +71,8 @@ Public Class frmAnzeige
Me.Left = 0
Me.Top = 0
Me.Width = 1920
Me.Height = 1080
' Me.Width = 1920
' Me.Height = 1080
Me.Text += " " & Application.ProductVersion
@@ -221,7 +221,7 @@ Public Class frmAnzeige
End If
where = " WHERE "
Dim hSQL As String = "SELECT AvisoID, Status, UPPER(LKW_Nr) as LKW_Nr, Ankunft, Dauer, letzterMitarbeiter, LKW_fertig " & buero & " , AvisoTVHinweis, ImEx, ZOLLDigitalEingereicht FROM Aviso "
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 & ") "
If CLUSTER <> "" Then
where &= " AND (Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster= '" & CLUSTER & "') "
@@ -244,6 +244,7 @@ Public Class frmAnzeige
Dim contrnamecnt As Integer = 0
Public Sub Listen_ermitteln()
picConnectionProblem.Visible = False
Dim connok As Boolean = False
Try
Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnectionWithoutError()
@@ -257,7 +258,7 @@ Public Class frmAnzeige
' End Using
'conn.Close()
Catch ex As Exception
'MsgBox("what " & ex.Message)
picConnectionProblem.Visible = True 'MsgBox("what " & ex.Message)
End Try
If connok Then
@@ -308,22 +309,29 @@ Public Class frmAnzeige
Dim hDauer As Long = DateDiff(DateInterval.Minute, CDate(VarToDate((dr.Item("Ankunft")))), Now)
Dim Dauer As String = Minuten_auf_Text(hDauer)
Dim hMitarbeiter As String = VarToStr(dr.Item("LetzterMitarbeiter"))
Dim WeiterleitungTextTV As String = VarToStr(dr.Item("WeiterleitungTextTV"))
Dim ImEx As String = VarToStr(dr.Item("ImEx"))
Dim ZOLLDigitalEingereicht As String = If(CBool(dr.Item("ZOLLDigitalEingereicht")), "D", "")
If StandortATILLA Or Standort = "IMEX" Or Standort = "FRONTOFFICE" Then
'bei Mitarbeiter nur User aus letzter Bearbeiter rausfiltern
Dim x As String = ""
Dim n As Integer = 0
While n < hMitarbeiter.Length
If hMitarbeiter.Substring(n, 1) <> "/" Then
x += hMitarbeiter.Substring(n, 1)
Else
Exit While
End If
n += 1
End While
hMitarbeiter = x
If (hMitarbeiter = "Weiterleitung" Or hMitarbeiter = "") And WeiterleitungTextTV <> "" Then
hMitarbeiter = WeiterleitungTextTV
Else
If StandortATILLA Or Standort = "IMEX" Or Standort = "FRONTOFFICE" Then
'bei Mitarbeiter nur User aus letzter Bearbeiter rausfiltern
Dim x As String = ""
Dim n As Integer = 0
While n < hMitarbeiter.Length
If hMitarbeiter.Substring(n, 1) <> "/" Then
x += hMitarbeiter.Substring(n, 1)
Else
Exit While
End If
n += 1
End While
hMitarbeiter = x
End If
End If
Dim hFertig As String = ""
@@ -423,7 +431,7 @@ Public Class frmAnzeige
End Using
Catch ex As Exception
MsgBox("ERR: " & ex.Message & ex.StackTrace)
picConnectionProblem.Visible = True 'sdfsdf MsgBox("ERR: " & ex.Message & ex.StackTrace)
End Try
'Ermitteln
@@ -459,16 +467,16 @@ Public Class frmAnzeige
lblBigInfo.Visible = False
displayZeilen = False
displayZeilenBIG = False
Dim Panel2Height = 109
Dim Panel2Height = 109 '143
If Not IsNothing(AvisoTV) Then
Select Case AvisoTV.Art
Case "INFO"
Panel2Height = 109
Panel2Height = 109 '143
lblZeile1.Text = AvisoTV.FixeZeile1.Trim
lblZeile2.Text = AvisoTV.FixeZeile2.Trim
displayZeilen = True
Case "BIG"
Panel2Height = 310
Panel2Height = 310 '344
displayZeilenBIG = True
lblBigInfoVisible = True
@@ -784,8 +792,6 @@ Public Class frmAnzeige
frmAnzeige_Load(Me, New EventArgs)
End Sub
Sub loadsettings()
For Each c In grpTestAnzeige.Controls
If c.GetType.Name = "TextBox" Then