diff --git a/SDL/Resources/CBAM_Auswertung_GP.xlsx b/SDL/Resources/CBAM_Auswertung_GP.xlsx index a9b1fce5..6bea3921 100644 Binary files a/SDL/Resources/CBAM_Auswertung_GP.xlsx and b/SDL/Resources/CBAM_Auswertung_GP.xlsx differ diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 95e1c018..31332eb5 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -452,7 +452,12 @@ Public Class usrCntlCBAM ,'' as 'importer post code' ,'' as 'importer po box' ,'' as 'importer coordinate longitude (x)' - ,'' as 'importer coordinate latitude (y)'" + ,'' as 'importer coordinate latitude (y)' + ,isnull(max(CZ_Name), '') as 'exporter title' + ,isnull(max(CZ_Ländercode), '') as 'exporter country code or member state' + ,'' as 'exporter street' + ,'' as 'exporter street additional'" + Dim SQL_DAKOSY As String = "SELECT [Registriernummer_MRN] RegistriernummerATLAS ,PositionNo PositionsNummer @@ -1177,6 +1182,7 @@ Public Class usrCntlCBAM Dim f As New List(Of String) If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag) If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag) + If btnCBAM_DS_DAKOSY_GP.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_GP.Tag) If f.Count > 0 Then 'Zwischenablage @@ -1725,6 +1731,12 @@ Public Class usrCntlCBAM Blatt.Range("AE" & cnt).Value = row("importer po box") Blatt.Range("AF" & cnt).Value = row("importer coordinate longitude (x)") Blatt.Range("AG" & cnt).Value = row("importer coordinate latitude (y)") + + Blatt.Range("AH" & cnt).Value = row("exporter title") + Blatt.Range("AI" & cnt).Value = row("exporter country code or member state") + Blatt.Range("AJ" & cnt).Value = row("exporter street") + Blatt.Range("AK" & cnt).Value = row("exporter street additional") + cnt += 1 rowcounter += 1 Next