neu
This commit is contained in:
@@ -416,7 +416,7 @@ Public Class usrcntlAktDetails
|
||||
With dgvSendungen
|
||||
' Dim selRow = If(.SelectedRows.Count > 0, .SelectedRows(0).Index, -1)
|
||||
.Columns.Clear()
|
||||
.DataSource = AvisoDAL.loadDataTableBySQL(" SELECT FilialenNr ,/*rank() OVER (ORDER BY tblSnd_PosUnterNr) as */ tblSnd_PosUnterNr, [tblSnd_SendungID],[tblSnd_AvisoID],[tblSnd_Abfertigungsart_ID],[tblSnd_EmpfaengerKdNr],[tblSnd_Empfaenger],isnull(cast(FilialenNr as varchar (4)),'')+'/' + isnull(cast(AbfertigungsNr as varchar (8)),'') as AbfertigungsNr,(SELECT (CASE WHEN Count(*)>0 THEN cast(COUNT(*) as varchar(4)) ELSE '-' END) FROM Vermerke WHERE AvisoID=" & AvisoID & " AND SendungID=tblSnd_SendungID) as Vermerke, tblSnd_SpeditionsbuchEingetragen,tblSnd_Fremdspedition,tblSnd_FremdspeditionText,isnull(tblSnd_QS_MA,-1) as tblSnd_QS_MA,tblSnd_Vorbereitet,tblSnd_Vorgeschrieben,LetzterMitarbeiterId,tblSnd_VG_MA,LetzterMitarbeiter,tblSnd_BARzuKassieren,tblSnd_Fakturiert, AbfertigungsNr as AbfertigungsNr2, tblSnd_AbklaerungTR, tblSnd_AbklaerungTR_MA " &
|
||||
.DataSource = AvisoDAL.loadDataTableBySQL(" SELECT FilialenNr ,/*rank() OVER (ORDER BY tblSnd_PosUnterNr) as */ tblSnd_PosUnterNr, [tblSnd_SendungID],[tblSnd_AvisoID],[tblSnd_Abfertigungsart_ID],[tblSnd_EmpfaengerKdNr],[tblSnd_Empfaenger],isnull(cast(FilialenNr as varchar (4)),'')+'/' + isnull(cast(AbfertigungsNr as varchar (8)),'') as AbfertigungsNr,(SELECT (CASE WHEN Count(*)>0 THEN cast(COUNT(*) as varchar(4)) ELSE '-' END) FROM Vermerke WHERE AvisoID=" & AvisoID & " AND SendungID=tblSnd_SendungID) as Vermerke, tblSnd_SpeditionsbuchEingetragen,tblSnd_Fremdspedition,tblSnd_FremdspeditionText,isnull(tblSnd_QS_MA,-1) as tblSnd_QS_MA,tblSnd_Vorbereitet,tblSnd_Vorgeschrieben,LetzterMitarbeiterId,tblSnd_VG_MA,LetzterMitarbeiter,tblSnd_BARzuKassieren,tblSnd_Fakturiert, AbfertigungsNr as AbfertigungsNr2, tblSnd_AbklaerungTR, tblSnd_AbklaerungTR_MA ,tblSnd_AbfertigungTR, tblSnd_AbfertigungTR_MA " &
|
||||
" FROM tblSendungen WHERE tblSnd_AvisoId=" & AvisoID & " ORDER BY tblSnd_PosUnterNr") 'LEFT JOIN tblQS_Abfertigungsarten ON [tblSnd_Abfertigungsart_ID]=QS_Abfertigungsart_ID
|
||||
|
||||
' If .RowCount = 0 Then .Columns.Clear() : Exit Sub
|
||||
@@ -433,6 +433,8 @@ Public Class usrcntlAktDetails
|
||||
.Columns("tblSnd_Vorgeschrieben").Visible = False
|
||||
.Columns("tblSnd_AbklaerungTR").Visible = False
|
||||
.Columns("tblSnd_AbklaerungTR_MA").Visible = False
|
||||
.Columns("tblSnd_AbfertigungTR").Visible = False
|
||||
.Columns("tblSnd_AbfertigungTR_MA").Visible = False
|
||||
.Columns("tblSnd_Vorbereitet").Visible = False
|
||||
.Columns("LetzterMitarbeiter").Visible = False
|
||||
.Columns("LetzterMitarbeiterId").Visible = False
|
||||
@@ -503,6 +505,8 @@ Public Class usrcntlAktDetails
|
||||
.Columns.Add(c)
|
||||
End If
|
||||
|
||||
|
||||
|
||||
c = New DataGridViewImageColumn
|
||||
c.Name = "StatusVorbereitetQS"
|
||||
c.Image = My.Resources.statusBtn_vorbereitet_InAktiv : c.ImageLayout = DataGridViewImageCellLayout.Zoom
|
||||
@@ -520,6 +524,16 @@ Public Class usrcntlAktDetails
|
||||
c.HeaderText = "VG"
|
||||
.Columns.Add(c)
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SendungsStatusAbfertigungTR", "AVISO") Then
|
||||
c = New DataGridViewImageColumn
|
||||
c.Name = "StatusAbfertigungTR"
|
||||
c.Image = My.Resources.abfetigungTR_inaktiv : c.ImageLayout = DataGridViewImageCellLayout.Zoom
|
||||
c.Width = 25 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
|
||||
c.ToolTipText = "Status 'AbfertigungTR' eintragen"
|
||||
c.HeaderText = "TR"
|
||||
.Columns.Add(c)
|
||||
End If
|
||||
|
||||
c = New DataGridViewImageColumn
|
||||
c.Name = "SpeditionsbuchEintragen"
|
||||
c.Image = My.Resources.speditionsbuchInaktiv : c.ImageLayout = DataGridViewImageCellLayout.Zoom
|
||||
@@ -779,6 +793,10 @@ Public Class usrcntlAktDetails
|
||||
txtMAinfo_AbklaerungTR.Text = "-"
|
||||
txtMAinfo_AbklaerungTR.Tag = ""
|
||||
|
||||
'picMAinfo_AbfertigungTR.BackgroundImage = My.Resources.AbfertigungTR_Inaktiv
|
||||
'txtMAinfo_AbfertigungTR.Text = "-"
|
||||
'txtMAinfo_AbfertigungTR.Tag = ""
|
||||
|
||||
If dgvSendungen.SelectedRows.Count > 0 Then
|
||||
sendwhere = " AND VermerkArt='S' AND SendungID=" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
|
||||
|
||||
@@ -794,6 +812,15 @@ Public Class usrcntlAktDetails
|
||||
txtMAinfo_AbklaerungTR.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_AbklaerungTR_MA").Value
|
||||
End If
|
||||
|
||||
'AbfertigungTR
|
||||
'pnlMAInfoXX.Visible = True
|
||||
'If dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR").Value IsNot DBNull.Value Then
|
||||
' picMAinfo_AbfertigungTR.BackgroundImage = My.Resources.AbfertigungTR_Aktiv
|
||||
' txtMAinfo_AbfertigungTR.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR_MA").Value & "'", "ADMIN", "-")
|
||||
' txtMAinfo_AbfertigungTR.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR_MA").Value
|
||||
'End If
|
||||
|
||||
|
||||
'Vorbereitet
|
||||
pnlMAInfo.Visible = True
|
||||
If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
|
||||
@@ -995,6 +1022,10 @@ Public Class usrcntlAktDetails
|
||||
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
|
||||
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
|
||||
|
||||
Case "46"
|
||||
MsgBox("SMS " & gridVermerke.Rows(e.RowIndex).Cells("VermerkeOptions").ToolTipText)
|
||||
init = False 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
|
||||
|
||||
Case "36"
|
||||
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
|
||||
myVermerk.VermerkCodeId = 37
|
||||
@@ -1189,18 +1220,24 @@ Public Class usrcntlAktDetails
|
||||
optionCell.ToolTipText = "SMS Satus"
|
||||
optionCell.Style.BackColor = Color.White
|
||||
optionCell.LinkColor = Color.Black
|
||||
|
||||
'Select Case MSG.Status
|
||||
' Case MessageStatus.Expired, MessageStatus.Failed, MessageStatus.FailedAuthorisation, MessageStatus.Cancelled, MessageStatus.Rejected
|
||||
|
||||
|
||||
Select Case SMS.sms_Status
|
||||
Case -1, 0 : optionCell.Value = ""
|
||||
Case 1, 2 : optionCell.Value = "wartend..."
|
||||
Case -1 : optionCell.Value = ""
|
||||
Case com.esendex.sdk.core.MessageStatus.Submitted, com.esendex.sdk.core.MessageStatus.Sent, com.esendex.sdk.core.MessageStatus.Connecting, com.esendex.sdk.core.MessageStatus.Acknowledged, com.esendex.sdk.core.MessageStatus.Scheduled
|
||||
optionCell.Value = "wartend..."
|
||||
optionCell.Style.BackColor = Color.PapayaWhip
|
||||
optionCell.Style.SelectionBackColor = optionCell.Style.BackColor
|
||||
Case 3
|
||||
Case com.esendex.sdk.core.MessageStatus.Delivered, com.esendex.sdk.core.MessageStatus.PartiallyDelivered
|
||||
optionCell.Value = "OK - Empfangen!"
|
||||
optionCell.LinkColor = Color.Green
|
||||
' optionCell.Style.BackColor = Color.Green
|
||||
' optionCell.LinkColor = Color.White
|
||||
'optionCell.Style.SelectionBackColor = optionCell.Style.BackColor
|
||||
Case 4 : optionCell.Value = "SMS: Sendefehler!"
|
||||
Case Else : optionCell.Value = "SMS: Sendefehler!"
|
||||
optionCell.ToolTipText = "Sendefehler: " & SMS.sms_Failure
|
||||
optionCell.LinkColor = Color.Red
|
||||
optionCell.Style.BackColor = Color.PapayaWhip
|
||||
@@ -1734,6 +1771,14 @@ Public Class usrcntlAktDetails
|
||||
initDgvSendungen()
|
||||
End If
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
Case "StatusAbfertigungTR"
|
||||
sendAktiv = False
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
If FUNC.setSendungAbfertigungTR(SendungsId, AvisoID) Then
|
||||
initDgvSendungen()
|
||||
End If
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
Case "StatusVorgeschrieben"
|
||||
@@ -1852,6 +1897,7 @@ Public Class usrcntlAktDetails
|
||||
If dgvSendungen.DataSource Is Nothing Then Return False
|
||||
If dgvSendungen.Columns("tblSnd_Vorbereitet") Is Nothing Then Return False
|
||||
If dgvSendungen.Columns("tblSnd_AbklaerungTR") Is Nothing Then Return False
|
||||
If dgvSendungen.Columns("tblSnd_AbfertigungTR") Is Nothing Then Return False
|
||||
'If dgvSendungen.Columns("StatusAbklaerungTR") Is Nothing Then Return False
|
||||
If dgvSendungen.Columns("StatusVorbereitetQS") Is Nothing Then Return False
|
||||
If dgvSendungen.Columns("SenungUebernehmen") Is Nothing Then Return False
|
||||
@@ -1881,6 +1927,15 @@ Public Class usrcntlAktDetails
|
||||
DirectCast(r.Cells("StatusAbklaerungTR"), DataGridViewImageCell).ToolTipText = "Status 'Abklärung-TR' eintragen"
|
||||
End If
|
||||
End If
|
||||
If dgvSendungen.Columns("StatusAbfertigungTR") IsNot Nothing Then
|
||||
If r.Cells("tblSnd_AbfertigungTR").Value IsNot DBNull.Value Then
|
||||
|
||||
DirectCast(r.Cells("StatusAbfertigungTR"), DataGridViewImageCell).Value = My.Resources.abfetigungTR_aktiv
|
||||
DirectCast(r.Cells("StatusAbfertigungTR"), DataGridViewImageCell).ToolTipText = "Status 'Abfertigung-TR' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_AbfertigungTR").Value & ")"
|
||||
Else
|
||||
DirectCast(r.Cells("StatusAbfertigungTR"), DataGridViewImageCell).ToolTipText = "Status 'Abfertigung-TR' eintragen"
|
||||
End If
|
||||
End If
|
||||
|
||||
If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
|
||||
DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv
|
||||
|
||||
Reference in New Issue
Block a user