test
This commit is contained in:
@@ -350,7 +350,6 @@ Public Class usrcntlAktDetails
|
||||
' btnLkwBeleg.Visible = False
|
||||
btnAktAbschliessen.Visible = False
|
||||
btnAktAbschliessen.BackColor = Color.DarkGreen
|
||||
|
||||
lblBarZuKassierenSumme.Visible = False
|
||||
|
||||
Select Case AVISO.Status
|
||||
@@ -393,9 +392,12 @@ Public Class usrcntlAktDetails
|
||||
pnlAbgeschlossen.Visible = True
|
||||
btnAktAbschliessen.Visible = False
|
||||
' btnLkwBeleg.Visible = False
|
||||
btnQRVerwahrung.Visible = False
|
||||
|
||||
Else
|
||||
pnlAbgeschlossen.Visible = False
|
||||
' btnAktAbschliessen.Visible = True
|
||||
btnQRVerwahrung.Visible = True
|
||||
End If
|
||||
|
||||
intiAktUebernehmenBtn()
|
||||
@@ -874,7 +876,7 @@ Public Class usrcntlAktDetails
|
||||
End Sub
|
||||
|
||||
Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," &
|
||||
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,78,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" &
|
||||
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,14,25,28,29,30,35,46,47,59,94,78,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" &
|
||||
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
|
||||
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
|
||||
" WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " &
|
||||
@@ -1199,7 +1201,7 @@ Public Class usrcntlAktDetails
|
||||
init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
|
||||
|
||||
Case "46"
|
||||
MsgBox("SMS " & gridVermerke.Rows(RowIndex).Cells("VermerkeOptions").ToolTipText)
|
||||
' MsgBox("SMS " & gridVermerke.Rows(RowIndex).Cells("VermerkeOptions").ToolTipText)
|
||||
init = False 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
|
||||
|
||||
Case "36"
|
||||
@@ -1329,7 +1331,7 @@ Public Class usrcntlAktDetails
|
||||
For Each r As DataGridViewRow In gridvermerke.Rows
|
||||
' If r.Cells("VermerkeOptions").GetType.Name = "DataGridViewLinkCell" Then
|
||||
Dim optionCell As DataGridViewLinkCell = DirectCast(r.Cells("VermerkeOptions"), DataGridViewLinkCell)
|
||||
If CBool(r.Cells("Hervorheben").Value) Then
|
||||
If gridvermerke.Columns.Contains("Hervorheben") AndAlso CBool(r.Cells("Hervorheben").Value) Then
|
||||
'r.DefaultCellStyle.BackColor = Color.Firebrick
|
||||
'r.DefaultCellStyle.ForeColor = Color.White
|
||||
r.DefaultCellStyle.BackColor = Color.Yellow
|
||||
@@ -1533,8 +1535,8 @@ Public Class usrcntlAktDetails
|
||||
End Sub
|
||||
|
||||
Sub ArrowDown_ShowHide()
|
||||
If isFailureShown Then Exit Sub
|
||||
picArrowDown.Visible = False
|
||||
If isFailureShown Then Exit Sub
|
||||
If dgvSendungen.RowCount = 0 Then Exit Sub
|
||||
Select Case tbcntlVermerke.SelectedIndex
|
||||
Case 0, 1, 2
|
||||
@@ -1543,7 +1545,8 @@ 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" Or r.Cells("VermerkeOptions").Value <> "") AndAlso Not r.Displayed Then
|
||||
|
||||
If (gridVermerke.Columns.Contains("Hervorheben") AndAlso (r.Cells("Hervorheben") IsNot Nothing AndAlso r.Cells("Hervorheben").Value = "1") Or (gridVermerke.Columns.Contains("VermerkeOptions") AndAlso r.Cells("VermerkeOptions") IsNot Nothing AndAlso r.Cells("VermerkeOptions").Value <> "")) AndAlso Not r.Displayed Then
|
||||
picArrowDown.Visible = True
|
||||
End If
|
||||
End If
|
||||
@@ -1569,7 +1572,7 @@ Public Class usrcntlAktDetails
|
||||
Select Case code
|
||||
Case 59
|
||||
Return True
|
||||
Case 2, 4, 6, 8, 10, 12, 14, 30, 37, 34
|
||||
Case 2, 4, 6, 8, 10, 12, 30, 37, 34
|
||||
If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then
|
||||
Return True
|
||||
End If
|
||||
@@ -2012,6 +2015,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
Private Sub btnAnkunft_Click(sender As Object, e As EventArgs) Handles btnAnkunft.Click
|
||||
If FUNC.setAnkunft(AvisoID) Then
|
||||
' MsgBox("H1")
|
||||
frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
|
||||
End If
|
||||
@@ -2246,7 +2250,7 @@ Public Class usrcntlAktDetails
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click
|
||||
pnlOptionen.Height = 250 '220 '183 '157 '125
|
||||
pnlOptionen.Height = 315 '250 '220 '183 '157 '125
|
||||
pnlOptionen.Visible = Not pnlOptionen.Visible
|
||||
|
||||
If pnlOptionen.Visible Then pnlOptionen.Location = New Point(pnlOptionen.Location.X, btnOptionen.Height + pnl.Height + FlowLayoutPanel.Height)
|
||||
@@ -3846,5 +3850,26 @@ Public Class usrcntlAktDetails
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click, Button8.Click, btnQRVerwahrung.Click
|
||||
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing
|
||||
|
||||
If dgvSendungen.SelectedRows.Count > 0 Then
|
||||
SND = New VERAG_PROG_ALLGEMEIN.cSendungen(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
|
||||
End If
|
||||
|
||||
Dim rpt As New rptQRSendung_VerwahrungApp(AVISO, SND)
|
||||
Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
|
||||
If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True)
|
||||
If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
|
||||
|
||||
|
||||
If sender Is Button8 OrElse printer = "" Then
|
||||
SDL.cProgramFunctions.showRpt(rpt, "AVISO", False)
|
||||
Else
|
||||
SDL.cProgramFunctions.printRpt(rpt, printer, True)
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
|
||||
Reference in New Issue
Block a user