neu
This commit is contained in:
@@ -344,6 +344,7 @@ Public Class usrcntlAktDetails
|
||||
.Columns("Hinweis_Vermerk").Visible = False 'Hinweis_Vermerk nicht anzeigen
|
||||
.Columns("tblSnd_Empfaenger").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("Hervorheben").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("VorauskasseId").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
|
||||
.Columns("Datum").Width = 125 '110
|
||||
.Columns("Datum").HeaderText = "Datum"
|
||||
@@ -627,6 +628,10 @@ Public Class usrcntlAktDetails
|
||||
|
||||
Private Sub Vermerke_anzeigen(Optional rowindex As Integer = -1)
|
||||
If Not loaded Then Exit Sub
|
||||
|
||||
picArrowDown.Visible = False
|
||||
|
||||
|
||||
aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick)
|
||||
gridVermerke.Columns.Clear()
|
||||
lblInfoAviso.Visible = False
|
||||
@@ -634,7 +639,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
' If setAkive_AuswahlID() = -1 Then Exit Sub
|
||||
If AvisoID <= 0 Then Exit Sub
|
||||
|
||||
pnlMAInfo.Visible = False
|
||||
Button18.Visible = False
|
||||
Select Case tbcntlVermerke.SelectedIndex
|
||||
Case 0, 1, 2 : Vermerke_anzeigen2(rowindex)
|
||||
@@ -690,7 +695,6 @@ Public Class usrcntlAktDetails
|
||||
|
||||
End With
|
||||
End Select
|
||||
|
||||
ArrowDown_ShowHide()
|
||||
|
||||
End Sub
|
||||
@@ -727,13 +731,58 @@ Public Class usrcntlAktDetails
|
||||
' End If
|
||||
|
||||
Case 2
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
picMAinfo_VorbereitetQs.BackgroundImage = My.Resources.statusBtn_vorbereitet_InAktiv
|
||||
txtMAinfo_VorbereitetQs.Text = "-"
|
||||
txtMAinfo_VorbereitetQs.Tag = ""
|
||||
|
||||
picMAinfo_Vorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_InAktiv
|
||||
txtMAinfo_Vorgeschrieben.Text = "-"
|
||||
txtMAinfo_Vorgeschrieben.Tag = ""
|
||||
|
||||
If dgvSendungen.SelectedRows.Count > 0 Then
|
||||
sendwhere = " AND VermerkArt='S' AND SendungID=" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
|
||||
|
||||
|
||||
'---------------------------------------------------------
|
||||
'MA INFO
|
||||
'---------------------------------------------------------
|
||||
'Vorbereitet
|
||||
pnlMAInfo.Visible = True
|
||||
If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
|
||||
picMAinfo_VorbereitetQs.BackgroundImage = My.Resources.statusBtn_vorbereitet_Aktiv
|
||||
txtMAinfo_VorbereitetQs.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_QS_MA").Value & "'", "ADMIN", "-")
|
||||
txtMAinfo_VorbereitetQs.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_QS_MA").Value
|
||||
End If
|
||||
'---------------------------------------------------------
|
||||
'Vorgeschrieben
|
||||
pnlMAInfo.Visible = True
|
||||
If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then
|
||||
picMAinfo_Vorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_Aktiv
|
||||
txtMAinfo_Vorgeschrieben.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_VG_MA").Value & "'", "ADMIN", "-")
|
||||
txtMAinfo_Vorgeschrieben.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_VG_MA").Value
|
||||
End If
|
||||
'---------------------------------------------------------
|
||||
Else
|
||||
sendwhere = " AND 1=0 " ' 1=0, damit keine Zeile angezeigt wird, wenn keine Sendung ausgewählt
|
||||
End If
|
||||
|
||||
If gridVermerke.Columns("tblSnd_PosUnterNr") IsNot Nothing Then gridVermerke.Columns("tblSnd_PosUnterNr").Visible = True
|
||||
|
||||
|
||||
'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
|
||||
'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 Select
|
||||
|
||||
End If
|
||||
@@ -742,7 +791,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
|
||||
Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben," &
|
||||
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter]" &
|
||||
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId" &
|
||||
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
|
||||
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
|
||||
" WHERE AvisoID = " & AvisoID & " " & sendwhere & " " &
|
||||
@@ -847,6 +896,9 @@ Public Class usrcntlAktDetails
|
||||
Case "13"
|
||||
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
|
||||
myVermerk.VermerkCodeId = 14
|
||||
If gridVermerke.Rows(e.RowIndex).Cells("VorauskasseId").Value IsNot DBNull.Value Then
|
||||
myVermerk.VorauskasseId = gridVermerke.Rows(e.RowIndex).Cells("VorauskasseId").Value
|
||||
End If
|
||||
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
|
||||
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
|
||||
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
|
||||
@@ -930,8 +982,20 @@ Public Class usrcntlAktDetails
|
||||
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
|
||||
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
|
||||
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
|
||||
Case "80"
|
||||
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("folgt", "erhalten")
|
||||
myVermerk.VermerkCodeId = 81
|
||||
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
|
||||
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
|
||||
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
|
||||
|
||||
|
||||
'Ankunft
|
||||
If vbYes = MsgBox("Soll der LKW auf Status 'ANKUNFT' gesetzt werden?", vbYesNoCancel) Then
|
||||
If FUNC.setAnkunft(AvisoID) Then
|
||||
frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
End If
|
||||
End If
|
||||
End Select
|
||||
loaded = False
|
||||
' Dim tmpIndex = -1
|
||||
@@ -1000,9 +1064,17 @@ Public Class usrcntlAktDetails
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen."
|
||||
End If
|
||||
Case 13
|
||||
If Not existCodeInGridVermerke(14) And Not existCodeInGridVermerke(59) Then
|
||||
optionCell.Value = "Vorauskasse erhalten"
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen."
|
||||
If r.Cells("VorauskasseId").Value IsNot DBNull.Value Then
|
||||
|
||||
If Not existCodeInGridVermerke_VK(r.Cells("VorauskasseId").Value) Then
|
||||
optionCell.Value = "Vorauskasse erhalten"
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen."
|
||||
End If
|
||||
Else
|
||||
If Not existCodeInGridVermerke_VK_OLD(r.Cells("SendungID").Value) Then
|
||||
optionCell.Value = "Vorauskasse erhalten"
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen."
|
||||
End If
|
||||
End If
|
||||
Case 17
|
||||
If Not existCodeInGridVermerke(18) Then
|
||||
@@ -1061,13 +1133,19 @@ Public Class usrcntlAktDetails
|
||||
optionCell.Value = "Absend.best. erhalten"
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen."
|
||||
End If
|
||||
|
||||
Case 80
|
||||
If Not existCodeInGridVermerke(81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
|
||||
optionCell.Value = "ATB-Nr. erhalten"
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATB-Nr. erhalten' einzutragen."
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
|
||||
|
||||
Next
|
||||
|
||||
|
||||
' ArrowDown_ShowHide() 'Anzeigeproblem, wenn Aviso minimiert wird! --> Jetzt bei Timer!
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message & ex.StackTrace)
|
||||
@@ -1084,7 +1162,7 @@ Public Class usrcntlAktDetails
|
||||
For Each r As DataGridViewRow In gridVermerke.Rows
|
||||
If r.Displayed Then showFirst = True
|
||||
If showFirst Then
|
||||
If r.Cells("Hervorheben").Value = "1" AndAlso Not r.Displayed Then
|
||||
If (r.Cells("Hervorheben").Value = "1" Or r.Cells("VermerkeOptions").Value <> "") AndAlso Not r.Displayed Then
|
||||
picArrowDown.Visible = True
|
||||
End If
|
||||
End If
|
||||
@@ -1119,6 +1197,34 @@ Public Class usrcntlAktDetails
|
||||
End Function
|
||||
|
||||
|
||||
Function existCodeInGridVermerke_VK(VorauskasseId As Object) As Boolean
|
||||
|
||||
For Each r As DataGridViewRow In gridVermerke.Rows
|
||||
Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "")
|
||||
Case 14, 59
|
||||
If DirectCast(r.Cells("VorauskasseId"), DataGridViewTextBoxCell).Value.ToString = CStr(VorauskasseId) Then
|
||||
Return True
|
||||
End If
|
||||
End Select
|
||||
Next
|
||||
Return False
|
||||
End Function
|
||||
|
||||
|
||||
Function existCodeInGridVermerke_VK_OLD(SendungID As Object) As Boolean
|
||||
|
||||
For Each r As DataGridViewRow In gridVermerke.Rows
|
||||
Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "")
|
||||
Case 14, 59
|
||||
If DirectCast(r.Cells("SendungID"), DataGridViewTextBoxCell).Value.ToString = CStr(SendungID) Then
|
||||
Return True
|
||||
End If
|
||||
End Select
|
||||
Next
|
||||
Return False
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
|
||||
Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkLöschen.Click
|
||||
@@ -1720,6 +1826,8 @@ Public Class usrcntlAktDetails
|
||||
If initDGVSendungenRows() Then
|
||||
timerSendRows.Enabled = False
|
||||
End If
|
||||
ArrowDown_ShowHide()
|
||||
|
||||
End Sub
|
||||
|
||||
'Private Sub timerSendRows_Tick(sender As Object, e As EventArgs) Handles timerSendRows.Tick
|
||||
@@ -2732,7 +2840,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
|
||||
Dim rpt As New rptQRAviso(AVISO)
|
||||
Dim printer = "" 'SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
|
||||
Dim printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
|
||||
If printer <> "" Then
|
||||
SDL.cProgramFunctions.printRpt(rpt, printer, True)
|
||||
Else
|
||||
@@ -2762,9 +2870,9 @@ Public Class usrcntlAktDetails
|
||||
Dim SendungID_Tmp = gridVermerke.SelectedRows(0).Cells("SendungID").Value
|
||||
|
||||
If sender Is toolVkReminder Then
|
||||
AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Reminder geschickt", 78)
|
||||
AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Reminder geschickt", 78,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value)
|
||||
ElseIf sender Is ToolUeberweisungsBeleg Then
|
||||
AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Überweisungsbeleg erhalten.", 79)
|
||||
AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Überweisungsbeleg erhalten.", 79,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value)
|
||||
End If
|
||||
|
||||
Vermerke_anzeigen(index)
|
||||
@@ -2774,5 +2882,24 @@ Public Class usrcntlAktDetails
|
||||
Private Sub gridVermerke_Scroll(sender As Object, e As ScrollEventArgs) Handles gridVermerke.Scroll
|
||||
ArrowDown_ShowHide()
|
||||
End Sub
|
||||
|
||||
Private Sub txtMAinfo_VorbereitetQs_TextChanged(sender As Object, e As EventArgs) Handles txtMAinfo_VorbereitetQs.Click, txtMAinfo_Vorgeschrieben.Click
|
||||
If sender.tag IsNot DBNull.Value AndAlso sender.tag IsNot Nothing Then
|
||||
If IsNumeric(sender.tag) Then
|
||||
Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(sender.tag)
|
||||
f.Show()
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub MitarbeiterAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MitarbeiterAnzeigenToolStripMenuItem.Click
|
||||
If gridVermerke.SelectedRows.Count = 0 Then Exit Sub
|
||||
If gridVermerke.SelectedRows(0).Cells("MitarbeiterId").Value Is DBNull.Value Then Exit Sub
|
||||
If Not IsNumeric(gridVermerke.SelectedRows(0).Cells("MitarbeiterId").Value) Then Exit Sub
|
||||
|
||||
Dim MA As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(gridVermerke.SelectedRows(0).Cells("MitarbeiterId").Value)
|
||||
MA.Show()
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
Reference in New Issue
Block a user