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

div. Änderungen, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-08-07 16:24:39 +02:00
parent bc740b0dee
commit e13acbbe17
5 changed files with 195 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Aviso/Classes/cSendungsoptions.vb
View File

@@ -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

44
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -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 <SENDUNG_LIST.Count Then
CURRENT_INDEX += 1
initDataBinding()
' initButtons()