neu
This commit is contained in:
@@ -150,6 +150,7 @@ Public Class frmAnzeige
|
||||
GridBackgroundColor = Color.FromArgb(255, 255, 240)
|
||||
ElseIf Standort = "AMBAR" Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR"
|
||||
CLUSTER = "FRONTOFFICE"
|
||||
ElseIf Standort = "FRONTOFFICE" Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE"
|
||||
CLUSTER = "FRONTOFFICE"
|
||||
@@ -225,11 +226,11 @@ Public Class frmAnzeige
|
||||
where &= " Status IN( " & stat_tmp & ") "
|
||||
If CLUSTER <> "" Then
|
||||
where &= " AND (Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster= '" & CLUSTER & "') "
|
||||
ElseIf Standort <> "WAI" And Standort <> "ABG" And Standort <> "NKD" Then
|
||||
ElseIf Standort <> "WAI" And Standort <> "SBG" And Standort <> "NKD" Then
|
||||
where &= " AND Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' "
|
||||
End If
|
||||
|
||||
If Standort <> "" Then where &= " AND Grenzstelle = '" & Standort.Replace("IMEX", "SUB").Replace("UNISPED", "SUB").Replace("FRONTOFFICE", "SUB") & "'" 'nur die IMEX-LKW in SUB anzeigen
|
||||
If Standort <> "" Then where &= " AND Grenzstelle = '" & Standort.Replace("IMEX", "SUB").Replace("UNISPED", "SUB").Replace("FRONTOFFICE", "SUB").Replace("AMBAR", "AMB") & "'" 'nur die IMEX-LKW in SUB anzeigen
|
||||
If Standort = "FRONTOFFICE" Then where &= " AND isnull(ImEx,'IMPORT') IN ('IMPORT','') "
|
||||
hSQL &= where
|
||||
hSQL += ank_tmp & " ORDER BY CASE " &
|
||||
@@ -263,7 +264,7 @@ Public Class frmAnzeige
|
||||
|
||||
If connok Then
|
||||
clmnBuero.Visible = StandortATILLA
|
||||
clmnImEx.Visible = (Standort = "WAI")
|
||||
clmnImEx.Visible = (Standort = "WAI" Or Standort.Replace("AMBAR", "AMB") = "AMB")
|
||||
|
||||
If Aktive_Seite <= Max_Seiten Then Aktive_Seite += 1 'nächste Seite anzeigen
|
||||
|
||||
@@ -292,7 +293,7 @@ Public Class frmAnzeige
|
||||
Try
|
||||
Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnectionWithoutError()
|
||||
removeControls()
|
||||
' MsgBox(hSQL)
|
||||
'MsgBox(hSQL)
|
||||
'If IsNothing(conn) Then Exit Sub 'Fehler bei DB-Zugriff - Anzeige nicht aktualisieren
|
||||
Using cmd As New SqlCommand(hSQL, conn)
|
||||
' MsgBox(conn.ConnectionString)
|
||||
@@ -340,7 +341,13 @@ Public Class frmAnzeige
|
||||
If VarToStr(dr.Item("AvisoTVHinweis")) <> "" Then
|
||||
hFertig = VarToStr(dr.Item("AvisoTVHinweis"))
|
||||
ElseIf VarToBool(dr.Item("LKW_fertig")) Then
|
||||
hFertig = "OK"
|
||||
Select Case Standort
|
||||
Case "FRONTOFFICE"
|
||||
hFertig = "OK > Front-Office"
|
||||
Case Else
|
||||
hFertig = "OK"
|
||||
End Select
|
||||
|
||||
End If
|
||||
|
||||
If anz <= Max_Zeilen Then
|
||||
@@ -349,7 +356,7 @@ Public Class frmAnzeige
|
||||
If StandortATILLA Then
|
||||
Dim hBuero As String = VarToStr(dr.Item("buero"))
|
||||
gridAnkunft.Rows.Add(hFertig, LKW_Nr, hAnkunft, Dauer, hMitarbeiter, hBuero, "", ZOLLDigitalEingereicht)
|
||||
ElseIf Standort = "WAI" Then
|
||||
ElseIf Standort = "WAI" Or Standort.Replace("AMBAR", "AMB") = "AMB" Then
|
||||
If ImEx = "IMPORT" Then ImEx = "IM"
|
||||
If ImEx = "EXPORT" Then ImEx = "EX"
|
||||
' MsgBox(ImEx)
|
||||
@@ -365,6 +372,12 @@ Public Class frmAnzeige
|
||||
If ImEx = "EX" Then r.Cells("clmnImEx").Style.BackColor = Color.Blue
|
||||
End If
|
||||
|
||||
If hFertig.StartsWith("OK") Then
|
||||
Dim r As DataGridViewRow = gridAnkunft.Rows(gridAnkunft.RowCount - 1)
|
||||
r.Cells(0).Style.ForeColor = Color.Green
|
||||
r.Cells(1).Style.ForeColor = Color.Green
|
||||
End If
|
||||
|
||||
If CBool(dr.Item("ZOLLDigitalEingereicht")) Then
|
||||
Dim r As DataGridViewRow = gridAnkunft.Rows(gridAnkunft.RowCount - 1)
|
||||
' r.Cells("clmnArt").Style.BackColor = Color.DarkGreen
|
||||
@@ -383,6 +396,8 @@ Public Class frmAnzeige
|
||||
Case "URGENT" : doimage = My.Resources.urgent_qu : r.Cells(0).Value = "PROBLEM"
|
||||
End Select
|
||||
|
||||
|
||||
|
||||
doimage = Nothing
|
||||
If doimage IsNot Nothing Then
|
||||
r.Cells(0).Style.Alignment = DataGridViewContentAlignment.MiddleRight
|
||||
@@ -612,12 +627,12 @@ Public Class frmAnzeige
|
||||
End Sub
|
||||
Sub initSettings()
|
||||
initZeilen()
|
||||
|
||||
picVERAG.Height = lblZeile1.Height
|
||||
Select Case Standort
|
||||
Case "ATILLA" : picVERAG.Image = My.Resources.Atilla 'Atilla such su
|
||||
Case "IMEX" : picVERAG.Image = My.Resources.IMEX_LOGO_simple
|
||||
Case "UNISPED" : picVERAG.Image = My.Resources.Unisped_logo
|
||||
Case "AMBAR" : picVERAG.Image = Nothing
|
||||
Case "AMBAR" : picVERAG.Image = My.Resources.Ambar_Logo : picVERAG.Height = Panel2.Height
|
||||
Case "FRONTOFFICE" : picVERAG.Image = My.Resources.FrontOfficeSUB
|
||||
Case Else : picVERAG.Image = My.Resources.Verag_AG_Logopng
|
||||
End Select
|
||||
@@ -726,7 +741,7 @@ Public Class frmAnzeige
|
||||
gridAnkunft.Columns("clmnBuero").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
End If
|
||||
|
||||
If Standort = "WAI" And gridAnkunft.Columns("clmnImEx") IsNot Nothing Then
|
||||
If (Standort = "WAI" Or Standort.Replace("AMBAR", "AMB") = "AMB") And gridAnkunft.Columns("clmnImEx") IsNot Nothing Then
|
||||
' MsgBox(IIf(IsNumeric(txtBreite7.Text), txtBreite7.Text, 30))
|
||||
gridAnkunft.Columns("clmnImEx").Width = CInt(IIf(IsNumeric(txtBreite7.Text), txtBreite7.Text, 50))
|
||||
gridAnkunft.Columns("clmnImEx").DefaultCellStyle.Font = Font7
|
||||
@@ -742,11 +757,21 @@ Public Class frmAnzeige
|
||||
gridAnkunft.Columns("clmnArt").Visible = True
|
||||
End If
|
||||
|
||||
If txtBreite2.Text <> "" Then gridAnkunft.Columns(1).MinimumWidth = 10 'Default, weil minwisth später gesetzt werden kann
|
||||
|
||||
If txtBreite1.Text <> "" Then gridAnkunft.Columns(0).Width = CInt(txtBreite1.Text)
|
||||
If txtBreite2.Text <> "" Then gridAnkunft.Columns(1).Width = CInt(txtBreite2.Text)
|
||||
If txtBreite3.Text <> "" Then gridAnkunft.Columns(2).Width = CInt(txtBreite3.Text)
|
||||
If txtBreite4.Text <> "" Then gridAnkunft.Columns(3).Width = CInt(txtBreite4.Text)
|
||||
gridAnkunft.Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
|
||||
If cbxBearbeiter.Checked Then
|
||||
gridAnkunft.Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
Else
|
||||
gridAnkunft.Columns(4).Width = 0
|
||||
If txtBreite2.Text <> "" Then gridAnkunft.Columns(1).MinimumWidth = CInt(txtBreite2.Text)
|
||||
gridAnkunft.Columns(2).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
End If
|
||||
|
||||
|
||||
If txtLkwOK_BildBreite.Text <> "" Then gridFertig.Columns(0).Width = CInt(txtLkwOK_BildBreite.Text)
|
||||
|
||||
@@ -839,6 +864,7 @@ Public Class frmAnzeige
|
||||
If txtBreiteGridLKWOK.Text <> "" Then setProperty("txtBreiteGridLKWOK", txtBreiteGridLKWOK.Text)
|
||||
|
||||
setProperty("cbxGridLKWOK", CInt(cbxGridLKWOK.Checked).ToString)
|
||||
setProperty("cbxBearbeiter", CInt(cbxBearbeiter.Checked).ToString)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user