From baa65abe01bb6fd14777ec9b23924e68e37fa52f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 6 Aug 2026 10:28:32 +0200 Subject: [PATCH] Hinweismeldung fehlender Warenwert --- Aviso/frmSendungsdetailsNEU.vb | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index f191c05..0af01eb 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -326,30 +326,40 @@ Public Class frmSendungsdetailsNEU (cboVorpapier2.Text.Trim <> "" AndAlso txtVorpapier2Pos.Text.Trim = "" Or cboVorpapier2.Text.Trim = "" AndAlso txtVorpapier2Pos.Text.Trim <> "") OrElse (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 hasIssue As Boolean - If isVerimex Then - hasIssue = (invalidPrepaper OrElse missingPosition) - Else - hasIssue = (invalidPrepaper OrElse missingPosition) - End If + hasIssue = (invalidPrepaper OrElse missingPosition) Dim InfoMsg As String If isVerimex Then - InfoMsg = "Pre-Paper/PosNr data is invalid or incomplete. Continue?" + InfoMsg = "Pre-Paper/PosNr data is invalid or incomplete." & vbCrLf & vbCrLf & "Do you want to continue anyway?" Else - InfoMsg = "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig, fortfahren?" + InfoMsg = "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig." & vbCrLf & vbCrLf & "Möchten Sie trotzdem fortfahren?" + End If + + If Not hasIssue Then + hasIssue = missingWarenwert + If isVerimex Then + InfoMsg = "The value of the goods has not been entered." & vbCrLf & vbCrLf & "Do you want to continue anyway?" + Else + InfoMsg = "Der Warenwert wurde nicht eingetragen." & vbCrLf & vbCrLf & "Möchten Sie trotzdem fortfahren?" + End If End If If hasIssue Then - If showErr Then - If MsgBox(InfoMsg, vbYesNoCancel) <> vbYes Then + If MsgBox(InfoMsg, vbYesNoCancel Or vbExclamation Or vbDefaultButton2, "Warning") <> vbYes Then Return False End If End If - End If