edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://dev.azure.com/VeragAG/_git/AVISO

Browse Source
This commit is contained in:
d.breimaier
2024-11-18 13:39:47 +01:00
parent 52ea51d4e0 151b912afb
commit c80374d1f0
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Aviso/frmHauptfenster.vb
View File

@@ -1824,7 +1824,7 @@ Public Class frmHauptfenster
' MsgBox(ex.Message) ' MsgBox(ex.Message)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try End Try
' Grid_aktiv = True ' Grid_aktiv = True
End Sub End Sub
@@ -5114,6 +5114,24 @@ Public Class AvisoStatusFunctions
Next Next
End Sub End Sub
Public Function printQR_CODE(aviso As VERAG_PROG_ALLGEMEIN.cAviso) As Boolean
If aviso Is Nothing Then Return False
Select Case aviso.Grenzstelle
Case "NEU", "DTB", "NKN"
Dim rpt As New rptQRSendung_VerwahrungApp(aviso, Nothing)
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 printer = "" Then
SDL.cProgramFunctions.printRpt(rpt, printer, True)
Return True
' End If
End Select
Return False
End Function
Public Function setAnkunft(AvisoID) As Boolean Public Function setAnkunft(AvisoID) As Boolean
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
@@ -5184,7 +5202,7 @@ Public Class AvisoStatusFunctions
'Fahrer Handy-Nr. 'Fahrer Handy-Nr.
Dim frmAnkunftSetzen As New frmAnkunftSetzen(Aviso) Dim frmAnkunftSetzen As New frmAnkunftSetzen(Aviso)
If frmAnkunftSetzen.ShowDialog() = DialogResult.Cancel Then If frmAnkunftSetzen.ShowDialog() = DialogResult.Cancel Then
Return -1 'Abbrechen Return False 'Abbrechen
End If End If
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
' If Aviso.Grenzstelle.Replace("???", "") <> "" Then ' If Aviso.Grenzstelle.Replace("???", "") <> "" Then
@@ -5219,6 +5237,8 @@ Public Class AvisoStatusFunctions
End If End If
'Verwahrungs-Ticket Drucken, wenn parameter
printQR_CODE(Aviso)
'Ticket Drucken, wenn parameter 'Ticket Drucken, wenn parameter
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("TICKET_ANKUNFT") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("TICKET_ANKUNFT", "AVISO") Then If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("TICKET_ANKUNFT") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("TICKET_ANKUNFT", "AVISO") Then
Dim rpt As New rptQRAviso(Aviso) Dim rpt As New rptQRAviso(Aviso)

1
Aviso/usrcntlAktDetails.vb
View File

@@ -2015,6 +2015,7 @@ Public Class usrcntlAktDetails
Private Sub btnAnkunft_Click(sender As Object, e As EventArgs) Handles btnAnkunft.Click Private Sub btnAnkunft_Click(sender As Object, e As EventArgs) Handles btnAnkunft.Click
If FUNC.setAnkunft(AvisoID) Then If FUNC.setAnkunft(AvisoID) Then
' MsgBox("H1")
frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
End If End If