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

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

Browse Source
This commit is contained in:
d.breimaier
2026-09-16 08:46:17 +02:00
parent cf13d0fcfc 84f9a8df55
commit d39641eb83
3 changed files with 23 additions and 5937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -262,3 +262,4 @@ __pycache__/
/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente /VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente
/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj /VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
/SDL/SDL.vbproj /SDL/SDL.vbproj
/SDL/SDL.vbproj

5935
SDL/SDL.vbproj
View File

File diff suppressed because it is too large Load Diff

24
VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_CustomsDeclarations.vb
View File

@@ -225,7 +225,13 @@ Public Class cVERAG_CustomsDeclarations
' CBAM Pattern (HSCode) ' CBAM Pattern (HSCode)
' ------------------------------------------------------------ ' ------------------------------------------------------------
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") &
" AND zaItem_OriginCountry NOT IN (
'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',
'CH','NO','IS','LI','XI'
)"
Dim cbamWhereISOCntry As String = " i.zaItem_OriginCountry NOT IN ( Dim cbamWhereISOCntry As String = " i.zaItem_OriginCountry NOT IN (
/*EU-27 (ISO2)*/ /*EU-27 (ISO2)*/
@@ -727,6 +733,12 @@ Public Class cVERAG_CustomsDeclarations
p.zaParty_Role IN ('CZ','EX','EXP','EXPORTER','CONSIGNOR'))") & " p.zaParty_Role IN ('CZ','EX','EXP','EXPORTER','CONSIGNOR'))") & "
WHERE z.za_ReleaseDate BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "' WHERE z.za_ReleaseDate BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "'
AND i.zaItem_OriginCountry NOT IN (
'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',
'CH','NO','IS','LI','XI'
)
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM VERAG.dbo.tblGreendeal_CBAM_Trn t FROM VERAG.dbo.tblGreendeal_CBAM_Trn t
@@ -788,11 +800,19 @@ Public Class cVERAG_CustomsDeclarations
Dim prefixes As HashSet(Of String) = Dim prefixes As HashSet(Of String) =
New HashSet(Of String)(cbamHsCodes) New HashSet(Of String)(cbamHsCodes)
Dim excludedCountries As New HashSet(Of String) From {
"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",
"CH", "NO", "IS", "LI", "XI"
}
Return Me.Items. Return Me.Items.
Where(Function(it) Where(Function(it)
Dim hs As String = If(it.zaItem_HSCode, "").Trim() Dim hs As String = If(it.zaItem_HSCode, "").Trim()
If hs = "" Then Return False If hs = "" Then Return False
' linksseitiger Prefix-Abgleich Dim origin As String = If(it.zaItem_OriginCountry, "").Trim().ToUpper()
If origin <> "" AndAlso excludedCountries.Contains(origin) Then Return False
For Each p In prefixes For Each p In prefixes
If hs.StartsWith(p) Then If hs.StartsWith(p) Then
Return True Return True