divers layout, etc
This commit is contained in:
@@ -87,11 +87,20 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
|
||||
|
||||
cboMyAvisoAnzeige.Items.Clear()
|
||||
cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
|
||||
cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE (" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & ")", "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.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
|
||||
' BREXITToolStripMenuItem.Visible = True
|
||||
cbx_My_Brexit.Checked = True
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", "AVISO") Then
|
||||
cbx_My_CBAM.Checked = True
|
||||
End If
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
|
||||
cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1-Sendungen", "T1"))
|
||||
@@ -166,6 +175,26 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
' pnlSearch.Visible = False
|
||||
initPnlSearch()
|
||||
Grid_aktiv = True
|
||||
|
||||
Aviso_anzeigen("")
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub keydownMyAviso(sender As Object, e As KeyEventArgs) Handles gridAviso.KeyUp
|
||||
Try
|
||||
|
||||
If e.KeyCode = Keys.Up Or e.KeyCode = Keys.Down Or e.KeyCode = Keys.PageUp Or e.KeyCode = Keys.PageDown Or e.KeyCode = Keys.Return Or e.KeyCode = Keys.Enter Then
|
||||
If sender.selectedRows.count = 0 Then Exit Sub
|
||||
Dim tmpId = CInt(sender.selectedRows(0).Cells("AvisoId").Value)
|
||||
Dim tmpSndId = CInt(sender.selectedRows(0).Cells("tblSnd_SendungID").Value)
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = tmpSndId
|
||||
frmHauptfensterNew.REFRESH_AVISO_MAIN(,, Me.GetType().Name)
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -587,10 +616,17 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
|
||||
End If
|
||||
End If
|
||||
Else
|
||||
inBearbeitungSQL = " 1=1 " 'ALLE ANZEIGEN
|
||||
End If
|
||||
|
||||
|
||||
Dim hSQLFirma = ""
|
||||
|
||||
|
||||
hSQLFirma = " AND Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' "
|
||||
|
||||
|
||||
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_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 " &
|
||||
@@ -615,6 +651,10 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
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 cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then hSQL &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
|
||||
|
||||
|
||||
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("*", "%") & "%' "
|
||||
@@ -737,27 +777,27 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
' btnÜbernehmen.Visible = True
|
||||
Grid_aktiv = True
|
||||
'Aviso_anzeigen("")
|
||||
If VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID <= 0 Then
|
||||
If gridAviso.RowCount > 0 Then gridAviso.Rows(0).Selected = True
|
||||
End If
|
||||
'If VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID <= 0 Then
|
||||
' If gridAviso.RowCount > 0 Then gridAviso.Rows(0).Selected = True
|
||||
'End If
|
||||
|
||||
gridAviso.SetOrder()
|
||||
Details_aktiv = True
|
||||
|
||||
If showDetails Then
|
||||
If gridAviso.SelectedRows.Count > 0 Then
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = gridAviso.SelectedRows(0).Cells("AvisoID").Value
|
||||
End If
|
||||
PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
End If
|
||||
'If showDetails Then
|
||||
' If gridAviso.SelectedRows.Count > 0 Then
|
||||
' VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = gridAviso.SelectedRows(0).Cells("AvisoID").Value
|
||||
' End If
|
||||
' PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
'End If
|
||||
' If chkFarben Then GridZeichnenAviso()
|
||||
|
||||
lblDauer.Text = "" & hDifferenz.ToString & " ms"
|
||||
|
||||
lblEintraege.Text = gridAviso.RowCount & " Einträge" & If(gridAviso.RowCount = 2000, " (begrenzt)", "")
|
||||
|
||||
|
||||
|
||||
avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID, , False)
|
||||
' MsgBox(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID)
|
||||
'lblDauer.Text = "Dauer Anzeige aufbauen: " & hDifferenz.ToString & " ms"
|
||||
End Sub
|
||||
|
||||
@@ -964,8 +1004,10 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
Function setAkive_AuswahlID() As Integer
|
||||
If gridAviso.SelectedRows.Count > 0 Then
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = CInt(gridAviso.Rows(gridAviso.SelectedRows(0).Index).Cells("AvisoID").Value)
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = CInt(gridAviso.Rows(gridAviso.SelectedRows(0).Index).Cells("tblSnd_SendungID").Value)
|
||||
Else
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = -1
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
|
||||
End If
|
||||
|
||||
'If gridMyAviso.SelectedRows.Count > 0 Then
|
||||
@@ -980,7 +1022,7 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
' VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = -1
|
||||
'End If
|
||||
|
||||
Return VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID
|
||||
Return VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID
|
||||
End Function
|
||||
|
||||
Public Sub GridZeichnenAviso()
|
||||
@@ -1031,31 +1073,17 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
|
||||
|
||||
|
||||
Public Sub avisoAktualisierenAktiveIdBehalten(tmpid As Integer, Optional aktWithoutCheckTime As Boolean = False, Optional Aviso_anzeigenBool As Boolean = True)
|
||||
Public Sub avisoAktualisierenAktiveIdBehalten(tmpid As Integer, Optional aktWithoutCheckTime As Boolean = False, Optional Aviso_anzeigenBool As Boolean = True, Optional refreshPnlRight As Boolean = True)
|
||||
|
||||
PARENT_FRMHAUPTFENSTER.pic.Visible = False
|
||||
Try
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = tmpid
|
||||
' MsgBox(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID)
|
||||
If Not Grid_aktiv Then Exit Sub
|
||||
Details_aktiv = False
|
||||
|
||||
|
||||
|
||||
' If Aviso_anzeigenBool Then PARENT_FRMHAUPTFENSTER.initsearch("", False)
|
||||
|
||||
|
||||
If AVISO_TYP = "LKW" Then
|
||||
gridAviso.ClearSelection()
|
||||
For Each r As DataGridViewRow In gridAviso.Rows
|
||||
If CInt(r.Cells("AvisoId").Value) = tmpid Then
|
||||
' gridMyAviso.ClearSelection()
|
||||
gridAviso.CurrentCell = r.Cells("Status")
|
||||
r.Selected = True : Exit For
|
||||
End If
|
||||
Next
|
||||
Else
|
||||
gridAviso.ClearSelection()
|
||||
gridAviso.ClearSelection()
|
||||
If gridAviso.Rows.Count > 0 Then
|
||||
For Each r As DataGridViewRow In gridAviso.Rows
|
||||
If CInt(r.Cells("tblSnd_SendungID").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID Then
|
||||
@@ -1064,35 +1092,36 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
End If
|
||||
Next
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpid
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = tmpid
|
||||
Details_aktiv = True
|
||||
|
||||
If PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls.Count > 0 Then
|
||||
'If refreshPnlRight Then
|
||||
' If PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls.Count > 0 Then
|
||||
|
||||
Dim usrcntlAvisoID = -1
|
||||
Dim usrcntlAktiv As DateTime
|
||||
If Not PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0).GetType = GetType(System.Windows.Forms.Label) Then
|
||||
If PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0).Name = "usrcntlAktDetailsATILLANeu" Then
|
||||
usrcntlAvisoID = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).AvisoID
|
||||
usrcntlAktiv = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).aktiv
|
||||
Else
|
||||
usrcntlAvisoID = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetails).AvisoID
|
||||
usrcntlAktiv = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetails).aktiv
|
||||
End If
|
||||
' Dim usrcntlAvisoID = -1
|
||||
' Dim usrcntlAktiv As DateTime
|
||||
' If Not PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0).GetType = GetType(System.Windows.Forms.Label) Then
|
||||
' If PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0).Name = "usrcntlAktDetailsATILLANeu" Then
|
||||
' usrcntlAvisoID = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).AvisoID
|
||||
' usrcntlAktiv = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu).aktiv
|
||||
' Else
|
||||
' usrcntlAvisoID = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetails).AvisoID
|
||||
' usrcntlAktiv = DirectCast(PARENT_FRMHAUPTFENSTER.pnlDetailsRechts.Controls(0), usrcntlAktDetails).aktiv
|
||||
' End If
|
||||
|
||||
If aktWithoutCheckTime Or usrcntlAvisoID <> tmpid Then
|
||||
PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
Else
|
||||
If DateDiff(DateInterval.Second, usrcntlAktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
|
||||
PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
' If aktWithoutCheckTime Or usrcntlAvisoID <> tmpid Then
|
||||
' PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' Else
|
||||
' If DateDiff(DateInterval.Second, usrcntlAktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
|
||||
' PARENT_FRMHAUPTFENSTER.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' End If
|
||||
' End If
|
||||
' End If
|
||||
' End If
|
||||
|
||||
End If
|
||||
'End If
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG")
|
||||
End Try
|
||||
@@ -1150,7 +1179,8 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
End If
|
||||
ElseIf e.Button = MouseButtons.Left Then
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId
|
||||
avisoAktualisierenAktiveIdBehalten(tmpId, , False)
|
||||
frmHauptfensterNew.REFRESH_AVISO_MAIN(tmpId,, Me.GetType().Name)
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -1170,13 +1200,14 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
Case "StatusVorgeschrieben"
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
If FUNC.setSendungVorgeschrieben(SendungsId, AvisoID) Then
|
||||
avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
|
||||
frmHauptfensterNew.REFRESH_AVISO_MAIN(tmpId, SendungsId, Me.GetType().Name)
|
||||
End If
|
||||
Me.Cursor = Cursors.Default
|
||||
Case "StatusVorbereitetQS"
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
If FUNC.setSendungVorbereitetQS(SendungsId, AvisoID) Then
|
||||
avisoAktualisierenAktiveIdBehalten(AvisoID, True, True) 'Aviso_anzeigen("")
|
||||
frmHauptfensterNew.REFRESH_AVISO_MAIN(tmpId, SendungsId, Me.GetType().Name)
|
||||
|
||||
End If
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
@@ -1359,26 +1390,29 @@ Public Class usrCntlHauptfenster_Suche_SND
|
||||
Grid_aktiv = False
|
||||
cboMy_QS.CheckState = CheckState.Unchecked
|
||||
cboMy_VB.CheckState = CheckState.Indeterminate
|
||||
Aviso_anzeigen("")
|
||||
Grid_aktiv = True
|
||||
Aviso_anzeigen("")
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
Grid_aktiv = False
|
||||
cboMy_QS.CheckState = CheckState.Checked
|
||||
cboMy_VB.CheckState = CheckState.Unchecked
|
||||
Aviso_anzeigen("")
|
||||
Grid_aktiv = True
|
||||
Aviso_anzeigen("")
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
|
||||
Grid_aktiv = True
|
||||
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
|
||||
txtAuftraggeber.Leave, txtAbsender.Leave, txtEmpfänger.Leave, txtAvisierer.Leave, cboFiliale.SelectedIndexChanged,
|
||||
cbx_My_Brexit.CheckedChanged, cbx_My_CBAM.CheckedChanged
|
||||
Aviso_anzeigen("")
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user