merge vers

DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb

@@ -1234,6 +1234,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
             Next
             packst = packst.Trim
             PosAnzahl = DY.eza_WARENPOS.Count
+            If packst.Length > 185 Then packst = packst.Substring(0, 185) & "..."
             SPEDITIONSBUCH.Packstücke = packst & ", " & rohmasseTmp.ToString("N1") & " kg"
 
             If If(SPEDITIONSBUCH.Rohmasse, 0) = 0 AndAlso rohmasseTmp > 0 Then SPEDITIONSBUCH.Rohmasse = CInt(rohmasseTmp)
@@ -1359,6 +1360,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
             Next
             packst = packst.Trim
             PosAnzahl = DY.aes_WARENPOS.Count
+            If packst.Length > 185 Then packst = packst.Substring(0, 185) & "..."
             SPEDITIONSBUCH.Packstücke = packst & ", " & rohmasseTmp.ToString("N1") & " kg"
 
             If If(SPEDITIONSBUCH.Rohmasse, 0) = 0 AndAlso rohmasseTmp > 0 Then SPEDITIONSBUCH.Rohmasse = CInt(rohmasseTmp)

DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA_Greenpulse.vb

@@ -127,7 +127,7 @@ Public Class cDakosyEZA_Greenpulse
                                            ByRef details As cATEZ_Greenpulse_KafkaDecs.ImporterDetailsNode)
         ' Pflicht: EORI in Parties
         parties.ImporterIdentificationNumber = eori
-        Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = cZOLL_IMPORT.getAdresseFromEORI(eori, "", "")
+        Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = cZOLL_IMPORT.getAdresseFromEORI(eori, "", "", True)
 
         If AD IsNot Nothing Then
             details.ImporterTitle = (If(AD.Name_1, "") & " " & If(AD.Name_2, "")).trim
@@ -146,7 +146,7 @@ Public Class cDakosyEZA_Greenpulse
                                            ByRef parties As cATEZ_Greenpulse_KafkaDecs.PartiesNode,
                                            ByRef details As cATEZ_Greenpulse_KafkaDecs.ExporterDetailsNode)
         parties.ExporterIdentificationNumber = eori
-        Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = cZOLL_IMPORT.getAdresseFromEORI(eori, "", "")
+        Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = cZOLL_IMPORT.getAdresseFromEORI(eori, "", "", True)
 
         If AD IsNot Nothing Then
             details.ExporterTitle = (If(AD.Name_1, "") & " " & If(AD.Name_2, "")).trim

DAKOSY_Worker/cZOLL_IMPORT.vb

@@ -1491,10 +1491,10 @@ Public Class cZOLL_IMPORT
 
 
 
-    Shared Function getAdresseFromEORI(EORI, EORI_NL, Firma)
+    Shared Function getAdresseFromEORI(EORI, EORI_NL, Firma, Optional ignoreCountOver1 = False)
         If EORI Is Nothing Then Return Nothing
         If If(EORI, "") <> "" Then
-            Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL, Firma)
+            Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL, Firma, ignoreCountOver1)
             If IsNumeric(kdNrTmp) Then
                 Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdNrTmp)
                 Return ADRESSE

UID/My Project/AssemblyInfo.vb

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