Aviso Redesign

This commit is contained in:
2026-03-27 10:08:20 +01:00
parent 0e00ec3a2a
commit d134027977
122 changed files with 2696 additions and 1394 deletions

View File

@@ -16,6 +16,7 @@ Public Class usrCntlHauptfenster_Suche_SND
Private FUNC As New AvisoStatusFunctions
Dim OptionenDAL As New VERAG_PROG_ALLGEMEIN.cOptionenDAL
Dim sd = 0
Dim closeOK = False
Dim Fullscreen = False
@@ -45,6 +46,12 @@ Public Class usrCntlHauptfenster_Suche_SND
'pnlSearch.Height = 145
PARENT_FRMHAUPTFENSTER = PARENT_FRMHAUPTFENSTER
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
btnColor.Visible = True 'Not cbx_My_LKW.Checked
Else
btnColor.Visible = False
End If
' txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
@@ -131,9 +138,9 @@ Public Class usrCntlHauptfenster_Suche_SND
SucheStandort = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
cbx_My_Brexit.Checked = True
End If
'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
' cbx_My_Brexit.Checked = True
'End If
@@ -141,6 +148,21 @@ Public Class usrCntlHauptfenster_Suche_SND
TimerAkte.Enabled = True
'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
' pnlSearch.Visible = False
initPnlSearch()
Grid_aktiv = True
@@ -270,28 +292,36 @@ Public Class usrCntlHauptfenster_Suche_SND
.Columns("tblSnd_Status").Visible = False
.Columns("tblSnd_Status").Visible = False
.Columns("tblSnd_Abfertigungsart_ID").Visible = False
.Columns("tblSnd_Zollsystem_Land").Visible = False
.Columns("tblSnd_Vorgeschrieben").Visible = False
.Columns("tblSnd_Vorbereitet").Visible = False
.Columns("tblSnd_SendungID").Visible = False
.Columns("tblSnd_Fremdspedition").Visible = False
.Columns("tblSnd_FremdspeditionText").Visible = False
.Columns("tblSnd_Abfertigungsart_ID").Visible = False
.Columns("tblSnd_Zollsystem_Land").Visible = False
.Columns("tblSnd_Vorgeschrieben").Visible = False
.Columns("tblSnd_Vorbereitet").Visible = False
.Columns("tblSnd_SendungID").Visible = False
.Columns("tblSnd_Fremdspedition").Visible = False
.Columns("tblSnd_FremdspeditionText").Visible = False
.Columns("tblSnd_Empfaenger").MinimumWidth = 80
.Columns("tblSnd_Empfaenger").HeaderText = "Empfaenger"
.Columns("tblSnd_Empfaenger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("tblSnd_Absender").MinimumWidth = 80
.Columns("tblSnd_Absender").HeaderText = "Absender"
.Columns("tblSnd_Absender").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("VoraussichtlichesEintreffen").Width = 55
.Columns("VoraussichtlichesEintreffen").HeaderText = "Eintreffen"
.Columns("VoraussichtlichesEintreffen").DefaultCellStyle.Format = "dd.MM."
.Columns("tblSnd_Empfaenger").MinimumWidth = 80
.Columns("tblSnd_Empfaenger").HeaderText = "Empfaenger"
.Columns("tblSnd_Empfaenger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
' .Columns("Vermerke_Anzahl").Width = 60
' .Columns("Vermerke_Anzahl").HeaderText = "Vermerke"
' .Columns("Vermerke_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("AbfertigungsNr").Width = 110
.Columns("tblSnd_Avisierer").MinimumWidth = 80
.Columns("tblSnd_Avisierer").HeaderText = "Avisierer"
.Columns("tblSnd_Avisierer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("VoraussichtlichesEintreffen").Width = 55
.Columns("VoraussichtlichesEintreffen").HeaderText = "Eintreffen"
.Columns("VoraussichtlichesEintreffen").DefaultCellStyle.Format = "dd.MM."
' .Columns("Vermerke_Anzahl").Width = 60
' .Columns("Vermerke_Anzahl").HeaderText = "Vermerke"
' .Columns("Vermerke_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("AbfertigungsNr").Width = 110
.Columns("AbfertigungsNr").HeaderText = "Pos-Nr."
.Columns("AbfertigungsNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft
.Columns("AbfertigungsNr").Visible = False
@@ -533,6 +563,9 @@ Public Class usrCntlHauptfenster_Suche_SND
If AVISO_TYP = "SND" Then
Dim AMBAR_AnzeigenSQL As String = " (tblSendungen.FilialenNr IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) "
'----------------------------------------------------------------------------------------------------------------------------------
'--- Sendung ---
'----------------------------------------------------------------------------------------------------------------------------------
@@ -548,7 +581,7 @@ Public Class usrCntlHauptfenster_Suche_SND
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)) ) "
OR Grenzstelle IN('SBG') OR (" & AMBAR_AnzeigenSQL & ") ) "
Else
inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
@@ -557,13 +590,12 @@ Public Class usrCntlHauptfenster_Suche_SND
End If
Dim hSQLFirma = ""
hSQL = " SELECT " & top & " 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 ,tblSnd_Zollsystem_Land " &
" ,tblSnd_Absender ,tblSnd_Empfaenger,tblSnd_Avisierer,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText ,tblSnd_Zollsystem_Land " &
" 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 & ") "
hSQLFirma & " AND ( (" & inBearbeitungSQL & ") OR (" & AMBAR_AnzeigenSQL & ")) "
Select Case cboMy_VB.CheckState
Case CheckState.Checked : hSQL &= " AND tblSnd_Vorgeschrieben is not null "
@@ -579,13 +611,34 @@ Public Class usrCntlHauptfenster_Suche_SND
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') "
If txtEmpfänger.Text <> "" Then hSQL &= " AND tblSnd_Empfaenger LIKE '" & txtEmpfänger.Text.Replace("*", "%") & "%' "
If txtAbsender.Text <> "" Then hSQL &= " AND tblSnd_Absender LIKE '" & txtAbsender.Text.Replace("*", "%") & "%' "
If txtAuftraggeber.Text <> "" Then hSQL &= " AND tblSnd_Auftraggeber LIKE '" & txtAuftraggeber.Text.Replace("*", "%") & "%' "
If txtKdAuftragsnr.Text <> "" Then hSQL &= " AND (tblSnd_KdAuftragsNr LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrAvisierer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrEmpfaenger LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrFrachtfuehrer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%') "
If cboFiliale._value <> "" Then hSQL &= " AND FilialenNr ='" & cboFiliale._value & "'"
If txtAbfertigungsnummer.Text <> "" Then hSQL &= " AND AbfertigungsNr LIKE '" & txtAbfertigungsnummer.Text.Replace("*", "%") & "' "
If txtlkwId.Text <> "" Then hSQL &= " AND tblSnd_AvisoID LIKE '" & txtlkwId.Text & "' "
Select Case cbxLoseSnd.CheckState
Case CheckState.Unchecked : hSQL &= " AND tblSnd_AvisoID > 0 "
Case CheckState.Checked : hSQL &= " AND tblSnd_AvisoID <=0 "
Case CheckState.Indeterminate
End Select
Select Case tbcntrAvisoSND.SelectedTab.Name
Case "tbSndOffen" : hSQL &= " AND tblSnd_Status IN( '" & VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Erfasst & "','" & VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_InBearbeitung & "','" & VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Eingereicht & "','" & VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ankunft & "') "
Case "tbSndFreigegeben" : hSQL &= " AND tblSnd_Status IN( '" & VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_Ueberlassen & "') "
Case "tbSndNichtEingetroffen" : hSQL &= " AND tblSnd_Status IN( '" & VERAG_PROG_ALLGEMEIN.cGlobal.SND_Status_NichtEingetroffen & "') "
Case Else 'tbSndAlle
End Select
' 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
@@ -621,7 +674,7 @@ Public Class usrCntlHauptfenster_Suche_SND
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
'MsgBox(hSQL)
' MsgBox(hSQL)
'If hSort = "" Then
'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC"
' Else
@@ -791,18 +844,18 @@ Public Class usrCntlHauptfenster_Suche_SND
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 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
Dim f = FUNC.openSnd(SendungsId, AvisoID)
If f IsNot Nothing Then
AddHandler f.FormClosed, Sub()
PARENT_FRMHAUPTFENSTER.btnRefresh.PerformClick()
End Sub
End If
If gridAviso.SelectedRows.Count = 0 Then Exit Sub
If gridAviso.SelectedRows.Count = 0 Then Exit Sub
End Sub
@@ -813,70 +866,16 @@ Public Class usrCntlHauptfenster_Suche_SND
' lblAkte.Visible = False
End Sub
Private Sub cboTeams_SelectedIndexChanged(sender As Object, e As EventArgs)
If Grid_aktiv Then
' SucheStandort = cboGrenzstelle._value.Replace("ALLE", "")
Aviso_anzeigen("")
End If
Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged
Aviso_anzeigen("")
End Sub
Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, 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 = True 'Not cbx_My_LKW.Checked
'cboMy_VB.Visible = True 'Not cbx_My_LKW.Checked
'cboMyAvisoAnzeige.Visible = True 'Not cbx_My_LKW.Checked
'lblMySND_Anzeige.Visible = True 'Not cbx_My_LKW.Checked
'cbx_My_Brexit.Visible = True
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
btnColor.Visible = True '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)
If Grid_aktiv Then
Aviso_anzeigen("")
End If
End Sub
Private Sub txtBestimmungszollstelle_VALUE_CHANGED()
If Grid_aktiv Then
Aviso_anzeigen("")
End If
End Sub
Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnColor.Click
ctxtFarben.Show(Cursor.Position)
End Sub
Private Sub ToolStripMenuItem19_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem19.Click
@@ -1347,7 +1346,7 @@ Public Class usrCntlHauptfenster_Suche_SND
End Sub
Private Sub btnDetailsuche_Click(sender As Object, e As EventArgs) Handles btnDetailsuche.Click
Private Sub btnDetailsuche_Click(sender As Object, e As EventArgs)
'pnlSearch.Visible = Not pnlSearch.Visible
initPnlSearch()
End Sub
@@ -1371,4 +1370,24 @@ Public Class usrCntlHauptfenster_Suche_SND
Aviso_anzeigen("")
Grid_aktiv = True
End Sub
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
Aviso_anzeigen("")
End Sub
Private Sub txtAbfertigungsnummer_TextChanged(sender As Object, e As EventArgs) Handles cbxLoseSnd.CheckStateChanged, txtAbfertigungsnummer.Leave, txtKdAuftragsnr.Leave, txtlkwId.Leave,
txtAuftraggeber.Leave, txtAbsender.Leave, txtEmpfänger.Leave, txtAvisierer.Leave, cboFiliale.SelectedIndexChanged
Aviso_anzeigen("")
End Sub
Private Sub tbcntrAvisoSND_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tbcntrAvisoSND.SelectedIndexChanged
Aviso_anzeigen("")
End Sub
Private Sub btnNeu_Click_1(sender As Object, e As EventArgs) Handles btnNeu.Click
End Sub
End Class