divl. Änderungne

Aviso/AvisoStatusFunctions.vb

@@ -2174,7 +2174,7 @@ ELSE_ATILLA:
                                 Dim DsId = ""
                                 Dim DsId2 = ""
                                 Dim frist = ""
-                                Dim gestellungsadresse = "<td><td/>"
+                                Dim gestellungsadresse = "<td></td>"
                                 Dim found = False
                                 Select Case s.tblSnd_Abfertigungsart_ID
                                     Case 5, 6, 18, 24, 32, 33, 34, 37, 40 'Versand 
@@ -2265,7 +2265,7 @@ ELSE_ATILLA:
                                                                 Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False)
                                                                 If PathTmp <> "" Then anhaenge.Add(PathTmp) : found = True
                                                             End If
-                                                            If IsNumeric(DsId) Then
+                                                            If IsNumeric(DsId2) Then
                                                                 Dim PathTmp2 = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId2)).GET_TOP1_PATH(False)
                                                                 If PathTmp2 <> "" Then anhaenge.Add(PathTmp2) : found = True
                                                             End If
@@ -2294,7 +2294,7 @@ ELSE_ATILLA:
                         If cnt = 1 Then ' wurde nicht erhöht -> keine Einträge
                             SendungslistTXT = ""
                         End If
-                        If KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT)
+                        If KUNDE_ERW IsNot Nothing AndAlso KUNDE_ERW.EmailFreigabeSendungsListe Then hText = hText.Replace("%Platzhalter%", SendungslistTXT)
                     End If
                 End If
         End Select
@@ -2375,7 +2375,7 @@ ELSE_ATILLA:
         If AbfertigungsNr <= 0 Then Return False
 
         If FilialenNr <> 4805 And FilialenNr <> 4811 Then ' Kein Ü-T 
-            Dim dt = VERAGSQL.loadDgvBySql("SELECT isnull(dy_vbd_dsid,'') as DsId ,isnull(isnull(ncts_MRN,ncts_ANR),'') as MRN, isnull(ncts_Wiedergestellungsdatum ,'') as WG FROM   tblDakosy_Zollanmeldungen   inner join tblDakosy_nctsout on dy_id=ncts_dyaAnmID where dy_SendungsId='" & SendungsId & "' and dy_status <= 70 order by dy_status desc, dy_Erstellung desc", "FMZOLL")
+            Dim dt = VERAGSQL.loadDgvBySql("SELECT isnull(dy_vbd_dsid,'') as DsId ,isnull(isnull(ncts_MRN,ncts_ANR),'') as MRN, isnull(ncts_LimitDate ,'') as WG FROM   tblDakosy_Zollanmeldungen   inner join tblDakosy_NCTSOut004 on dy_id=ncts_dyaAnmID where dy_SendungsId='" & SendungsId & "' and dy_status <= 70 order by dy_status desc, dy_Erstellung desc", "FMZOLL")
             If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
                 AtcMrn = dt.Rows(0)("MRN")
                 dsId = dt.Rows(0)("DsId")

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.0")>
-<Assembly: AssemblyFileVersion("4.2.8.0")>
+<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.Designer.vb

@@ -37,7 +37,11 @@ Partial Class frmSendungsdetailsNEU
         Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -1038,7 +1042,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
-        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(102, 30)
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(188, 30)
         Me.ToolStripMenuItem8.Text = "T1"
         '
         'ToolStripMenuItem9
@@ -1046,7 +1050,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9"
-        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(102, 30)
+        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(188, 30)
         Me.ToolStripMenuItem9.Text = "T2"
         '
         'ToolStripMenuItem10
@@ -1054,7 +1058,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ToolStripMenuItem10.Enabled = False
         Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(102, 30)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(188, 30)
         Me.ToolStripMenuItem10.Text = "Ü-T"
         Me.ToolStripMenuItem10.Visible = False
         '
@@ -2729,8 +2733,24 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvAbrechnung.AllowUserToResizeColumns = False
         Me.dgvAbrechnung.AllowUserToResizeRows = False
         Me.dgvAbrechnung.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvAbrechnung.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
         Me.dgvAbrechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvAbrechnung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnAbrId, Me.clmnAbrFirma, Me.clmnAbrLeistungsNr, Me.clmnAbrLeistung, Me.clmnAbrPreis})
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvAbrechnung.DefaultCellStyle = DataGridViewCellStyle15
         Me.dgvAbrechnung.Location = New System.Drawing.Point(6, 35)
         Me.dgvAbrechnung.MultiSelect = False
         Me.dgvAbrechnung.Name = "dgvAbrechnung"
@@ -2776,8 +2796,8 @@ Partial Class frmSendungsdetailsNEU
         '
         'clmnAbrPreis
         '
-        DataGridViewCellStyle13.Format = "C2"
-        Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle14.Format = "C2"
+        Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle14
         Me.clmnAbrPreis.HeaderText = "Preis"
         Me.clmnAbrPreis.MaxInputLength = 15
         Me.clmnAbrPreis.MinimumWidth = 6
@@ -2985,8 +3005,24 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvVorkosten.AllowUserToResizeColumns = False
         Me.dgvVorkosten.AllowUserToResizeRows = False
         Me.dgvVorkosten.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
         Me.dgvVorkosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVorkosten.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnVK_id, Me.clmnFirma, Me.clmnLeistung, Me.clmnPreis})
+        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle18
         Me.dgvVorkosten.Location = New System.Drawing.Point(3, 4)
         Me.dgvVorkosten.MultiSelect = False
         Me.dgvVorkosten.Name = "dgvVorkosten"
@@ -3028,8 +3064,8 @@ Partial Class frmSendungsdetailsNEU
         'clmnPreis
         '
         Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle14.Format = "C2"
-        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle17.Format = "C2"
+        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle17
         Me.clmnPreis.HeaderText = "Preis"
         Me.clmnPreis.MaxInputLength = 15
         Me.clmnPreis.MinimumWidth = 6

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 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
 
+                    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)
 
-                Process.Start(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
@@ -8230,4 +8274,13 @@ Public Class frmSendungsdetailsNEU
             e.SuppressKeyPress = True
         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.Designer.vb

@@ -23,6 +23,7 @@ Partial Class usrCntlSND_ATBGestellung
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.pnlT1 = New System.Windows.Forms.Panel()
+        Me.Button2 = New System.Windows.Forms.Button()
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.txtT1Datum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
@@ -36,7 +37,6 @@ Partial Class usrCntlSND_ATBGestellung
         Me.Label3 = New System.Windows.Forms.Label()
         Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.Label33 = New System.Windows.Forms.Label()
-        Me.Button2 = New System.Windows.Forms.Button()
         Me.pnlT1.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -62,6 +62,18 @@ Partial Class usrCntlSND_ATBGestellung
         Me.pnlT1.Size = New System.Drawing.Size(549, 125)
         Me.pnlT1.TabIndex = 0
         '
+        'Button2
+        '
+        Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(424, 94)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(94, 28)
+        Me.Button2.TabIndex = 133
+        Me.Button2.Text = "Saldocheck"
+        Me.Button2.UseVisualStyleBackColor = True
+        Me.Button2.Visible = False
+        '
         'PictureBox5
         '
         Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen1
@@ -253,17 +265,6 @@ Partial Class usrCntlSND_ATBGestellung
         Me.Label33.TabIndex = 3
         Me.Label33.Text = "Vorpapier / T1:"
         '
-        'Button2
-        '
-        Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(424, 94)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(94, 28)
-        Me.Button2.TabIndex = 133
-        Me.Button2.Text = "Saldocheck"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
         'usrCntlSND_ATBGestellung
         '
         Me.Controls.Add(Me.pnlT1)

Aviso/usrCntlSND_ATBGestellung.vb

@@ -37,32 +37,38 @@ 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
+                If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
 
-            If Not IsNumeric(SND.tblSnd_Warenwert) OrElse CInt(SND.tblSnd_Warenwert) < 0 Then MsgBox("Warenwert angeben!") : Exit Sub
+                If Not IsNumeric(SND.tblSnd_Warenwert) OrElse CInt(SND.tblSnd_Warenwert) < 0 Then MsgBox("Warenwert angeben!") : Exit Sub
 
-            If (SND.tblSnd_WarenwertWaehrung) Is Nothing Then MsgBox("Währungseinheit angeben!") : Exit Sub
+                If (SND.tblSnd_WarenwertWaehrung) Is Nothing Then MsgBox("Währungseinheit angeben!") : Exit Sub
+
+                If SND.tblSnd_WarenwertWaehrung <> "EUR" Then
+                    Dim kurs As New cFremdwaehrungskurse(SND.tblSnd_WarenwertWaehrung)
+                    If kurs.hasEntry Then
+                        WarenwertEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung, CDate(Today)), 2)
+                    Else
+                        MsgBox("Umrechnungskurs kann nicht ermittelt werden, bitte EUR-Betrag eingeben!")
+                        Exit Sub
+                    End If
 
-            If SND.tblSnd_WarenwertWaehrung <> "EUR" Then
-                Dim kurs As New cFremdwaehrungskurse(SND.tblSnd_WarenwertWaehrung)
-                If kurs.hasEntry Then
-                    WarenwertEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung, CDate(Today)), 2)
                 Else
-                    MsgBox("Umrechnungskurs kann nicht ermittelt werden, bitte EUR-Betrag eingeben!")
-                    Exit Sub
+                    WarenwertEUR = SND.tblSnd_Warenwert
                 End If
 
-            Else
-                WarenwertEUR = SND.tblSnd_Warenwert
-            End If
+                If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("T1/Vorpapier angeben!") : Exit Sub
 
-            If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) 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
 
-            If SND.tblSnd_T1_Frist IsNot Nothing AndAlso IsDate(SND.tblSnd_T1_Frist) Then
+                If SND.tblSnd_T1_Frist IsNot Nothing AndAlso IsDate(SND.tblSnd_T1_Frist) Then
                     If CDate(SND.tblSnd_T1_Frist) >= Today() Then
                         '-> OK
                     Else
@@ -81,55 +87,62 @@ Public Class usrCntlSND_ATBGestellung
 
                 End If
 
-            Dim Standort As String = ""
-            Dim firmaID As Integer = -1
+                Dim Standort As String = ""
+                Dim firmaID As Integer = -1
 
-            Select Case SND.FilialenNr
+                Select Case SND.FilialenNr
                     Case 4803, 4809
-                    Standort = Sicherheiten_Standort.VERAG_AG : firmaID = 1
-                Case 5601
-                    Standort = Sicherheiten_Standort.UNISPED : firmaID = 21
-                Case 5701
-                    Standort = Sicherheiten_Standort.AMBAR : firmaID = 24
-                Case 4810, 5103, 5901
-                    Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2
-                Case 5501
-                    Standort = Sicherheiten_Standort.IMEX : firmaID = 20
-            End Select
+                        Standort = Sicherheiten_Standort.VERAG_AG : firmaID = 1
+                    Case 5601
+                        Standort = Sicherheiten_Standort.UNISPED : firmaID = 21
+                    Case 5701
+                        Standort = Sicherheiten_Standort.AMBAR : firmaID = 24
+                    Case 4810, 5103, 5901
+                        Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2
+                    Case 5501
+                        Standort = Sicherheiten_Standort.IMEX : firmaID = 20
+                End Select
 
                 'sonderfälle lt. Mestan
                 If SND.tblSnd_Zollsystem_Land = "DE" Then
 
                     Select Case SND.FilialenNr
                         Case 5501, 4803, 4809, 5103
-                        Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2
-                End Select
+                            Standort = Sicherheiten_Standort.VERAG_GMBH : firmaID = 2
+                    End Select
 
                 ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
 
                     If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA  
-                    Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11
-                ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
+                        Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11
+                    ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
                         Select Case SND.FilialenNr
                             Case 4803, 5303, 4809, 5103
-                            Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11
-                    End Select
+                                Standort = Sicherheiten_Standort.VERAG_CS : firmaID = 11
+                        End Select
 
                     End If
 
                 End If
 
+                If isZollern(SND) Then
 
-            Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaID)
-            If GesSichRef Is Nothing Then MsgBox("Verwahrungsreferenz kann nicht ermittelt werden!") : Exit Sub
+                Standort = Sicherheiten_Standort.ZOLLERN : firmaID = 90
+
+            End If
+
+
+
+                Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaID)
+                If GesSichRef Is Nothing Then MsgBox("Verwahrungsreferenz kann nicht ermittelt werden!") : Exit Sub
 
                 Dim saldo = CDbl(GesSichRef.CalcSaldo())
 
-            Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100)
+                Dim sicherheitsbertrag As Double = WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100)
 
-            If sicherheitsbertrag > saldo Then
-                If MsgBox(Standort & vbNewLine & "Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert in EUR: " & WarenwertEUR & " (Sicherheitsbetrag: " & sicherheitsbertrag & ") übersteigt den vorhandenen Sicherheitssaldo von: " & saldo & vbNewLine & "Trotzdem fortfahren", vbYesNoCancel) <> vbYes Then Exit Sub
-            End If
+                If sicherheitsbertrag > saldo Then
+                    If MsgBox(Standort & vbNewLine & "Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert in EUR: " & WarenwertEUR & " (Sicherheitsbetrag: " & sicherheitsbertrag & ") übersteigt den vorhandenen Sicherheitssaldo von: " & saldo & vbNewLine & "Trotzdem fortfahren", vbYesNoCancel) <> vbYes Then Exit Sub
+                End If
 
                 Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"), GesSichRef, Standort, WarenwertEUR, gsnr_proLKW_global)
 
@@ -183,19 +196,20 @@ Public Class usrCntlSND_ATBGestellung
             Dim frm As New frmGesamtsicherheitenNEU()
 
             Select Case gessicherheit.gs_standort
-                Case "Verag GmbH"
+                Case Sicherheiten_Standort.VERAG_GMBH
                     firmaId = 2
-                Case "Verag AG"
+                Case Sicherheiten_Standort.VERAG_AG
                     firmaId = 1
-                Case "Unisped GmbH"
+                Case Sicherheiten_Standort.UNISPED
                     firmaId = 21
-                Case "AMBAR GmbH"
+                Case Sicherheiten_Standort.AMBAR
                     firmaId = 24
-                Case "Verag CS"
+                Case Sicherheiten_Standort.VERAG_CS
                     firmaId = 11
-                Case "IMEX"
+                Case Sicherheiten_Standort.IMEX
                     firmaId = 20
-
+                Case Sicherheiten_Standort.ZOLLERN
+                    firmaId = 90
             End Select
 
             With frm
@@ -226,15 +240,15 @@ Public Class usrCntlSND_ATBGestellung
 
             Select Case SND.FilialenNr
                 Case 4803, 4809
-                    Standort = "VERAG AG" : firmaId = 1
+                    Standort = Sicherheiten_Standort.VERAG_AG : firmaId = 1
                 Case 5601
-                    Standort = "Unisped GmbH" : firmaId = 21
+                    Standort = Sicherheiten_Standort.UNISPED : firmaId = 21
                 Case 5701
-                    Standort = "AMBAR GmbH" : firmaId = 24
+                    Standort = Sicherheiten_Standort.AMBAR : firmaId = 24
                 Case 4810, 5103, 5901
-                    Standort = "VERAG GmbH" : firmaId = 2
+                    Standort = Sicherheiten_Standort.VERAG_GMBH : firmaId = 2
                 Case 5501
-                    Standort = "IMEX" : firmaId = 20
+                    Standort = Sicherheiten_Standort.IMEX : firmaId = 20
             End Select
 
             'sonderfälle lt. Mestan
@@ -242,24 +256,33 @@ Public Class usrCntlSND_ATBGestellung
 
                 Select Case SND.FilialenNr
                     Case 5501, 4803, 4809, 5103
-                        Standort = "VERAG GmbH" : firmaId = 2
+                        Standort = Sicherheiten_Standort.VERAG_GMBH : firmaId = 2
                 End Select
 
             ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then
 
                 If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA  
-                    Standort = "VERAG CS" : firmaId = 11
+                    Standort = Sicherheiten_Standort.VERAG_CS : firmaId = 11
                 ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz
                     Select Case SND.FilialenNr
                         Case 4803, 5303, 4809, 5103
-                            Standort = "VERAG CS" : firmaId = 11
+                            Standort = Sicherheiten_Standort.VERAG_CS : firmaId = 11
                     End Select
 
                 End If
 
             End If
 
-            Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
+
+
+            If isZollern(SND) Then
+
+                Standort = Sicherheiten_Standort.ZOLLERN : firmaId = 90
+
+            End If
+
+
+            Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort, firmaId)
             Dim frm As New frmGesamtsicherheitenNEU
 
 
@@ -362,7 +385,66 @@ Public Class usrCntlSND_ATBGestellung
         Process.Start(webAddress)
     End Sub
 
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Function isZollern(SND As cSendungen)
 
-    End Sub
+        Dim zollernKdnr = {772383, 712203}
+
+        If zollernKdnr.Contains(SND.tblSnd_AbsenderKdNr) OrElse
+            zollernKdnr.Contains(SND.tblSnd_AuftraggeberKdNr) OrElse
+            (SND.tblSnd_AvisiererKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_AvisiererKdNr)) OrElse
+            zollernKdnr.Contains(SND.tblSnd_EmpfaengerKdNr) OrElse
+            (SND.tblSnd_FrachtfuehrerKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_FrachtfuehrerKdNr)) Then
+            Return True
+        Else
+            Return False
+        End If
+
+
+    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