From e13acbbe17d7030fbe69b9b231e71a7bef01a38e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 7 Aug 2026 16:24:39 +0200 Subject: [PATCH] =?UTF-8?q?div.=20=C3=84nderungen,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/Classes/cSendungsoptions.vb | 7 + Aviso/frmSendungsdetailsNEU.vb | 44 +++++- Gemeinsames/rptSendungen.Designer.vb | 202 ++++++++++++++++++--------- Gemeinsames/rptSendungen.resx | 9 ++ Gemeinsames/rptSendungen.vb | 4 + 5 files changed, 195 insertions(+), 71 deletions(-) diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb index ef92c33..b3b9783 100644 --- a/Aviso/Classes/cSendungsoptions.vb +++ b/Aviso/Classes/cSendungsoptions.vb @@ -156,12 +156,19 @@ Public Class SendungOptions End If 'Dim DATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER + + Dim abfertArt = "" If SENDUNG.tblSnd_Abfertigungsart_ID > 0 Then abfertArt = "" & SENDUNG.tblSnd_Abfertigungsart_ID & " - " & ADMIN.getValueTxtBySql("SELECT isnull([Abfertigungsbezeichnung],'') FROM [Abfertigungsarten] WHERE [Abfertigungsart]=" & SENDUNG.tblSnd_Abfertigungsart_ID, "FMZOLL") Dim VALUES As New Gemeinsames.rptSendungenValues If barcodeLKW IsNot Nothing Then VALUES.barcodeLKW = barcodeLKW If barcode IsNot Nothing Then VALUES.barcodeSendung = barcode + If AVISO IsNot Nothing AndAlso AVISO.AvisoID >= 0 Then + VALUES.LKW_ID = AVISO.AvisoID + End If + + Dim imgQR As Image = Nothing If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 0af01eb..c75ff58 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -327,10 +327,14 @@ Public Class frmSendungsdetailsNEU (cboVorpapier3.Text.Trim <> "" AndAlso txtVorpapier3Pos.Text.Trim = "" Or cboVorpapier3.Text.Trim = "" AndAlso txtVorpapier3Pos.Text.Trim <> "") - Dim missingWarenwert As Boolean = - (cboVorpapier.Text.Trim <> "" AndAlso txtWarenwert.Text = "" AndAlso txtWarenwertWaehrung.Text = "" Or txtWarenwert.Text = "" AndAlso txtWarenwertWaehrung.Text = "" AndAlso txtVorpapierPos.Text.Trim <> "") OrElse - (cboVorpapier2.Text.Trim <> "" AndAlso txtWarenwert.Text = "" AndAlso txtWarenwertWaehrung.Text = "" Or txtWarenwert.Text = "" AndAlso txtWarenwertWaehrung.Text = "" AndAlso txtVorpapier2Pos.Text.Trim <> "") OrElse - (cboVorpapier3.Text.Trim <> "" AndAlso txtWarenwert.Text = "" AndAlso txtWarenwertWaehrung.Text = "" Or txtWarenwert.Text = "" AndAlso txtWarenwertWaehrung.Text = "" AndAlso txtVorpapier3Pos.Text.Trim <> "") + Dim missingWarenwert As Boolean = (txtWarenwert.Text.Trim = "" OrElse txtWarenwertWaehrung.Text.Trim = "") AndAlso ( + cboVorpapier.Text.Trim <> "" OrElse + txtVorpapierPos.Text.Trim <> "" OrElse + cboVorpapier2.Text.Trim <> "" OrElse + txtVorpapier2Pos.Text.Trim <> "" OrElse + cboVorpapier3.Text.Trim <> "" OrElse + txtVorpapier3Pos.Text.Trim <> "" + ) Dim hasIssue As Boolean @@ -357,6 +361,12 @@ Public Class frmSendungsdetailsNEU If hasIssue Then If showErr Then If MsgBox(InfoMsg, vbYesNoCancel Or vbExclamation Or vbDefaultButton2, "Warning") <> vbYes Then + If InfoMsg.Contains("Warenwert") Then + txtWarenwert.Focus() + Else + txtVorpapierPos.Focus() + End If + Return False End If End If @@ -374,8 +384,32 @@ Public Class frmSendungsdetailsNEU rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True End If + Dim isATB = SENDUNG_LIST.Any(Function(r) r.tblSnd_Abfertigungsart_ID = 44) + If isATB Then + Dim invalidSendung = SENDUNG_LIST.FirstOrDefault(Function(r) r.tblSnd_Abfertigungsart_ID <> 44 AndAlso ((String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier) OrElse + String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier_Pos)) OrElse + ((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse + Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos)) AndAlso + (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse + String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos))) OrElse + ((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse + Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos)) AndAlso + (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse + String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos))))) + + If invalidSendung IsNot Nothing Then + If MsgBox("Sendung-ID: " & invalidSendung.tblSnd_SendungID & vbCrLf & + "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig." & + vbCrLf & vbCrLf & + "Möchten Sie trotzdem fortfahren?", + MsgBoxStyle.YesNo Or MsgBoxStyle.Exclamation) = MsgBoxResult.No Then + Return False + End If + End If + + End If @@ -391,7 +425,7 @@ Public Class frmSendungsdetailsNEU Sub NEXT_SENDUNG() loadDataInLIST() - If CURRENT_INDEX + 1 < SENDUNG_LIST.Count Then + If CURRENT_INDEX + 1 color: Black; font-size: 12pt; font-weight: normal; text-align: center; text-decoration: none; text-justify: auto; vertical-align: middle; ddo-char-set: 1; ddo-font-vertical: none; ddo-shrink-to-fit: none + + + color: Black; font-size: 11pt; font-weight: bold; text-align: center; text-decoration: none; text-justify: auto; vertical-align: middle; ddo-char-set: 1; ddo-font-vertical: none; ddo-shrink-to-fit: none @@ -159,6 +162,9 @@ color: Black; font-size: 11pt; font-weight: bold; text-align: right; text-decoration: none; text-justify: auto; vertical-align: middle; ddo-char-set: 1; ddo-font-vertical: none; ddo-shrink-to-fit: none + + + color: Black; font-size: 9pt; font-weight: bold; text-align: center; text-decoration: none; text-justify: auto; vertical-align: middle; ddo-char-set: 1; ddo-font-vertical: none; ddo-shrink-to-fit: none @@ -174,6 +180,9 @@ color: Black; font-size: 9pt; font-weight: bold; text-align: center; text-decoration: none; text-justify: auto; vertical-align: middle; ddo-char-set: 1; ddo-font-vertical: none; ddo-shrink-to-fit: none + + + 0, 0 diff --git a/Gemeinsames/rptSendungen.vb b/Gemeinsames/rptSendungen.vb index 03e2ff7..236e56c 100644 --- a/Gemeinsames/rptSendungen.vb +++ b/Gemeinsames/rptSendungen.vb @@ -135,6 +135,8 @@ Public Class rptSendungen TextBox3.Text = "Abkl.: " & VALUES.QS_MA & vbNewLine & "Dekl.: " & VALUES.VG_MA + txtLKWID.Text &= VALUES.LKW_ID + If VALUES.Grenze.Trim <> "" Then lblGrenze.Visible = True shGrenze.Visible = True @@ -350,6 +352,8 @@ Public Class rptSendungenValues Property SchnellAbfertigung As Boolean = False + Property LKW_ID As String = "" + Property VG_MA As String = "" Property QS_MA As String = ""