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

SDL/kunden/usrCntlCBAM.Designer.vb

@@ -132,6 +132,7 @@ Partial Class usrCntlCBAM
         Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtVERA_ZertPreis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label14 = New System.Windows.Forms.Label()
+        Me.cbxKdAtrNr = New System.Windows.Forms.CheckBox()
         Me.cntxtAddSdl.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -1651,11 +1652,24 @@ Partial Class usrCntlCBAM
         Me.Label14.TabIndex = 77
         Me.Label14.Text = "Zert.Preis:"
         '
+        'cbxKdAtrNr
+        '
+        Me.cbxKdAtrNr.Checked = True
+        Me.cbxKdAtrNr.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxKdAtrNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.cbxKdAtrNr.Location = New System.Drawing.Point(3, 276)
+        Me.cbxKdAtrNr.Name = "cbxKdAtrNr"
+        Me.cbxKdAtrNr.Size = New System.Drawing.Size(103, 17)
+        Me.cbxKdAtrNr.TabIndex = 78
+        Me.cbxKdAtrNr.Text = "Kd-Atr.Nr"
+        Me.cbxKdAtrNr.UseVisualStyleBackColor = True
+        '
         'usrCntlCBAM
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.cbxKdAtrNr)
         Me.Controls.Add(Me.txtVERA_ZertPreis)
         Me.Controls.Add(Me.Label14)
         Me.Controls.Add(Me.cboJahr)
@@ -1821,4 +1835,5 @@ Partial Class usrCntlCBAM
     Friend WithEvents cboJahr As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents txtVERA_ZertPreis As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label14 As Label
+    Friend WithEvents cbxKdAtrNr As CheckBox
 End Class

SDL/kunden/usrCntlCBAM.vb

@@ -1,4 +1,5 @@
-Imports DAKOSY_Worker
+Imports com.sun.org.apache.bcel.internal.generic
+Imports DAKOSY_Worker
 Imports DocumentFormat.OpenXml.Spreadsheet
 Imports GrapeCity.DataVisualization.TypeScript
 Imports Org.BouncyCastle.Crypto.Agreement
@@ -402,7 +403,6 @@ Public Class usrCntlCBAM
     End Sub
 
     Private Sub usrCntlCBAM_Load(sender As Object, e As EventArgs) Handles Me.Load
-
         cboJahr.Items.Clear()
         For yearCnt = 2023 To Now.Year
             cboJahr.Items.Add(yearCnt)
@@ -2429,6 +2429,8 @@ Public Class usrCntlCBAM
             Order By Anmeldedatum
             Select New With {
                             .MRN = za.za_MRN,
+                            .SendungsId = za.za_SendungsId,
+                            .AvisoId = za.za_AvisoId,
                             .PositionsNummer = it.zaItem_PosNo,
                             .Anmeldedatum = If(za.za_ReleaseDate, za.za_DeclarationDate),
                             .BezugsNr = za.za_LRN,
@@ -2450,12 +2452,19 @@ Public Class usrCntlCBAM
                         }
 
 
+
+
             Dim dt As New DataTable
 
             dt.Columns.Add("MRN")
             dt.Columns.Add("PositionsNummer", GetType(Integer))
             dt.Columns.Add("Anmeldedatum", GetType(Date))
             dt.Columns.Add("BezugsNr")
+            If cbxKdAtrNr.Checked Then
+                dt.Columns.Add("ReferenzKunde")
+            Else
+                dt.Columns.Add("-")
+            End If
             dt.Columns.Add("VertretungsVerhaeltnis")
             dt.Columns.Add("Tarifnummer")
             dt.Columns.Add("Eigenmasse", GetType(Decimal))
@@ -2479,7 +2488,41 @@ Public Class usrCntlCBAM
                 dt.Columns.Add("EstimatedCost", GetType(Decimal))
             End If
 
+
             For Each r In details
+
+                ' =========================================================
+                ' Ermittlung Kunden-Auftragsnummer über SendungsId
+                ' =========================================================
+                Dim KdAtrNr = ""
+                If cbxKdAtrNr.Checked Then
+                    'If r.SendungsId IsNot Nothing Then
+                    '    Dim Snd = New VERAG_PROG_ALLGEMEIN.cSendungen(r.SendungsId)
+                    '    If Snd IsNot Nothing Then
+                    '        KdAtrNr = Snd.getKdAtrNrByEORI(EORI)
+                    '    End If
+                    'End If
+                    If r.SendungsId IsNot Nothing Then
+                        Dim Snd = New VERAG_PROG_ALLGEMEIN.cSendungen(r.SendungsId)
+                        If Snd IsNot Nothing Then
+                            KdAtrNr = Snd.getKdAtrNr("AUFTRAGGEBER")
+                            If KdAtrNr = "" Then
+                                KdAtrNr = Snd.getKdAtrNr("EMPFAENGER")
+                            End If
+                        End If
+                    End If
+                    'Sonderfall Kanadevia 
+                    If EORI = "DE4991397" Then
+                        If KdAtrNr.Contains("/") Then
+                            Dim split = KdAtrNr.split("/")
+                            KdAtrNr = split(0)
+                        End If
+                    End If
+                End If
+                ' =========================================================
+                ' =========================================================
+
+
                 If cbxKosten.Checked Then
 
                     ' =========================================================
@@ -2523,6 +2566,10 @@ Public Class usrCntlCBAM
                     Dim Def_benchmark = If(benchmark Is Nothing, "", benchmark)
                     Dim Def_Emission = If(emission Is Nothing, "", emission)
                     Dim EstimatedCost = If(cost < 0, "", Convert.ToDecimal(cost))
+                    ' =========================================================
+                    ' =========================================================
+
+
 
 
                     dt.Rows.Add(
@@ -2530,6 +2577,7 @@ Public Class usrCntlCBAM
                             r.PositionsNummer,
                             If(r.Anmeldedatum, DBNull.Value),
                             r.BezugsNr,
+                            KdAtrNr,
                             r.VertretungsVerhaeltnis,
                             r.Tarifnummer,
                             If(r.Eigenmasse, 0D),
@@ -2556,6 +2604,7 @@ Public Class usrCntlCBAM
                             r.PositionsNummer,
                             If(r.Anmeldedatum, DBNull.Value),
                             r.BezugsNr,
+                            KdAtrNr,
                             r.VertretungsVerhaeltnis,
                             r.Tarifnummer,
                             If(r.Eigenmasse, 0D),

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -315,6 +315,39 @@ Public Class cSendungen
         End If
     End Function
 
+    Public Function getKdAtrNrByEORI(EORI As String) As String
+        Dim KdNR = -1
+        Dim KdAtrNr = Nothing
+
+        If Me.tblSnd_AuftraggeberKdNr > 0 Then
+            Dim KdNrTmp = Me.tblSnd_AuftraggeberKdNr
+            Dim KD_tmp As New VERAG_PROG_ALLGEMEIN.cKunde(KdNrTmp)
+            If KD_tmp IsNot Nothing And KD_tmp.hasEntry Then
+                If If(KD_tmp.EORITIN, "") = EORI Then
+                    KdAtrNr = Me.tblSnd_KdAuftragsNr
+                End If
+            End If
+        End If
+
+        If Me.tblSnd_EmpfaengerKdNr > 0 Then
+            Dim KdNrTmp = Me.tblSnd_EmpfaengerKdNr
+            Dim KD_tmp As New VERAG_PROG_ALLGEMEIN.cKunde(KdNrTmp)
+            If KD_tmp IsNot Nothing And KD_tmp.hasEntry Then
+                If If(KD_tmp.EORITIN, "") = EORI Then
+                    KdAtrNr = Me.tblSnd_KdAuftragsNrEmpfaenger
+                End If
+            End If
+        End If
+
+
+
+        If If(KdAtrNr, "").Trim <> String.Empty Then
+            Return KdAtrNr
+        Else
+            Return ""
+        End If
+    End Function
+
     Public Function getKdAtrNr(art As String) As String
         Try