AVISO New Layout
This commit is contained in:
@@ -72,62 +72,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
gridAviso.Rows(0).Selected = True
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
|
||||
cboMy_Grenzstelle.Items.Clear()
|
||||
cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "' AND grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
|
||||
cboMy_Grenzstelle.changeItem("")
|
||||
Else
|
||||
cboMy_Grenzstelle.Items.Clear()
|
||||
''''If Not VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then ' Nicht, wenn Front-Office
|
||||
'''' cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE (BACKOFFICE)", "ALLE_BACK"))
|
||||
''''End If
|
||||
|
||||
cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True, False, "ALLE")
|
||||
' cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG+AMB", "SBG+AMB"))
|
||||
cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE WARENORTE", "ALLE_WO"))
|
||||
cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
|
||||
cboMy_Grenzstelle.changeItem("")
|
||||
''''cboMy_Grenzstelle.changeItem("ALLE_BACK") 'greift nur wenn verfügbar..
|
||||
End If
|
||||
|
||||
|
||||
|
||||
cboMyAvisoAnzeige.Items.Clear()
|
||||
cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
|
||||
cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer"))
|
||||
cboMyAvisoAnzeige.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False)
|
||||
cboMyAvisoAnzeige.changeItem("Benutzer")
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
|
||||
cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1-Sendungen", "T1"))
|
||||
cboMy_QS.CheckState = CheckState.Checked
|
||||
cboMy_VB.CheckState = CheckState.Unchecked
|
||||
cboMyAvisoAnzeige.changeItem("T1")
|
||||
Else
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" Then
|
||||
cboMy_QS.CheckState = CheckState.Unchecked
|
||||
cboMy_VB.CheckState = CheckState.Indeterminate
|
||||
Else
|
||||
cboMy_QS.CheckState = CheckState.Checked
|
||||
cboMy_VB.CheckState = CheckState.Unchecked
|
||||
End If
|
||||
|
||||
Dim myLKW As Boolean = False
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId Is Nothing Then
|
||||
myLKW = True
|
||||
End If
|
||||
|
||||
If myLKW Then
|
||||
cbx_My_LKW.Checked = True
|
||||
cboMy_QS.CheckState = CheckState.Indeterminate
|
||||
cboMy_VB.CheckState = CheckState.Indeterminate
|
||||
ElseIf IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) Then
|
||||
cboMyAvisoAnzeige.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId)
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
MyComboBox1.Items.Clear()
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("<keine Einschr.>", UStatus_none))
|
||||
@@ -201,18 +146,9 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
|
||||
End Select
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
|
||||
cbx_My_Brexit.Checked = True
|
||||
End If
|
||||
|
||||
|
||||
tbcntrAvisoLKW.Width = Panel1.Width
|
||||
|
||||
'tbcntrAvisoSND.Location = New Point(tbcntrAvisoLKW.Location.X + getTbControlWidth(tbcntrAvisoLKW) + 80, tbcntrAvisoSND.Location.Y)
|
||||
tbcntrAvisoSND.Location = New Point(tbcntrAvisoLKW.Location.X, tbcntrAvisoLKW.Location.Y)
|
||||
tbcntrAvisoSND.SelectedIndex = 1
|
||||
tbcntrAvisoSND.Width = tbcntrAvisoLKW.Width
|
||||
tbcntrAvisoSND.Height = tbcntrAvisoLKW.Height
|
||||
|
||||
If cboTeams.Items.Count = 0 Then cboTeams.Visible = False
|
||||
dtpVon.Value = Now.AddMonths(-1) 'Now.AddDays(-15)
|
||||
@@ -563,40 +499,40 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
'Dauer berechnen:
|
||||
For Each r As DataGridViewRow In .Rows
|
||||
r.DefaultCellStyle.Font = nfont
|
||||
If Not cbx_My_LKW.Checked Then
|
||||
If r.Cells("tblSnd_Fremdspedition").Value Then 'FREMDANMELDER
|
||||
r.Cells("Abfertigungsart").Style.BackColor = Color.FromArgb(230, 230, 230)
|
||||
' r.Cells("tblSnd_PosUnterNr").Style.BackColor = Color.FromArgb(230, 230, 230)
|
||||
' r.Cells("Abfertigungsart").Value = "FREMD"
|
||||
r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value
|
||||
Else 'Nomal
|
||||
Dim Abfertigungsland As String = r.Cells("tblSnd_Zollsystem_Land").Value
|
||||
If Abfertigungsland <> "" Then Abfertigungsland = "[" & Abfertigungsland & "] "
|
||||
'If False Then
|
||||
' If r.Cells("tblSnd_Fremdspedition").Value Then 'FREMDANMELDER
|
||||
' r.Cells("Abfertigungsart").Style.BackColor = Color.FromArgb(230, 230, 230)
|
||||
' ' r.Cells("tblSnd_PosUnterNr").Style.BackColor = Color.FromArgb(230, 230, 230)
|
||||
' ' r.Cells("Abfertigungsart").Value = "FREMD"
|
||||
' r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value
|
||||
' Else 'Nomal
|
||||
' Dim Abfertigungsland As String = r.Cells("tblSnd_Zollsystem_Land").Value
|
||||
' If Abfertigungsland <> "" Then Abfertigungsland = "[" & Abfertigungsland & "] "
|
||||
|
||||
r.Cells("Abfertigungsart").Value = VERAGSQL.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL")
|
||||
r.Cells("Abfertigungsart").Value = Abfertigungsland & r.Cells("Abfertigungsart").Value
|
||||
' r.Cells("Abfertigungsart").Value = VERAGSQL.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL")
|
||||
' r.Cells("Abfertigungsart").Value = Abfertigungsland & r.Cells("Abfertigungsart").Value
|
||||
|
||||
If r.Cells("Abfertigungsart").Value.ToString.Length > 20 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 20) & ".."
|
||||
End If
|
||||
' If r.Cells("Abfertigungsart").Value.ToString.Length > 20 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 20) & ".."
|
||||
' End If
|
||||
|
||||
If .Columns("StatusVorbereitetQS") IsNot Nothing Then
|
||||
If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
|
||||
DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv
|
||||
DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
|
||||
Else
|
||||
DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' eintragen"
|
||||
End If
|
||||
End If
|
||||
If .Columns("StatusVorgeschrieben") IsNot Nothing Then
|
||||
If r.Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then
|
||||
DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorgeschrieben_Aktiv
|
||||
DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
|
||||
Else
|
||||
DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' eintragen"
|
||||
End If
|
||||
End If
|
||||
' If .Columns("StatusVorbereitetQS") IsNot Nothing Then
|
||||
' If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
|
||||
' DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv
|
||||
' DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
|
||||
' Else
|
||||
' DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' eintragen"
|
||||
' End If
|
||||
' End If
|
||||
' If .Columns("StatusVorgeschrieben") IsNot Nothing Then
|
||||
' If r.Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then
|
||||
' DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorgeschrieben_Aktiv
|
||||
' DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")"
|
||||
' Else
|
||||
' DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' eintragen"
|
||||
' End If
|
||||
' End If
|
||||
|
||||
End If
|
||||
'End If
|
||||
|
||||
' MsgBox(r.Cells(1).Value)
|
||||
' MsgBox(r.Cells(6).Value)
|
||||
@@ -635,7 +571,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
'Farbkennung
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
If Not cbx_My_LKW.Checked Then
|
||||
If True Then
|
||||
Select Case r.Cells("Status").Value
|
||||
Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben '"1", "2"
|
||||
' Freigabe, N.Eingetr.
|
||||
@@ -890,89 +826,6 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"
|
||||
|
||||
|
||||
Else
|
||||
|
||||
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
'--- Sendung ---
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
|
||||
If cboMyAvisoAnzeige._value <> "" Then
|
||||
If cboMyAvisoAnzeige._value = "ALLE" Then
|
||||
' inBearbeitungSQL = " 1=1 " 'ALLE
|
||||
inBearbeitungSQL = " ( (tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) OR (Aviso.[TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND tblSendungen.[tblSnd_TeamId] is null)) OR [tblSendungen].tblSnd_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR tblSendungen.LetzterMitarbeiterId=@maId) "
|
||||
ElseIf cboMyAvisoAnzeige._value = "T1" Then
|
||||
inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 "
|
||||
'NUR VERAG/IMEX:
|
||||
inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) "
|
||||
ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
|
||||
If cboMyAvisoAnzeige._value = "27" Then ' TEAM SALZBURG
|
||||
inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId
|
||||
OR Grenzstelle IN('SBG') OR (tblSendungen.FilialenNr IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) ) "
|
||||
Else
|
||||
inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
|
||||
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Dim hSQLFirma = ""
|
||||
hSQL = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " &
|
||||
" ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " &
|
||||
" FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " &
|
||||
" WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
hSQLFirma & " AND ( " & inBearbeitungSQL & ") "
|
||||
|
||||
Select Case cboMy_VB.CheckState
|
||||
Case CheckState.Checked : hSQL &= " AND tblSnd_Vorgeschrieben is not null "
|
||||
Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorgeschrieben is null "
|
||||
' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null "
|
||||
End Select
|
||||
Select Case cboMy_QS.CheckState
|
||||
Case CheckState.Checked : hSQL &= " AND tblSnd_Vorbereitet is not null "
|
||||
Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorbereitet is null "
|
||||
' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null "
|
||||
End Select
|
||||
If cboMy_Grenzstelle._value = "ALLE_WO" Then
|
||||
hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) "
|
||||
|
||||
Else
|
||||
|
||||
If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then hSQL &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
|
||||
If cboMy_Grenzstelle._value = "ALLE_BACK" Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
|
||||
|
||||
End If
|
||||
|
||||
If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
|
||||
|
||||
'Farbe
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
Select Case btnColor.BackColor
|
||||
Case Color.Red
|
||||
hSQL &= " AND (Status = 3 ) "
|
||||
Case Color.Orange
|
||||
' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) "
|
||||
hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, " & getDaysVorschreiben(1) & ",GETDATE()) AS DATE) ) ) "
|
||||
Case Color.Yellow
|
||||
hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY," & getDaysVorschreiben(2) & ",GETDATE()) AS DATE) AND cast(DATEADD(DAY," & getDaysVorschreiben(3) & ",GETDATE()) AS DATE) ) ) "
|
||||
End Select
|
||||
End If
|
||||
''Farbe
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
' Select Case btnColor.BackColor
|
||||
' Case Color.Red
|
||||
' hSQL &= " AND (Status = 3 OR (Status IN (0, 3, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE)<= cast(GETDATE() AS DATE) ) or VoraussichtlichesEintreffen is null) "
|
||||
' Case Color.Orange
|
||||
' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) "
|
||||
' Case Color.Yellow
|
||||
' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 2,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 3,GETDATE()) AS DATE) ) ) "
|
||||
' End Select
|
||||
'End If
|
||||
|
||||
'hSQL &= " AND (Grenzstelle ='???' OR Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
|
||||
' Funktioniert nciht, wg. WO
|
||||
|
||||
hSQL &= " ORDER BY case " & " when [Status] =3 then 0 " & " when [Status] =1 then 5 " & " else 1 " & " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
|
||||
|
||||
End If
|
||||
|
||||
' MsgBox(hSQL)
|
||||
@@ -995,12 +848,11 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
'gridAviso.DataSource = AVISOBinding.bindingSource
|
||||
|
||||
'MsgBox(DirectCast(gridAviso.DataSource, DataTable).Rows.Count)
|
||||
|
||||
'Grid neu designen
|
||||
gridAviso_SpaltenFestlegen()
|
||||
|
||||
|
||||
If CheckBox1.Checked Then
|
||||
gridAviso_SpaltenFestlegen()
|
||||
End If
|
||||
|
||||
'Tabelle Kommt/Geht bereinigen
|
||||
If gridAviso.RowCount = 0 Then
|
||||
@@ -1015,7 +867,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
' lblAnzahl.Text = "Einträge: " & Format(VERAG_PROG_ALLGEMEIN.cGlobal.AnzahlAuswahl, "#,##0") & " ausgewählt" ' / " & Format(AnzahlAlle, "#,##0") & " gesamt"
|
||||
|
||||
hMerkZeit = Now
|
||||
lblZeit_aktuell.Text = "letzte Aktualisierung: " & Format(Now, "HH:mm")
|
||||
lblZeit_aktuell.Text = "Refresh: " & Format(Now, "HH:mm")
|
||||
|
||||
|
||||
|
||||
@@ -1058,7 +910,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
' initPnlSearch()
|
||||
'End Sub
|
||||
Sub initPnlSearch()
|
||||
MsgBox("s")
|
||||
|
||||
If pnlSearch.Visible Then
|
||||
pnlSearch.Visible = False
|
||||
Panel1.Height -= pnlSearch.Height
|
||||
@@ -1105,30 +957,31 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
|
||||
|
||||
Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
|
||||
If CheckBox1.Checked Then
|
||||
toggle_LKW_SND("LKW")
|
||||
Else
|
||||
toggle_LKW_SND("SND")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub toggle_LKW_SND(typ)
|
||||
AVISO_TYP = typ
|
||||
If AVISO_TYP = "LKW" Then
|
||||
tbcntrAvisoLKW.Visible = True
|
||||
tbcntrAvisoSND.Visible = False
|
||||
pblSNDOptions.Visible = False
|
||||
|
||||
ElseIf AVISO_TYP = "SND" Then
|
||||
tbcntrAvisoLKW.Visible = False
|
||||
tbcntrAvisoSND.Visible = True
|
||||
pblSNDOptions.Visible = True
|
||||
End If
|
||||
|
||||
'If CheckBox1.Checked Then
|
||||
' toggle_LKW_SND("LKW")
|
||||
'Else
|
||||
' toggle_LKW_SND("SND")
|
||||
'End If
|
||||
Aviso_anzeigen("")
|
||||
|
||||
End Sub
|
||||
|
||||
'Private Sub toggle_LKW_SND(typ)
|
||||
' AVISO_TYP = typ
|
||||
' If AVISO_TYP = "LKW" Then
|
||||
' tbcntrAvisoLKW.Visible = True
|
||||
' tbcntrAvisoSND.Visible = False
|
||||
' pblSNDOptions.Visible = False
|
||||
|
||||
' ElseIf AVISO_TYP = "SND" Then
|
||||
' tbcntrAvisoLKW.Visible = False
|
||||
' tbcntrAvisoSND.Visible = True
|
||||
' pblSNDOptions.Visible = True
|
||||
' End If
|
||||
|
||||
' Aviso_anzeigen("")
|
||||
|
||||
'End Sub
|
||||
|
||||
Private Sub txtSuche_KeyDown1(sender As Object, e As PreviewKeyDownEventArgs) Handles txtSuche.PreviewKeyDown
|
||||
If e.KeyCode = Keys.Return Or e.KeyCode = Keys.Tab Then
|
||||
Aviso_anzeigen("")
|
||||
@@ -1376,7 +1229,7 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If cbx_My_LKW.Checked Then
|
||||
If True Then
|
||||
|
||||
|
||||
Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
|
||||
@@ -1386,19 +1239,6 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
|
||||
PARENT_FRMHAUPTFENSTER.btnRefresh.PerformClick() 'Aviso_anzeigen("")
|
||||
|
||||
Else
|
||||
|
||||
If gridAviso.SelectedRows(0).Cells("tblSnd_SendungID").Value Is DBNull.Value Then Exit Sub
|
||||
|
||||
Dim SendungsId = gridAviso.SelectedRows(0).Cells("tblSnd_SendungID").Value
|
||||
Dim AvisoID = gridAviso.SelectedRows(0).Cells("AvisoID").Value
|
||||
|
||||
Dim f = Func.openSnd(SendungsId, AvisoID)
|
||||
If f IsNot Nothing Then
|
||||
AddHandler f.FormClosed, Sub()
|
||||
PARENT_FRMHAUPTFENSTER.btnRefresh.PerformClick()
|
||||
End Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
If gridAviso.SelectedRows.Count = 0 Then Exit Sub
|
||||
@@ -1421,46 +1261,6 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
|
||||
|
||||
|
||||
Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged
|
||||
If Grid_aktiv Then
|
||||
'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
|
||||
If sender Is cboMyAvisoAnzeige Then
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
|
||||
Grid_aktiv = False
|
||||
If cboMyAvisoAnzeige._value = "T1" Then
|
||||
cboMy_QS.CheckState = CheckState.Checked
|
||||
cboMy_VB.CheckState = CheckState.Unchecked
|
||||
Else
|
||||
cboMy_QS.CheckState = CheckState.Indeterminate
|
||||
cboMy_VB.CheckState = CheckState.Indeterminate
|
||||
End If
|
||||
Grid_aktiv = True
|
||||
End If
|
||||
End If
|
||||
|
||||
'DGV anzeigen:
|
||||
Aviso_anzeigen("")
|
||||
End If
|
||||
cboMy_QS.Visible = Not cbx_My_LKW.Checked
|
||||
cboMy_VB.Visible = Not cbx_My_LKW.Checked
|
||||
cboMyAvisoAnzeige.Visible = Not cbx_My_LKW.Checked
|
||||
lblMySND_Anzeige.Visible = Not cbx_My_LKW.Checked
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
btnColor.Visible = Not cbx_My_LKW.Checked
|
||||
Else
|
||||
btnColor.Visible = False
|
||||
End If
|
||||
If cbx_My_LKW.Checked Then
|
||||
' lblMeineAviso.Text = "Meine Aviso:"
|
||||
cbx_My_Brexit.Visible = False
|
||||
Else
|
||||
' lblMeineAviso.Text = "Meine Sendungen:"
|
||||
cbx_My_Brexit.Visible = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub cboImEx_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboImEx.SelectedIndexChanged
|
||||
If Grid_aktiv Then
|
||||
Aviso_anzeigen("")
|
||||
@@ -1473,31 +1273,11 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnColor.Click
|
||||
Private Sub Button13_Click(sender As Object, e As EventArgs)
|
||||
ctxtFarben.Show(Cursor.Position)
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem19_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem19.Click
|
||||
btnColor.BackColor = Color.Red
|
||||
' meineAviso_anzeigen()
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem20_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem20.Click
|
||||
btnColor.BackColor = Color.Orange
|
||||
' meineAviso_anzeigen()
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItem21_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem21.Click
|
||||
btnColor.BackColor = Color.Yellow
|
||||
' meineAviso_anzeigen()
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub ALLEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ALLEToolStripMenuItem.Click
|
||||
btnColor.BackColor = Color.White
|
||||
' meineAviso_anzeigen()
|
||||
End Sub
|
||||
|
||||
|
||||
Function getDateVorschreiben(addDays) As Date
|
||||
@@ -1959,4 +1739,5 @@ Public Class usrCntlHauptfenster_Suche_AVISO
|
||||
'pnlSearch.Visible = Not pnlSearch.Visible
|
||||
initPnlSearch()
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user