Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM.vb

@@ -73,7 +73,7 @@
         initControlsHandler()
         cboSprache.Items.Clear()
         cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
-        'cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
 
         cboPaketOption.Items.Clear()
         cboPaketOption.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Zertifikate.vb

@@ -73,6 +73,7 @@
         initControlsHandler()
         cboSprache.Items.Clear()
         cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
 
         txtCBAM_jeZertBest_Paket_1._value = 50
         txtCBAM_ZertAufschlag_Paket_1._value = 10

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -1796,7 +1796,7 @@ Public Class FormularManagerNEU
         '   Dim firma=getUO2()
         Select Case usrCntl.cboSprache._value
             Case "EN"
-                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM", listTowrite)
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_ENG", listTowrite)
             Case Else
                 Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM", listTowrite)
         End Select
@@ -1828,7 +1828,7 @@ Public Class FormularManagerNEU
 
         Select Case usrCntl.cboSprache._value
             Case "EN"
-                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Zertifikate", listTowrite)
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Zertifikate_ENG", listTowrite)
             Case Else
                 Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG", "", "CBAM_Zertifikate", listTowrite)
         End Select

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb

@@ -133,6 +133,26 @@ Public Class cRelayHub
         End Function
 
         ' Public API: erstellt Job-Order mit 401-Retry
+        Public Shared Function getJSON(request As cRelayHubJobOrderRequest) As String
+            Dim result As New cRelayHubApiResult()
+            Try
+                Dim sanitized = Sanitize(request)
+                Dim settings As New JsonSerializerSettings With {
+                    .NullValueHandling = NullValueHandling.Ignore,
+                    .ContractResolver = New Newtonsoft.Json.Serialization.DefaultContractResolver With {
+                        .NamingStrategy = New Newtonsoft.Json.Serialization.CamelCaseNamingStrategy()
+                    }
+                }
+                Dim jsonPayload As String = JsonConvert.SerializeObject(sanitized, settings)
+                Console.WriteLine("JSON → " & jsonPayload)
+                Return JsonConvert.SerializeObject(request)
+
+
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+                Return "Error"
+            End Try
+        End Function
         Public Shared Function query_declarations(request As cRelayHubJobOrderRequest) As cRelayHubApiResult
             Dim result As New cRelayHubApiResult()
             Try

VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb

@@ -227,6 +227,18 @@ Public Class cVERAG_CustomsDeclarations
             Dim cbamWhere As String = VERAG_PROG_ALLGEMEIN.cGreendeal_CBAM_Trn.BuildCBAMPatternWhereClause("i.zaItem_HSCode")
             Dim cbamWhereSnd As String = "  AND " & cbamWhere.Replace("i.zaItem_HSCode", "zaItem_HSCode")
 
+            Dim cbamWhereISOCntry As String = " i.zaItem_OriginCountry NOT IN (
+		        /*EU-27 (ISO2)*/
+		        'EU','AT','BE','BG','HR','CY','CZ','DK','EE','FI','FR',
+		        'DE','GR','HU','IE','IT','LV','LT','LU','MT','NL',
+		        'PL','PT','RO','SK','SI','ES','SE',
+		        /*Nicht CBAM-pflichtig (EU-ETS verknüpft / Ausnahmen)*/
+		        'CH', /* Schweiz */
+		        'NO', /* Norwegen */
+		        'IS', /* Island */
+		        'LI', /* Liechtenstein */
+		        'XI'  /* Nordirland (NI-Protokoll; im Warenverkehr EU-behandelt) */
+	        ) "
 
             ' ------------------------------------------------------------
             ' SQL: ZA-IDs ermitteln
@@ -247,7 +259,8 @@ Public Class cVERAG_CustomsDeclarations
             "  AND cast(z.za_DeclarationDate as date) >= @dateFrom " &
             "  AND cast(z.za_DeclarationDate  as date) <= @dateTo " &
            If(eoriIn <> "", "  AND p.zaParty_EORI IN (" & eoriIn & ") ", "") &
-            "  AND " & cbamWhere
+            "  AND " & cbamWhere &
+            "  AND " & cbamWhereISOCntry
 
             If indirect Then
                 sqlstr &= " AND (
@@ -265,6 +278,7 @@ Public Class cVERAG_CustomsDeclarations
                 sqlstr &= " AND z.za_System = @sys "
             End If
 
+
             Using conn = SQL.GetNewOpenConnectionFMZOLL()
                 Using cmd As New SqlCommand(sqlstr, conn)