neu
This commit is contained in:
@@ -43,6 +43,7 @@ Public Class usrcntlAktDetails
|
||||
Dim AVISO As cAviso = Nothing
|
||||
Dim WithEvents timerSendRows As New Timer
|
||||
|
||||
Dim painted = False ' Damit gridVermerke Formattierung nicht dauernd anspringt..
|
||||
|
||||
Public Sub New()
|
||||
InitializeComponent()
|
||||
@@ -199,6 +200,9 @@ Public Class usrcntlAktDetails
|
||||
btnErfasst.Visible = True
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then
|
||||
Button2.Visible = True
|
||||
End If
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then
|
||||
' tbcntlVermerke.TabPages.Remove(tbAnhang)
|
||||
'End If
|
||||
@@ -354,6 +358,7 @@ Public Class usrcntlAktDetails
|
||||
.Columns("tblSnd_Empfaenger").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("Hervorheben").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("VorauskasseId").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("SMSId").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
|
||||
.Columns("Datum").Width = 125 '110
|
||||
.Columns("Datum").HeaderText = "Datum"
|
||||
@@ -664,9 +669,14 @@ Public Class usrcntlAktDetails
|
||||
If AvisoID <= 0 Then Exit Sub
|
||||
pnlMAInfo.Visible = False
|
||||
Button18.Visible = False
|
||||
btnQuckScan.Visible = False
|
||||
Select Case tbcntlVermerke.SelectedIndex
|
||||
Case 0, 1, 2 : Vermerke_anzeigen2(rowindex)
|
||||
Case 3
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_ANHAENGE_QuickScan", Me.FindForm) Then
|
||||
btnQuckScan.Visible = True
|
||||
End If
|
||||
|
||||
Button18.Visible = True
|
||||
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
|
||||
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
|
||||
@@ -718,6 +728,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
End With
|
||||
End Select
|
||||
painted = False
|
||||
ArrowDown_ShowHide()
|
||||
|
||||
End Sub
|
||||
@@ -826,7 +837,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],VorauskasseId" &
|
||||
" 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,SMSId" &
|
||||
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
|
||||
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
|
||||
" WHERE AvisoID = " & AvisoID & " " & sendwhere & " " &
|
||||
@@ -1050,6 +1061,7 @@ Public Class usrcntlAktDetails
|
||||
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
sql.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1 where avisoid=" & AvisoID, "AVISO")
|
||||
|
||||
AvisoStatusFunctions.printFinish(AVISO)
|
||||
|
||||
' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
|
||||
'Vermerke_aktualisieren()
|
||||
@@ -1078,6 +1090,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint
|
||||
|
||||
If painted Then Exit Sub
|
||||
If dgvSendungen.RowCount = 0 Then Exit Sub
|
||||
Try
|
||||
If gridVermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub
|
||||
@@ -1170,6 +1183,29 @@ Public Class usrcntlAktDetails
|
||||
optionCell.Value = "Kontaktdaten erhalten"
|
||||
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kontaktdaten erhalten' einzutragen."
|
||||
End If
|
||||
Case 46
|
||||
If r.Cells("SMSId").Value IsNot DBNull.Value AndAlso IsNumeric(r.Cells("SMSId").Value) Then
|
||||
Dim SMS As New VERAG_PROG_ALLGEMEIN.cSMS(r.Cells("SMSId").Value)
|
||||
optionCell.ToolTipText = "SMS Satus"
|
||||
optionCell.Style.BackColor = Color.White
|
||||
optionCell.LinkColor = Color.Black
|
||||
Select Case SMS.sms_Status
|
||||
Case -1, 0 : optionCell.Value = ""
|
||||
Case 1, 2 : optionCell.Value = "wartend..."
|
||||
optionCell.Style.BackColor = Color.PapayaWhip
|
||||
optionCell.Style.SelectionBackColor = optionCell.Style.BackColor
|
||||
Case 3
|
||||
optionCell.Value = "OK - Empfangen!"
|
||||
optionCell.Style.BackColor = Color.Green
|
||||
optionCell.LinkColor = Color.White
|
||||
optionCell.Style.SelectionBackColor = optionCell.Style.BackColor
|
||||
Case 4 : optionCell.Value = "Sende-Fehler!"
|
||||
optionCell.ToolTipText = "Sendefehler: " & SMS.sms_Failure
|
||||
optionCell.Style.BackColor = Color.Red
|
||||
optionCell.LinkColor = Color.White
|
||||
optionCell.Style.SelectionBackColor = optionCell.Style.BackColor
|
||||
End Select
|
||||
End If
|
||||
Case 53
|
||||
If Not existCodeInGridVermerke(54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
|
||||
optionCell.Value = "Ü-Dok erhalten"
|
||||
@@ -1213,7 +1249,7 @@ Public Class usrcntlAktDetails
|
||||
|
||||
|
||||
Next
|
||||
|
||||
painted = True
|
||||
' ArrowDown_ShowHide() 'Anzeigeproblem, wenn Aviso minimiert wird! --> Jetzt bei Timer!
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -1345,20 +1381,26 @@ Public Class usrcntlAktDetails
|
||||
'If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
|
||||
'gridMyAviso.ClearSelection() 'WARUM?
|
||||
|
||||
|
||||
DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
|
||||
If e.Button = MouseButtons.Right Then
|
||||
If AVISO.Abgeschlossen Then Exit Sub
|
||||
|
||||
If sender Is gridVermerke Then
|
||||
If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
|
||||
' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value)
|
||||
gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex)
|
||||
conMenuVermerke.Show(Cursor.Position)
|
||||
Select Case tbcntlVermerke.SelectedIndex
|
||||
Case 0, 1, 2
|
||||
If sender Is gridVermerke Then
|
||||
If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
|
||||
' AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells("AvisoId").Value)
|
||||
gridVermerke.CurrentCell = gridVermerke.Rows(e.RowIndex).Cells(e.ColumnIndex)
|
||||
conMenuVermerke.Show(Cursor.Position)
|
||||
|
||||
ToolUeberweisungsBeleg.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
|
||||
toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
|
||||
ToolUeberweisungsBeleg.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
|
||||
toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13")
|
||||
|
||||
End If
|
||||
Case 3
|
||||
End Select
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
End Sub
|
||||
@@ -1773,7 +1815,7 @@ Public Class usrcntlAktDetails
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click
|
||||
pnlOptionen.Height = 157 '125
|
||||
pnlOptionen.Height = 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)
|
||||
@@ -1916,7 +1958,6 @@ Public Class usrcntlAktDetails
|
||||
timerSendRows.Enabled = False
|
||||
End If
|
||||
ArrowDown_ShowHide()
|
||||
|
||||
End Sub
|
||||
|
||||
'Private Sub timerSendRows_Tick(sender As Object, e As EventArgs) Handles timerSendRows.Tick
|
||||
@@ -2571,7 +2612,7 @@ Public Class usrcntlAktDetails
|
||||
If f.SMS IsNot Nothing Then
|
||||
Dim FahrerHandy = If(f.SMS.sms_Vorwahl, "") & If(f.SMS.sms_Handynummer, "")
|
||||
If FahrerHandy <> "" Then
|
||||
SDL.cSMSOptions.insertVermerk(AvisoID, FahrerHandy, Now)
|
||||
SDL.cSMSOptions.insertVermerkSMS(AvisoID, FahrerHandy, f.SMS.sms_id, Now)
|
||||
If If(AVISO.FahrerHandy, "") = "" Then
|
||||
AVISO.FahrerHandy = FahrerHandy
|
||||
AVISO.UPDATE_FahrerHandy(FahrerHandy)
|
||||
@@ -2645,19 +2686,27 @@ Public Class usrcntlAktDetails
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click, Button15.Click
|
||||
pnlDetailsRechts.Cursor = Cursors.WaitCursor
|
||||
Private Sub Button10_Click(sender As Object, e As EventArgs) Handles btnLZDruck.Click, btnLZDruckDIGITAL.Click
|
||||
Dim f As New frmLaufzettel(AVISO, Nothing, (sender Is btnLZDruckDIGITAL), cbxLZT1.Checked, cbxLZRg.Checked, cbxVPSplit.Checked)
|
||||
f.ShowDialog()
|
||||
Panel4.Visible = False
|
||||
|
||||
|
||||
Exit Sub
|
||||
|
||||
pnlDetailsRechts.Cursor = Cursors.WaitCursor
|
||||
|
||||
|
||||
' Fahrer zum Zoll!
|
||||
'------------------------------------------------
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("PRINT_zumZOLL") Then
|
||||
If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then
|
||||
Try
|
||||
Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO)
|
||||
If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName)
|
||||
Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
|
||||
If sender Is btnLZDruck Then
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("PRINT_zumZOLL") Then
|
||||
If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then
|
||||
Try
|
||||
Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO)
|
||||
If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName)
|
||||
Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
'------------------------------------------------
|
||||
@@ -2683,31 +2732,46 @@ Public Class usrcntlAktDetails
|
||||
End If
|
||||
Next
|
||||
|
||||
'DIGITALE ABFERTIGUNG:
|
||||
If (sender Is Button15) Or cbxVPSplit.Checked Then ' digital oder splittung --> per Vorpapier
|
||||
'DIGITALE ABFERTIGUNG:
|
||||
If (sender Is btnLZDruckDIGITAL) Or cbxVPSplit.Checked Then ' digital oder splittung --> per Vorpapier
|
||||
Try
|
||||
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
|
||||
VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, -1, AvisoID) 'LÄDT alle SENDUNGSDATEN
|
||||
|
||||
|
||||
Dim pruef = False
|
||||
For Each s In SENDUNG_LIST
|
||||
Select Case s.tblSnd_Abfertigungsart_ID.ToString
|
||||
Case "38", "26" 'AT - Keine Prüfung
|
||||
Case Else
|
||||
If If(s.tblSnd_Vorpapier, "") = "" Then
|
||||
MsgBox("Nicht alle Sendungen haben ein Vorpapier eingetragen!" & vbNewLine & "Laufzettelerstellung wird abgebrochen.")
|
||||
pnlDetailsRechts.Cursor = Cursors.Default : Exit Sub
|
||||
If If(s.tblSnd_Vorpapier, "") = "" And If(s.tblSnd_Vorpapier2, "") = "" And If(s.tblSnd_Vorpapier3, "") = "" Then
|
||||
pruef = True
|
||||
End If
|
||||
End Select
|
||||
Next
|
||||
|
||||
If pruef Then ' VP fehlen
|
||||
If sender Is btnLZDruck Then 'Wenn LZ Druck
|
||||
If vbYes <> MsgBox("Nicht alle Sendungen haben ein Vorpapier eingetragen!" & vbNewLine & "Soll der laufzettel trotzdem gedruckt werden?", vbYesNoCancel) Then
|
||||
pnlDetailsRechts.Cursor = Cursors.Default : Exit Sub
|
||||
End If
|
||||
Else ' Digitalabfertigungn
|
||||
MsgBox("Nicht alle Sendungen haben ein Vorpapier eingetragen!" & vbNewLine & "Laufzettelerstellung wird abgebrochen.")
|
||||
pnlDetailsRechts.Cursor = Cursors.Default : Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
AVISO.LOAD_Vorpapiere()
|
||||
Dim VP_Enum = VERAG_PROG_ALLGEMEIN.cSendungen.VP_Enum(SENDUNG_LIST) 'Filtert nach eindeutigen Vorpapieren
|
||||
|
||||
Dim paths As New List(Of String)
|
||||
If pruef Then paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, "XXXX"))
|
||||
For Each VP In VP_Enum
|
||||
paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, VP))
|
||||
Next
|
||||
|
||||
If (sender Is Button15) Then 'NUR BEI DIGITALANMELDUNG!
|
||||
|
||||
If (sender Is btnLZDruckDIGITAL) Then 'NUR BEI DIGITALANMELDUNG!
|
||||
|
||||
Dim outl As New Outlook.Application
|
||||
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
|
||||
@@ -2729,7 +2793,7 @@ Public Class usrcntlAktDetails
|
||||
tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
|
||||
End Select
|
||||
|
||||
Dim MAIL_SUBJ = tx.txt_betreff.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
|
||||
Dim MAIL_SUBJ = tX.txt_betreff.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
|
||||
Dim MAIL_BODY = tX.txt_text.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
|
||||
|
||||
addVPList(MAIL_BODY, VP_Enum)
|
||||
@@ -3143,5 +3207,61 @@ Public Class usrcntlAktDetails
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click
|
||||
Dim f As New frmLaufzettel(AVISO, Nothing, True, True, True, cbxVPSplit.Checked)
|
||||
f.ShowDialog()
|
||||
End Sub
|
||||
|
||||
Private Sub btnQuckScan_Click(sender As Object, e As EventArgs) Handles btnQuckScan.Click
|
||||
Try
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
If frmSendungAnhangImport.quickScan(AvisoID) Then
|
||||
Vermerke_anzeigen()
|
||||
End If
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan")
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
|
||||
'Try
|
||||
' Me.Cursor = Cursors.WaitCursor
|
||||
' 'If KdNr < 0 Then Exit Sub
|
||||
' Dim frmScan As New VERAG_PROG_ALLGEMEIN.frmScan("QuickScan")
|
||||
' frmScan.DefaultFileName = "Scan" ' Me._TEXT_PDF
|
||||
|
||||
' If frmScan.ShowDialog(Me) = DialogResult.OK Then
|
||||
' If frmScan.ReturnValue IsNot Nothing Then
|
||||
' Dim Filename = frmScan.fileName
|
||||
' Dim TMP_Path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(Filename, ".pdf",, False, "SendungsAnhaenge")
|
||||
' File.WriteAllBytes(TMP_Path, frmScan.ReturnValue)
|
||||
|
||||
' Dim da_id = -1
|
||||
' Dim anhId = -1
|
||||
' Dim destPath = ""
|
||||
' If frmSendungAnhangImport.saveToDS(AvisoID, Filename, TMP_Path, "", "PDF", da_id, anhId, destPath) Then
|
||||
' ' frmSendungAnhangImport. addUsrcnlToPnl(destPath, da_id, anhId, Filename, "PDF")
|
||||
' Vermerke_anzeigen()
|
||||
' End If
|
||||
' 'addUsrcnlToPnl(TMP_Path)
|
||||
' End If
|
||||
' End If
|
||||
|
||||
'Catch ex As Exception
|
||||
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan")
|
||||
'End Try
|
||||
'Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Sub btnWlanTicket_Click(sender As Object, e As EventArgs) Handles btnWlanTicket.Click
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
|
||||
sWLANTicket.printTicket(AVISO)
|
||||
Else
|
||||
MsgBox("Nur für Front-Office Benutzer!")
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
End Class
|
||||
|
||||
|
||||
Reference in New Issue
Block a user