From ce3134a9392d2dae315ba0a698e17d1ece56c34a Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 14 Nov 2024 21:52:01 +0100 Subject: [PATCH 1/3] vers --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 925088c..f8decb2 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 9e6dd5048533d41a577039b786973078c9e1e963 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 15 Nov 2024 23:45:14 +0100 Subject: [PATCH 2/3] QR-Druck bei Ankunft --- Aviso/frmHauptfenster.vb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 2ba8019..af477d7 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -5114,6 +5114,24 @@ Public Class AvisoStatusFunctions Next 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 If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then @@ -5219,6 +5237,8 @@ Public Class AvisoStatusFunctions End If + 'Verwahrungs-Ticket Drucken, wenn parameter + printQR_CODE(Aviso) '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 Dim rpt As New rptQRAviso(Aviso) From 151b912afb167375ed8741634072758c4eaacbdb Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 18 Nov 2024 08:32:38 +0100 Subject: [PATCH 3/3] QR fix, Vers --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmHauptfenster.vb | 12 ++++++------ Aviso/usrcntlAktDetails.vb | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index f8decb2..25d4a6f 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index af477d7..8763393 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -1824,7 +1824,7 @@ Public Class frmHauptfenster ' MsgBox(ex.Message) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - ' Grid_aktiv = True + ' Grid_aktiv = True End Sub @@ -5124,10 +5124,10 @@ Public Class AvisoStatusFunctions 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 + 'If printer = "" Then + SDL.cProgramFunctions.printRpt(rpt, printer, True) + Return True + ' End If End Select Return False @@ -5202,7 +5202,7 @@ Public Class AvisoStatusFunctions 'Fahrer Handy-Nr. Dim frmAnkunftSetzen As New frmAnkunftSetzen(Aviso) If frmAnkunftSetzen.ShowDialog() = DialogResult.Cancel Then - Return -1 'Abbrechen + Return False 'Abbrechen End If 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then ' If Aviso.Grenzstelle.Replace("???", "") <> "" Then diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 27ec220..c84ccbe 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -2015,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