divl. Änderungne

Aviso/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.8.5")>
-<Assembly: AssemblyFileVersion("4.2.8.5")>
+<Assembly: AssemblyVersion("4.2.9.1")>
+<Assembly: AssemblyFileVersion("4.2.9.1")>

Aviso/frmLaufzettel.vb

@@ -643,7 +643,4 @@ Public Class frmLaufzettel
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAktenzettelDruck.CheckedChanged
-
-    End Sub
 End Class

Aviso/frmLogin.vb

@@ -218,13 +218,13 @@ Public Class frmLogin
                 Dim SQLSTR = " 
                     SELECT AVISOID,KDNR FROM
 						 (
-						 SELECT  AvisoId,Auftraggeber_KdNr as KDNR  FROM [Aviso]  where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
+						 SELECT  AvisoId,Auftraggeber_KdNr as KDNR  FROM [Aviso]  where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
 						 UNION
-						 SELECT  AvisoId,Frächter_KdNr as KDNR  FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
+						 SELECT  AvisoId,Frächter_KdNr as KDNR  FROM [Aviso] where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
 						 UNION
-						 SELECT  AvisoId,tblSnd_AvisiererKdNr as KDNR  FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
+						 SELECT  AvisoId,tblSnd_AvisiererKdNr as KDNR  FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
 						 UNION
-						 SELECT  AvisoId,tblSnd_FrachtfuehrerKdNr as KDNR  FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
+						 SELECT  AvisoId,tblSnd_FrachtfuehrerKdNr as KDNR  FROM [Aviso] inner join tblSendungen on tblSnd_AvisoID=AvisoID where datum >=DATEADD(DAY,-4,GETDATE()) and Firma IN ('VERAG','IMEX','AMBAR','UNISPED') and  cast(datum  as  date)> '29.01.2024'   and status NOT IN (1,2)
 						 ) as T1
 						 where KDNR is not null and kdnr >0
 						  /*and(SELECT COUNT(*) FROM tblAvisoStatusMails  where  asm_AvisoId=AvisoID AND asm_KdNr=KdNr and asm_StatuscodeSent=5) =0   */

Aviso/frmSendungsdetailsNEU.vb

@@ -296,29 +296,64 @@ Public Class frmSendungsdetailsNEU
                 'End If
                 If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID = 44 Then ' ATB GEstellung
 
+
+                    If Not IsValid18AlphaNumericCode(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1) Then
+                        Dim err = "T1/Vorpapier nicht korrekt (18-stellig)!"
+                        rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
+
+                    Else
+
                         If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
                             Dim err = "- ATB-Gestellung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte."
                             rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
                             'If showErr Then MsgBox(err) : Return False
                         End If
 
+                    End If
 
                 End If
             End If
 
+            Dim isVerimex As Boolean = (VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX")
 
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
+            Dim invalidPrepaper As Boolean =
+                        (cboVorpapier.Text.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(cboVorpapier.Text) AndAlso txtVorpapierPos.Text.Trim = "") OrElse
+                        (cboVorpapier2.Text.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(cboVorpapier2.Text) AndAlso txtVorpapier2Pos.Text.Trim = "") OrElse
+                        (cboVorpapier3.Text.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(cboVorpapier3.Text) AndAlso txtVorpapier3Pos.Text.Trim = "")
 
-                If (cboVorpapier.Text.Trim <> String.Empty And txtVorpapierPos.Text.Trim = String.Empty) Or
-                    (cboVorpapier2.Text.Trim <> String.Empty And txtVorpapier2Pos.Text.Trim = String.Empty) Or
-                    (cboVorpapier3.Text.Trim <> String.Empty And txtVorpapier3Pos.Text.Trim = String.Empty) Then
-                    If showErr AndAlso MsgBox("Pre-Paper Position is not filled. Really continue?", vbYesNoCancel) <> vbYes Then
+            Dim missingPosition As Boolean =
+                        (cboVorpapier.Text.Trim <> "" AndAlso txtVorpapierPos.Text.Trim = "" Or cboVorpapier.Text.Trim = "" AndAlso txtVorpapierPos.Text.Trim <> "") OrElse
+                        (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 hasIssue As Boolean
+
+            If isVerimex Then
+                hasIssue = (invalidPrepaper OrElse missingPosition)
+            Else
+                hasIssue = (invalidPrepaper OrElse missingPosition)
+            End If
+
+            Dim InfoMsg As String
+
+            If isVerimex Then
+                InfoMsg = "Pre-Paper/PosNr data is invalid or incomplete. Continue?"
+            Else
+                InfoMsg = "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig, fortfahren?"
+            End If
+
+            If hasIssue Then
+
+                If showErr Then
+                    If MsgBox(InfoMsg, vbYesNoCancel) <> vbYes Then
                         Return False
                     End If
                 End If
+
             End If
 
 
+
             If cntlAvisierer_Abf.Visible = False And
                 cntlAuftr_Abf.Visible = False And
                 cntlEmpf_Abf.Visible = False And
@@ -1981,7 +2016,6 @@ Public Class frmSendungsdetailsNEU
         End If
 
 
-
         If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
             btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
             setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")
@@ -4955,15 +4989,22 @@ Public Class frmSendungsdetailsNEU
             Try
                 Dim files As New List(Of String) '
                 Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf"
+                Dim counter As Integer = 0
 
 
                 For Each r As DataGridViewRow In dgvAnhang.SelectedRows
 
-                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then
+                        files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+                        counter += 1
+                    End If
                 Next
+
                 VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
+                If outputFile <> "" AndAlso counter > 0 Then
                     Process.Start(outputFile)
+                End If
 
             Catch ex As Exception
                 VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -7962,6 +8003,9 @@ Public Class frmSendungsdetailsNEU
                 Exit Sub
             End If
 
+            If Not IsValid18AlphaNumericCode(vorpT1) Then MsgBox("T1/Vorpapier nicht korrekt (18-stellig)!") : Exit Sub
+
+
             If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung <> "EUR" Then
                 MsgBox("Warenwert der Gestellung darf nur in EUR angegeben werden")
                 Exit Sub
@@ -8231,4 +8275,12 @@ Public Class frmSendungsdetailsNEU
         End If
     End Sub
 
+    Private Function IsValid18AlphaNumericCode(value As String) As Boolean
+        value = value.Trim()
+
+        If value.Length <> 18 Then Return False
+
+        Return value.All(Function(c) Char.IsLetterOrDigit(c))
+    End Function
+
 End Class

Aviso/usrCntlSND_ATBGestellung.vb

@@ -37,6 +37,10 @@ Public Class usrCntlSND_ATBGestellung
         Dim f As frmSendungsdetailsNEU = Me.FindForm
         If f.SAVE_ME() Then
 
+            Dim INfoVorpapier As String = ""
+
+            If Not checkSendungenVorpapierte(f.SENDUNG_LIST, INfoVorpapier) Then MsgBox(INfoVorpapier) : Exit Sub
+
             SND = f.SENDUNG_LIST(f.CURRENT_INDEX)
 
                 If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
@@ -58,7 +62,9 @@ Public Class usrCntlSND_ATBGestellung
                     WarenwertEUR = SND.tblSnd_Warenwert
                 End If
 
-            If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub
+                If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("T1/Vorpapier angeben!") : Exit Sub
+
+            If Not IsValid18AlphaNumericCode(If(SND.tblSnd_ATB_T1, "")) Then MsgBox("T1/Vorpapier nicht korrekt (18-stellig)!") : Exit Sub
 
             If If(SND.tblSnd_Zollsystem_Land, "") = "" Then MsgBox("Abf-Land muss angegeben werden!") : Exit Sub
 
@@ -121,7 +127,7 @@ Public Class usrCntlSND_ATBGestellung
 
                 If isZollern(SND) Then
 
-                Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 99
+                Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 90
 
             End If
 
@@ -203,7 +209,7 @@ Public Class usrCntlSND_ATBGestellung
                 Case Sicherheiten_Standort.IMEX
                     firmaId = 20
                 Case Sicherheiten_Standort.ZOLLERN
-                    firmaId = 99
+                    firmaId = 90
             End Select
 
             With frm
@@ -271,7 +277,7 @@ Public Class usrCntlSND_ATBGestellung
 
             If isZollern(SND) Then
 
-                Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 99
+                Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 90
 
             End If
 
@@ -395,4 +401,50 @@ Public Class usrCntlSND_ATBGestellung
 
 
     End Function
+
+    Private Function IsValid18AlphaNumericCode(value As String) As Boolean
+        value = value.Trim()
+
+        If value.Length <> 18 Then Return False
+
+        Return value.All(Function(c) Char.IsLetterOrDigit(c))
+    End Function
+
+
+    Private Function checkSendungenVorpapierte(list As List(Of cSendungen), ByRef MsgInfo As String) As Boolean
+
+        Dim index As Integer = 1
+        Dim existingVorpapier As Boolean = False
+
+        For Each SND As cSendungen In list
+
+            Dim existing As Boolean =
+            (SND.tblSnd_Vorpapier.ToString.Trim <> "") OrElse
+            (SND.tblSnd_Vorpapier2.ToString.Trim <> "") OrElse
+            (SND.tblSnd_Vorpapier3.ToString.Trim <> "")
+
+            If existing Then existingVorpapier = existing
+
+
+            Dim invalidPrepaper As Boolean =
+            (SND.tblSnd_Vorpapier.ToString.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(SND.tblSnd_Vorpapier.ToString.Trim)) OrElse
+            (SND.tblSnd_Vorpapier2.ToString.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(SND.tblSnd_Vorpapier2.ToString.Trim)) OrElse
+            (SND.tblSnd_Vorpapier3.ToString.Trim <> "" AndAlso Not IsValid18AlphaNumericCode(SND.tblSnd_Vorpapier3.ToString.Trim))
+
+            If invalidPrepaper Then
+                MsgInfo = "Vorpapier-Nr bei Sendung " & index & " ist ungültig!"
+                Return False
+            End If
+
+            index += 1
+
+        Next
+
+        If Not existingVorpapier Then
+            MsgInfo = "keine Vorpapier-Nr bei den Sendung(en) hinterlegt!"
+        End If
+
+        Return existingVorpapier
+
+    End Function
 End Class