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-02-17 20:20:57 +01:00
parent 35b1da9f0c
commit 2b95d35e16
2 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SDL/kunden/usrCntlCBAM.Designer.vb generated
View File

@@ -132,6 +132,7 @@ Partial Class usrCntlCBAM
Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtVERA_ZertPreis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtVERA_ZertPreis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label14 = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label()
Me.cbxKdAtrNr = New System.Windows.Forms.CheckBox()
Me.cntxtAddSdl.SuspendLayout() Me.cntxtAddSdl.SuspendLayout()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.Panel2.SuspendLayout() Me.Panel2.SuspendLayout()
@@ -1651,11 +1652,24 @@ Partial Class usrCntlCBAM
Me.Label14.TabIndex = 77 Me.Label14.TabIndex = 77
Me.Label14.Text = "Zert.Preis:" 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 'usrCntlCBAM
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White Me.BackColor = System.Drawing.Color.White
Me.Controls.Add(Me.cbxKdAtrNr)
Me.Controls.Add(Me.txtVERA_ZertPreis) Me.Controls.Add(Me.txtVERA_ZertPreis)
Me.Controls.Add(Me.Label14) Me.Controls.Add(Me.Label14)
Me.Controls.Add(Me.cboJahr) Me.Controls.Add(Me.cboJahr)
@@ -1821,4 +1835,5 @@ Partial Class usrCntlCBAM
Friend WithEvents cboJahr As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cboJahr As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents txtVERA_ZertPreis As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtVERA_ZertPreis As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label14 As Label Friend WithEvents Label14 As Label
Friend WithEvents cbxKdAtrNr As CheckBox
End Class End Class

46
SDL/kunden/usrCntlCBAM.vb
View File

@@ -403,7 +403,6 @@ Public Class usrCntlCBAM
End Sub End Sub
Private Sub usrCntlCBAM_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub usrCntlCBAM_Load(sender As Object, e As EventArgs) Handles Me.Load
cboJahr.Items.Clear() cboJahr.Items.Clear()
For yearCnt = 2023 To Now.Year For yearCnt = 2023 To Now.Year
cboJahr.Items.Add(yearCnt) cboJahr.Items.Add(yearCnt)
@@ -2461,7 +2460,11 @@ Public Class usrCntlCBAM
dt.Columns.Add("PositionsNummer", GetType(Integer)) dt.Columns.Add("PositionsNummer", GetType(Integer))
dt.Columns.Add("Anmeldedatum", GetType(Date)) dt.Columns.Add("Anmeldedatum", GetType(Date))
dt.Columns.Add("BezugsNr") dt.Columns.Add("BezugsNr")
dt.Columns.Add("ReferenzKunde") If cbxKdAtrNr.Checked Then
dt.Columns.Add("ReferenzKunde")
Else
dt.Columns.Add("-")
End If
dt.Columns.Add("VertretungsVerhaeltnis") dt.Columns.Add("VertretungsVerhaeltnis")
dt.Columns.Add("Tarifnummer") dt.Columns.Add("Tarifnummer")
dt.Columns.Add("Eigenmasse", GetType(Decimal)) dt.Columns.Add("Eigenmasse", GetType(Decimal))
@@ -2485,32 +2488,35 @@ Public Class usrCntlCBAM
dt.Columns.Add("EstimatedCost", GetType(Decimal)) dt.Columns.Add("EstimatedCost", GetType(Decimal))
End If End If
For Each r In details For Each r In details
' ========================================================= ' =========================================================
' Ermittlung Kunden-Auftragsnummer über SendungsId ' Ermittlung Kunden-Auftragsnummer über SendungsId
' ========================================================= ' =========================================================
Dim KdAtrNr = "" Dim KdAtrNr = ""
'If r.SendungsId IsNot Nothing Then If cbxKdAtrNr.Checked Then
' Dim Snd = New VERAG_PROG_ALLGEMEIN.cSendungen(r.SendungsId) 'If r.SendungsId IsNot Nothing Then
' If Snd IsNot Nothing Then ' Dim Snd = New VERAG_PROG_ALLGEMEIN.cSendungen(r.SendungsId)
' KdAtrNr = Snd.getKdAtrNrByEORI(EORI) ' If Snd IsNot Nothing Then
' End If ' KdAtrNr = Snd.getKdAtrNrByEORI(EORI)
'End If ' End If
If r.SendungsId IsNot Nothing Then 'End If
Dim Snd = New VERAG_PROG_ALLGEMEIN.cSendungen(r.SendungsId) If r.SendungsId IsNot Nothing Then
If Snd IsNot Nothing Then Dim Snd = New VERAG_PROG_ALLGEMEIN.cSendungen(r.SendungsId)
KdAtrNr = Snd.getKdAtrNr("AUFTRAGGEBER") If Snd IsNot Nothing Then
If KdAtrNr = "" Then KdAtrNr = Snd.getKdAtrNr("AUFTRAGGEBER")
KdAtrNr = Snd.getKdAtrNr("EMPFAENGER") If KdAtrNr = "" Then
KdAtrNr = Snd.getKdAtrNr("EMPFAENGER")
End If
End If End If
End If End If
End If 'Sonderfall Kanadevia
'Sonderfall Kanadevia If EORI = "DE4991397" Then
If EORI = "DE4991397" Then If KdAtrNr.Contains("/") Then
If KdAtrNr.Contains("/") Then Dim split = KdAtrNr.split("/")
Dim split = KdAtrNr.split("/") KdAtrNr = split(0)
KdAtrNr = split(0) End If
End If End If
End If End If
' ========================================================= ' =========================================================