AVISO Ansicht, Sendung-Frachtksoten
This commit is contained in:
@@ -188,6 +188,9 @@ Public Class frmHauptfenster
|
||||
'transparentpnl.BackColor = Color.FromArgb(25, Color.Red)
|
||||
' transparentpnl.BackColor = Color.Transparent
|
||||
|
||||
|
||||
|
||||
|
||||
TimerAkte.Enabled = True
|
||||
Grid_aktiv = False
|
||||
|
||||
@@ -227,6 +230,7 @@ Public Class frmHauptfenster
|
||||
|
||||
|
||||
|
||||
|
||||
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)
|
||||
@@ -251,6 +255,7 @@ Public Class frmHauptfenster
|
||||
cboMy_Grenzstelle.changeItem("")
|
||||
|
||||
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")
|
||||
@@ -1091,9 +1096,12 @@ Public Class frmHauptfenster
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
'--- Sendung ---
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 "
|
||||
Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
|
||||
If cboMyAvisoAnzeige._value <> "" Then
|
||||
If cboMyAvisoAnzeige._value = "T1" 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 & "') 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')) "
|
||||
@@ -1120,37 +1128,65 @@ Public Class frmHauptfenster
|
||||
End Select
|
||||
If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
|
||||
|
||||
|
||||
'Farbe
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
Select Case btnColor.BackColor
|
||||
Case Color.Red
|
||||
sqlStr &= " AND (Status = 3 ) "
|
||||
Case Color.Orange
|
||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE()) ) ) "
|
||||
Case Color.Yellow
|
||||
sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 1,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 2,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
|
||||
' sqlStr &= " 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
|
||||
' sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) "
|
||||
' Case Color.Yellow
|
||||
' sqlStr &= " 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
|
||||
|
||||
'''sqlStr &= " AND (Grenzstelle ='???' OR Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
|
||||
''' Funktioniert nciht, wg. WO
|
||||
|
||||
|
||||
sqlStr &= " 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
|
||||
" 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
|
||||
|
||||
'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
|
||||
' " FROM Aviso " &
|
||||
' " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
' " AND Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND (LetzterMitarbeiterId=@maId OR " & inBearbeitungSQL & ") " &
|
||||
' "ORDER BY case " &
|
||||
' " when [Status] =3 then 0 " &
|
||||
' " when [Status] =0 then 1 " &
|
||||
' " when [Status] =99 then 2 " &
|
||||
' " when [Status] =4 then 3 " &
|
||||
' " when [Status] =1 then 4 " &
|
||||
' " when [Status] =5 then 4 " &
|
||||
' " when [Status] =0 then 5 " &
|
||||
' " END, Ankunft"
|
||||
'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
|
||||
' " FROM Aviso " &
|
||||
' " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
' " AND Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND (LetzterMitarbeiterId=@maId OR " & inBearbeitungSQL & ") " &
|
||||
' "ORDER BY case " &
|
||||
' " when [Status] =3 then 0 " &
|
||||
' " when [Status] =0 then 1 " &
|
||||
' " when [Status] =99 then 2 " &
|
||||
' " when [Status] =4 then 3 " &
|
||||
' " when [Status] =1 then 4 " &
|
||||
' " when [Status] =5 then 4 " &
|
||||
' " when [Status] =0 then 5 " &
|
||||
' " END, Ankunft"
|
||||
|
||||
|
||||
'Public Const Status_Erfasst = 0
|
||||
'Public Const Status_Vorbereitet = 4
|
||||
'Public Const Status_Vorgeschrieben = 5
|
||||
'Public Const Status_Freigegeben = 1
|
||||
'Public Const Status_NichtEingetroffen = 2
|
||||
'Public Const Status_Ankunft = 3
|
||||
'Public Const Status_Erfasst = 0
|
||||
'Public Const Status_Vorbereitet = 4
|
||||
'Public Const Status_Vorgeschrieben = 5
|
||||
'Public Const Status_Freigegeben = 1
|
||||
'Public Const Status_NichtEingetroffen = 2
|
||||
'Public Const Status_Ankunft = 3
|
||||
|
||||
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
|
||||
If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts...
|
||||
|
||||
@@ -1373,8 +1409,54 @@ Public Class frmHauptfenster
|
||||
'End If
|
||||
|
||||
|
||||
|
||||
|
||||
'Farbkennung
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
If Not cbx_My_LKW.Checked Then
|
||||
Select Case r.Cells("Status").Value
|
||||
Case "1", "2"
|
||||
' Freigabe, N.Eingetr.
|
||||
Case "3"
|
||||
' Ankunft
|
||||
r.DefaultCellStyle.BackColor = Color.IndianRed
|
||||
Case Else
|
||||
'Alle anderen Status:
|
||||
If r.Cells("VoraussichtlichesEintreffen").Value IsNot DBNull.Value AndAlso IsDate(r.Cells("VoraussichtlichesEintreffen").Value) Then
|
||||
|
||||
Dim VoraussichtlichesEintreffen = CDate(r.Cells("VoraussichtlichesEintreffen").Value)
|
||||
|
||||
'If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.ToShortDateString) Then 'heute
|
||||
' r.DefaultCellStyle.BackColor = Color.IndianRed
|
||||
'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'morgen
|
||||
' r.DefaultCellStyle.BackColor = Color.Orange
|
||||
'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'Ümorgen+ÜÜmorgen
|
||||
' r.DefaultCellStyle.BackColor = Color.LightYellow
|
||||
'End If
|
||||
|
||||
If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.ToShortDateString) Then 'heute
|
||||
r.DefaultCellStyle.BackColor = Color.Orange
|
||||
ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(2).ToShortDateString) Then 'morgen
|
||||
r.DefaultCellStyle.BackColor = Color.LightYellow
|
||||
End If
|
||||
|
||||
Else
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
Next
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
'.Width = gridAviso.Width - gridVermerke.Width
|
||||
'.Sort(.Columns(3), System.ComponentModel.ListSortDirection.Descending)
|
||||
.SelectionMode = DataGridViewSelectionMode.FullRowSelect
|
||||
@@ -1545,7 +1627,7 @@ Public Class frmHauptfenster
|
||||
|
||||
If (gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value Is DBNull.Value OrElse gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value = LeerDatum) AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value IsNot DBNull.Value AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value <= 1 Then
|
||||
'gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.ForeColor = Color.Red
|
||||
gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
|
||||
gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold)
|
||||
End If
|
||||
End Select
|
||||
|
||||
@@ -1846,14 +1928,14 @@ Public Class frmHauptfenster
|
||||
If frmLogin.AnmeldungOK Then
|
||||
|
||||
Try
|
||||
If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
|
||||
avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
|
||||
UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
|
||||
If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then
|
||||
avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert
|
||||
UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont)
|
||||
|
||||
End If
|
||||
Catch ex As Exception
|
||||
End If
|
||||
Catch ex As Exception
|
||||
|
||||
End Try
|
||||
End Try
|
||||
|
||||
If False Then 'NUR AKTUALISIEREN; WENN FENSTER AKTIV --> bei 2. Monitor PROBLEM
|
||||
Try
|
||||
@@ -2190,32 +2272,32 @@ Public Class frmHauptfenster
|
||||
End If
|
||||
|
||||
|
||||
'Select Case VERAG_PROG_ALLGEMEIN.cAviso.getFirmaByAvisoId(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
'Select Case VERAG_PROG_ALLGEMEIN.cAviso.getFirmaByAvisoId(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
|
||||
' Case "ATILLA"
|
||||
' If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then
|
||||
' Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu)
|
||||
' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' Else
|
||||
' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' End If
|
||||
' End If
|
||||
' End If
|
||||
' Case Else
|
||||
' Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails)
|
||||
' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' Else
|
||||
' usrcntl.changeCurrentSndId()
|
||||
' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' End If
|
||||
' End If
|
||||
'End Select
|
||||
' Case "ATILLA"
|
||||
' If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then
|
||||
' Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu)
|
||||
' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' Else
|
||||
' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' End If
|
||||
' End If
|
||||
' End If
|
||||
' Case Else
|
||||
' Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails)
|
||||
' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' Else
|
||||
' usrcntl.changeCurrentSndId()
|
||||
' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown)
|
||||
' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
' End If
|
||||
' End If
|
||||
'End Select
|
||||
|
||||
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
|
||||
@@ -2425,19 +2507,19 @@ Public Class frmHauptfenster
|
||||
End If
|
||||
|
||||
btnWichtigeStandort.Visible = False
|
||||
Panel2.Visible = False
|
||||
Label4.Visible = False
|
||||
cboGrenzstelle.Visible = False
|
||||
BürgschaftenExcelToolStripMenuItem.Visible = True
|
||||
ToolStripMenuItem4.Visible = True
|
||||
ToolStripMenuItem5.Visible = True
|
||||
ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
|
||||
'btnGenerelleGestellungen.Visible = False
|
||||
ToolStripMenuItem4.Visible = True
|
||||
ToolStripMenuItem5.Visible = True
|
||||
ToolStripMenuItem6.Visible = True
|
||||
Else 'VERAG
|
||||
BürgschaftenExcelToolStripMenuItem.Visible = True
|
||||
Panel2.Visible = False
|
||||
Label4.Visible = False
|
||||
cboGrenzstelle.Visible = False
|
||||
BürgschaftenExcelToolStripMenuItem.Visible = True
|
||||
ToolStripMenuItem4.Visible = True
|
||||
ToolStripMenuItem5.Visible = True
|
||||
ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
|
||||
'btnGenerelleGestellungen.Visible = False
|
||||
ToolStripMenuItem4.Visible = True
|
||||
ToolStripMenuItem5.Visible = True
|
||||
ToolStripMenuItem6.Visible = True
|
||||
Else 'VERAG
|
||||
BürgschaftenExcelToolStripMenuItem.Visible = True
|
||||
ToolStripMenuItem4.Visible = True
|
||||
ToolStripMenuItem5.Visible = True
|
||||
ToolStripMenuItem6.Visible = True
|
||||
@@ -2445,13 +2527,32 @@ Public Class frmHauptfenster
|
||||
Button5.Visible = True
|
||||
End If
|
||||
End If
|
||||
If SplitContainer2.Width > 800 Then
|
||||
'SplitContainer2.Panel2MinSize = 600
|
||||
SplitContainer2.SplitterDistance = 130 'SplitContainer2.Width - 750
|
||||
If SplitContainer2.Panel2.Width > 1200 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 1200 '__> DAS"!!!
|
||||
' If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900
|
||||
|
||||
|
||||
|
||||
'Wenn Teamzuweisung --> Backoffice --> Meine Senungen größer!
|
||||
If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId, 0) > 0 Then
|
||||
splitMain.SplitterDistance = CInt(splitMain.Height / 2)
|
||||
Else
|
||||
|
||||
|
||||
End If
|
||||
|
||||
'If SplitContainer2.Width > 800 Then
|
||||
' 'SplitContainer2.Panel2MinSize = 600
|
||||
' SplitContainer2.SplitterDistance = 130 'SplitContainer2.Width - 750
|
||||
' If SplitContainer2.Panel2.Width > 1200 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 1200 '__> DAS"!!!
|
||||
' ' If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900
|
||||
'End If
|
||||
|
||||
If SplitContainer2.Width > 1000 Then
|
||||
SplitContainer2.SplitterDistance = 350 'SplitContainer2.Width - 750
|
||||
Else
|
||||
SplitContainer2.SplitterDistance = 160 'SplitContainer2.Width - 750
|
||||
End If
|
||||
|
||||
|
||||
|
||||
If My.Computer.Screen.WorkingArea.Width < 1300 Then
|
||||
'tabAnkunft.Text = "ANKUNFT."
|
||||
'tabErfasst.Text = "ERFASST"
|
||||
@@ -2464,6 +2565,10 @@ Public Class frmHauptfenster
|
||||
End If
|
||||
tbcntrAviso.Width = Panel1.Width
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
|
||||
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
WithEvents timerStart As New Timer
|
||||
@@ -3655,6 +3760,11 @@ Public Class frmHauptfenster
|
||||
cboMyAvisoAnzeige.Visible = Not cbx_My_LKW.Checked
|
||||
Label17.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:"
|
||||
Else
|
||||
@@ -3824,7 +3934,7 @@ Public Class frmHauptfenster
|
||||
End Sub
|
||||
|
||||
Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click
|
||||
CHMRC.VATTEST(InputBox("Token"))
|
||||
cHMRC.VATTEST(InputBox("Token"))
|
||||
End Sub
|
||||
|
||||
Private Sub GVMSUKIMportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSUKIMportToolStripMenuItem.Click
|
||||
@@ -4018,6 +4128,42 @@ Public Class frmHauptfenster
|
||||
Private Sub GüterlisteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GüterlisteToolStripMenuItem.Click
|
||||
Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Gueterlisten/gueterlisten_node.html")
|
||||
End Sub
|
||||
|
||||
Private Sub DTBToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DTBToolStripMenuItem.Click
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = sender.text
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = sender.text 'Nochmal, sonst wird es durch MA geändert
|
||||
showMeNew()
|
||||
Else
|
||||
MsgBox("Keine Berechtigung!")
|
||||
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
|
||||
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
|
||||
End Class
|
||||
|
||||
Public Class AvisoStatusFunctions
|
||||
@@ -5648,20 +5794,26 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
SENDUNG_TMP.saveSachbearbeiter = True
|
||||
|
||||
If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then
|
||||
If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then ' VB gesetzt!
|
||||
SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
||||
SENDUNG_TMP.tblSnd_FilialeAbklaerung = VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
|
||||
' SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
||||
'End If
|
||||
|
||||
|
||||
'Lt. Bespr. ML und TW (6.10.22) --> wenn VBQS gesetzt, soll MA leer sein:
|
||||
SENDUNG_TMP.LetzterMitarbeiter = ""
|
||||
SENDUNG_TMP.LetzterMitarbeiterId = -1
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERIMEX" Then
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
|
||||
End If
|
||||
SENDUNG_TMP.tblSnd_Vorbereitet = Now 'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
|
||||
AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
Else
|
||||
SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
|
||||
AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
Else
|
||||
SENDUNG_TMP.tblSnd_Vorbereitet = Nothing
|
||||
AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))
|
||||
End If
|
||||
Return SENDUNG_TMP.SAVE()
|
||||
@@ -6283,7 +6435,7 @@ Public Class AvisoStatusFunctions
|
||||
myVermerk.VermerkCodeId = VermerkCodeId
|
||||
Dim VermerkeDAL As New cVermerkeDAL
|
||||
VermerkeDAL.SpeichernVermerk(myVermerk)
|
||||
frmHauptfenster.Details_anzeigen(AvisoID)
|
||||
If frmHauptfenster IsNot Nothing Then frmHauptfenster.Details_anzeigen(AvisoID)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user