From cfa9bfe77a728084dc63053623f76c71148804a6 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Thu, 9 Apr 2026 10:59:15 +0200
Subject: [PATCH] KVI Report

---
 SDL/Resources/KVI_report.xlsx                 | Bin 10373 -> 10426 bytes
 .../usrCntlSpeditionsBuchSuche.vb             |  22 ++++++++++-------
 VERAG_PROG_ALLGEMEIN/Classes/SQL.vb           |   4 +--
 .../Classes/cGreendeal_CBAM_Trn.vb            |  23 ++++++++++++++++++
 VERAG_PROG_ALLGEMEIN/cAllgemein.vb            |   2 ++
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/SDL/Resources/KVI_report.xlsx b/SDL/Resources/KVI_report.xlsx
index 4dfb7447b87bd650461d96f34a00fbc077f0201b..1f276e6600f09f5c5084654ce20eb3fcd525af96 100644
GIT binary patch
delta 3097
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

delta 3062
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
E04HFlTmS$7

diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
index a17f5f67..6978cc3d 100644
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -3280,10 +3280,12 @@ Public Class usrCntlSpeditionsBuchSuche
                                             Blatt.Range("V" & cnt).Value = IIf(ZOLLANMELDUNG.VerBestLandZst.ToString.Count > 1, ZOLLANMELDUNG.VerBestLandZst.ToString.Substring(0, 2), "")
                                             Blatt.Range("W" & cnt).Value = ZOLLANMELDUNG.Absender
                                             Blatt.Range("X" & cnt).Value = row.Item("Herkunft")
-                                            Blatt.Range("Y" & cnt).Value = ZOLLANMELDUNG.Incoterms
-                                            Blatt.Range("Z" & cnt).Value = row.Item("Verfahren")
-                                            Blatt.Range("AA" & cnt).Value = row.Item("Preferenz")
-                                            Blatt.Range("AB" & cnt).Value = IIf(row.Item("isCBAM"), "Y", "N")
+                                            Blatt.Range("Y" & cnt).Value = IIf(ZOLLANMELDUNG.VerBestLandZst.ToString.Length >= 2, ZOLLANMELDUNG.VerBestLandZst.ToString.Substring(ZOLLANMELDUNG.VerBestLandZst.ToString.Length - 2, 2), "")
+                                            Blatt.Range("z" & cnt).Value = ZOLLANMELDUNG.Incoterms_code
+                                            Blatt.Range("AA" & cnt).Value = ZOLLANMELDUNG.Incoterms_ort
+                                            Blatt.Range("AB" & cnt).Value = row.Item("Verfahren")
+                                            Blatt.Range("AC" & cnt).Value = row.Item("Preferenz")
+                                            Blatt.Range("AD" & cnt).Value = IIf(row.Item("isCBAM"), "Y", "N")
 
                                             If If(ZOLLANMELDUNG.ATCMRN, "") <> "" AndAlso Blatt.Range("G" & cnt).Value = "" Then
                                                 Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ATCMRN
@@ -3332,20 +3334,22 @@ Public Class usrCntlSpeditionsBuchSuche
                                         Blatt.Range("V" & cnt).Value = IIf(ZOLLANMELDUNG.VerBestLandZst.ToString.Count > 1, ZOLLANMELDUNG.VerBestLandZst.ToString.Substring(0, 2), "")
                                         Blatt.Range("W" & cnt).Value = ZOLLANMELDUNG.Absender
                                         Blatt.Range("X" & cnt).Value = ""
-                                        Blatt.Range("Y" & cnt).Value = ZOLLANMELDUNG.Incoterms
-                                        Blatt.Range("Z" & cnt).Value = ""
-                                        Blatt.Range("AA" & cnt).Value = ""
+                                        Blatt.Range("Y" & cnt).Value = IIf(ZOLLANMELDUNG.VerBestLandZst.ToString.Length >= 2, ZOLLANMELDUNG.VerBestLandZst.ToString.Substring(ZOLLANMELDUNG.VerBestLandZst.ToString.Length - 2, 2), "")
+                                        Blatt.Range("Z" & cnt).Value = ZOLLANMELDUNG.Incoterms_code
+                                        Blatt.Range("AA" & cnt).Value = ZOLLANMELDUNG.Incoterms_ort
                                         Blatt.Range("AB" & cnt).Value = ""
+                                        Blatt.Range("AC" & cnt).Value = ""
+                                        Blatt.Range("AD" & cnt).Value = ""
 
 
                                         If If(ZOLLANMELDUNG.ATCMRN, "") <> "" AndAlso Blatt.Range("G" & cnt).Value = "" Then
                                             Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ATCMRN
                                         End If
-                                        cnt += 1
+
                                     End If
                                 End If
 
-
+                                cnt += 1
 
                             Catch ex As Exception
                                 MsgBox(ex.Message & ex.StackTrace)
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
index edcd09a3..cf4db2ed 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
@@ -1158,7 +1158,7 @@ Public Class SQL
                         If dt.Rows.Count > 1 Then
                             If VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW Then
                                 '    MsgBox("Die EORI-Nr. " & eori & " ist in " & dt.Rows.Count & " Kundenstammsätzen eingetragen.", vbCritical)
-                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Die EORI-Nr. " & eori & " ist in " & dt.Rows.Count & " Kundenstammsätzen eingetragen.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
+                                ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Die EORI-Nr. " & eori & " ist in " & dt.Rows.Count & " Kundenstammsätzen eingetragen.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
                             End If
                         End If
                     End If
@@ -1411,7 +1411,7 @@ Public Class SQL
                     If dt.Rows.Count > 1 Then
                         If VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW Then
                             '   MsgBox("Die Zollnummer " & ZollNr & " ist in " & dt.Rows.Count & " Kundenstammsätzen eingetragen.", vbCritical)
-                            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Die Zollnummer " & ZollNr & " ist in " & dt.Rows.Count & " Kundenstammsätzen eingetragen.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
+                            ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Die Zollnummer " & ZollNr & " ist in " & dt.Rows.Count & " Kundenstammsätzen eingetragen.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
                         End If
                     End If
                     s = dt.Rows(0).Item(0)
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cGreendeal_CBAM_Trn.vb b/VERAG_PROG_ALLGEMEIN/Classes/cGreendeal_CBAM_Trn.vb
index e0ddfacd..e711160e 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cGreendeal_CBAM_Trn.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cGreendeal_CBAM_Trn.vb
@@ -211,6 +211,29 @@ Public Class cGreendeal_CBAM_Trn
     End Function
 
 
+    Public Shared Function isCBAMTnr(TNR As String, Optional LIST As List(Of String) = Nothing) As Boolean
+
+        If LIST Is Nothing Then
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.CBAM_LIST Is Nothing Then VERAG_PROG_ALLGEMEIN.cAllgemein.CBAM_LIST = cGreendeal_CBAM_Trn.LoadCBAMTariffNumbers
+            LIST = VERAG_PROG_ALLGEMEIN.cAllgemein.CBAM_LIST
+        End If
+
+        If TNR Is Nothing Then Return False
+        If String.IsNullOrWhiteSpace(TNR) Then Return False
+
+
+        For Each cbamTnr As String In LIST
+            If Not String.IsNullOrWhiteSpace(cbamTnr) Then
+                If TNR.StartsWith(cbamTnr.Replace("%", "").Trim) Then
+                    Return True
+                End If
+            End If
+        Next
+
+        Return False
+
+    End Function
+
     Public Shared Function LoadCBAMTariffNumbers(Optional onlyActive As Boolean = True,
                                              Optional includeExclusions As Boolean = False) _
                                              As List(Of String)
diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
index d2672d54..f94c6a19 100644
--- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
@@ -28,6 +28,8 @@ Public Class cAllgemein
 
     Public Shared AVISO_LAYOUT_NEW As Boolean = False
 
+    Public Shared CBAM_LIST As List(Of String) = Nothing
+
 
     'Public Shared FMZOLL_ATLAS_Datensicherung As String = "\\192.168.0.91\f\FMZoll\Datensicherung\atlas\atlas\fssouzb"
     Public Shared FMZOLL_ATLAS_Datensicherung_OLD As String = "\\share01\F\FMZoll\Datensicherung\atlas\atlas\fssouzb"