edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CBAM

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-03-05 11:02:39 +01:00
parent 6434bcf08e
commit cc92167508
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM.vb
View File

@@ -73,7 +73,7 @@
initControlsHandler() initControlsHandler()
cboSprache.Items.Clear() cboSprache.Items.Clear()
cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) 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.Clear()
cboPaketOption.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cboPaketOption.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))

1
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlCBAM_Zertifikate.vb
View File

@@ -73,6 +73,7 @@
initControlsHandler() initControlsHandler()
cboSprache.Items.Clear() cboSprache.Items.Clear()
cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) 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_jeZertBest_Paket_1._value = 50
txtCBAM_ZertAufschlag_Paket_1._value = 10 txtCBAM_ZertAufschlag_Paket_1._value = 10

4
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

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

16
VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb
View File

@@ -227,6 +227,18 @@ Public Class cVERAG_CustomsDeclarations
Dim cbamWhere As String = VERAG_PROG_ALLGEMEIN.cGreendeal_CBAM_Trn.BuildCBAMPatternWhereClause("i.zaItem_HSCode") 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 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 ' 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) >= @dateFrom " &
" AND cast(z.za_DeclarationDate as date) <= @dateTo " & " AND cast(z.za_DeclarationDate as date) <= @dateTo " &
If(eoriIn <> "", " AND p.zaParty_EORI IN (" & eoriIn & ") ", "") & If(eoriIn <> "", " AND p.zaParty_EORI IN (" & eoriIn & ") ", "") &
" AND " & cbamWhere " AND " & cbamWhere &
" AND " & cbamWhereISOCntry
If indirect Then If indirect Then
sqlstr &= " AND ( sqlstr &= " AND (
@@ -265,6 +278,7 @@ Public Class cVERAG_CustomsDeclarations
sqlstr &= " AND z.za_System = @sys " sqlstr &= " AND z.za_System = @sys "
End If End If
Using conn = SQL.GetNewOpenConnectionFMZOLL() Using conn = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand(sqlstr, conn) Using cmd As New SqlCommand(sqlstr, conn)