Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

Aviso/My Project/AssemblyInfo.vb

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

Aviso/frmSendungsdetailsNEU.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnDirektAnfuegen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1397,6 +1394,9 @@
         BXidk8YAAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>296, 17</value>
+  </metadata>
   <metadata name="clmnSender.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1896,9 +1896,6 @@
   <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>174, 17</value>
   </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
   <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>596, 17</value>
   </metadata>

Aviso/frmSendungsdetailsNEU.vb

@@ -1,17 +1,17 @@
-Imports VERAG_PROG_ALLGEMEIN
-
-Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
+Imports System.Data.SqlClient
 Imports System.Drawing.Printing
+Imports System.Globalization
+Imports System.IO
 Imports System.Management
-Imports System.Data.SqlClient
+Imports DAKOSY_Worker
+Imports DocumentFormat.OpenXml.Presentation
+Imports EAGetMail
+Imports iText.Layout.Element
 Imports iTextSharp.text.pdf
 Imports Microsoft.Office.Interop
-Imports DocumentFormat.OpenXml.Presentation
 Imports SDL
-Imports System.IO
-Imports EAGetMail
-Imports System.Globalization
-Imports iText.Layout.Element
+Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO
 
 Public Class frmSendungsdetailsNEU
     Public AvisoId As Integer
@@ -404,7 +404,7 @@ Public Class frmSendungsdetailsNEU
                     rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
                 End If
 
-                End If
+            End If
 
 
 
@@ -423,7 +423,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()
@@ -7683,6 +7683,21 @@ Public Class frmSendungsdetailsNEU
                             TextHTML = TextHTML.Replace("%LKW%", AVISO.LKW_Nr)
                             TextHTML = TextHTML.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
 
+                            If AVISO.VORPAPIERE IsNot Nothing AndAlso AVISO.VORPAPIERE.Count > 0 Then
+                                Dim VorpapierNr As String = ""
+
+                                For Each VORP In AVISO.VORPAPIERE
+                                    VorpapierNr &= VORP.vp_Nr & ","
+                                Next
+
+                                If VorpapierNr <> "" AndAlso VorpapierNr.ToString.EndsWith(",") Then
+                                    VorpapierNr = VorpapierNr.Substring(0, VorpapierNr.Length - 1)
+                                End If
+
+                                TextHTML = TextHTML.Replace("%VorpapierNr%", VorpapierNr)
+
+                            End If
+
                             If AVISO.VoraussichtlichesEintreffen IsNot Nothing Then
                                 TextHTML = TextHTML.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString)
                                 Mail.Subject = Mail.Subject.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString)
@@ -7772,6 +7787,7 @@ Public Class frmSendungsdetailsNEU
                         TextHTML = TextHTML.Replace("%Gewicht%", "")
                         TextHTML = TextHTML.Replace("%ImEx%", "")
                         TextHTML = TextHTML.Replace("%Zollstelle%", "")
+                        TextHTML = TextHTML.Replace("T1.: %VorpapierNr%", "")
 
                         For Each anh As DataGridViewRow In dgvAnhang.SelectedRows
                             Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(anh.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
@@ -8416,7 +8432,36 @@ Public Class frmSendungsdetailsNEU
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub SUMAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SUMAToolStripMenuItem.Click
 
+
+
+    Private Sub TestFillTetrapakToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TestFillTetrapakToolStripMenuItem.Click
+        Try
+            If CURRENT_INDEX < 0 OrElse CURRENT_INDEX >= SENDUNG_LIST.Count Then Exit Sub
+
+            Dim SND = SENDUNG_LIST(CURRENT_INDEX)
+
+
+            Dim ZA = cVERAG_CustomsDeclarations.loadBySendungsID(SND.tblSnd_SendungID, True)
+
+            If ZA Is Nothing Then
+                MsgBox("Keine Zollanmeldung gefunden.")
+                Exit Sub
+            End If
+
+            Dim eza = cDakosyEZA.LOADByMRN(ZA.za_MRN, True)
+            If eza Is Nothing Then
+                MsgBox("Keine DAKOSY-EZA gefunden: " & ZA.za_MRN)
+                Exit Sub
+            End If
+
+            Dim importer As New cImporter_DakosyToVERAG
+            importer.UpdateBrokerManagementFileTETRAPAK(ZA)
+
+            MsgBox("BrokerManagementFile wurde aktualisiert.")
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+            MsgBox("Fehler: " & ex.Message)
+        End Try
     End Sub
 End Class