diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index c446d63c..6c8336ad 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -1023,6 +1023,12 @@ Form + + usCntlCBAM_Status.vb + + + UserControl + usrcntlFiskaluebersicht.vb @@ -3661,6 +3667,9 @@ frmKundeAnsprechpartnerTeams.vb + + usCntlCBAM_Status.vb + usrcntlFiskaluebersicht.vb diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index eb1a6258..098719b6 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -588,7 +588,7 @@ Public Class cProgramFunctions End Function Public Shared Function isLeerNothing(o) As Object - Return IIf(o = "", Nothing, o) + Return If(o = "", Nothing, o) End Function Public Shared Function isLeerNothingDbl(o, Optional returnVal = Nothing) As Object Try diff --git a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb index d0d24d33..07186471 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb @@ -228,7 +228,7 @@ Partial Class frmKundenUebersichtZOLL Me.tabKundendaten.Location = New System.Drawing.Point(4, 25) Me.tabKundendaten.Name = "tabKundendaten" Me.tabKundendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tabKundendaten.Size = New System.Drawing.Size(1182, 697) + Me.tabKundendaten.Size = New System.Drawing.Size(1182, 750) Me.tabKundendaten.TabIndex = 0 Me.tabKundendaten.Text = "Kundendaten" ' @@ -268,7 +268,7 @@ Partial Class frmKundenUebersichtZOLL Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" - Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691) + Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 744) Me.usrcntlKundenuebersicht.TabIndex = 0 ' 'ContextMenuStrip2 @@ -301,7 +301,7 @@ Partial Class frmKundenUebersichtZOLL Me.tbcntrKundenDaten.Location = New System.Drawing.Point(0, 0) Me.tbcntrKundenDaten.Name = "tbcntrKundenDaten" Me.tbcntrKundenDaten.SelectedIndex = 0 - Me.tbcntrKundenDaten.Size = New System.Drawing.Size(1190, 726) + Me.tbcntrKundenDaten.Size = New System.Drawing.Size(1190, 779) Me.tbcntrKundenDaten.SizeMode = System.Windows.Forms.TabSizeMode.Fixed Me.tbcntrKundenDaten.TabIndex = 191 ' @@ -1080,7 +1080,7 @@ Partial Class frmKundenUebersichtZOLL Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(114, 32) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1190, 726) + Me.Panel1.Size = New System.Drawing.Size(1190, 779) Me.Panel1.TabIndex = 201 ' 'MenuStripKunden @@ -1095,7 +1095,7 @@ Partial Class frmKundenUebersichtZOLL Me.MenuStripKunden.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow Me.MenuStripKunden.Location = New System.Drawing.Point(0, 0) Me.MenuStripKunden.Name = "MenuStripKunden" - Me.MenuStripKunden.Size = New System.Drawing.Size(114, 758) + Me.MenuStripKunden.Size = New System.Drawing.Size(114, 811) Me.MenuStripKunden.TabIndex = 208 Me.MenuStripKunden.Text = "test" ' @@ -1582,7 +1582,7 @@ Partial Class frmKundenUebersichtZOLL Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True - Me.ClientSize = New System.Drawing.Size(1304, 758) + Me.ClientSize = New System.Drawing.Size(1304, 811) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.pnlTop) Me.Controls.Add(Me.MenuStripKunden) diff --git a/SDL/kunden/usCntlCBAM_Status.Designer.vb b/SDL/kunden/usCntlCBAM_Status.Designer.vb new file mode 100644 index 00000000..3a48d860 --- /dev/null +++ b/SDL/kunden/usCntlCBAM_Status.Designer.vb @@ -0,0 +1,278 @@ + _ +Partial Class usCntlCBAM_Status + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.Panel3 = New System.Windows.Forms.Panel() + Me.cboCBAM_KdSett_Status = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label25 = New System.Windows.Forms.Label() + Me.Label24 = New System.Windows.Forms.Label() + Me.txtCBAM_KdSett_ApplNo = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.txtCBAM_KdSett_Warn2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button9 = New System.Windows.Forms.Button() + Me.txtCBAM_KdSett_CBAMNo = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label20 = New System.Windows.Forms.Label() + Me.Label21 = New System.Windows.Forms.Label() + Me.txtCBAM_KdSett_Warn1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label22 = New System.Windows.Forms.Label() + Me.Label23 = New System.Windows.Forms.Label() + Me.Panel3.SuspendLayout() + Me.SuspendLayout() + ' + 'Panel3 + ' + Me.Panel3.BackColor = System.Drawing.Color.FloralWhite + Me.Panel3.Controls.Add(Me.cboCBAM_KdSett_Status) + Me.Panel3.Controls.Add(Me.Label25) + Me.Panel3.Controls.Add(Me.Label24) + Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_ApplNo) + Me.Panel3.Controls.Add(Me.Label14) + Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Warn2) + Me.Panel3.Controls.Add(Me.Button9) + Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_CBAMNo) + Me.Panel3.Controls.Add(Me.Label20) + Me.Panel3.Controls.Add(Me.Label21) + Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Warn1) + Me.Panel3.Controls.Add(Me.Label22) + Me.Panel3.Controls.Add(Me.Label23) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel3.Location = New System.Drawing.Point(0, 0) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(380, 180) + Me.Panel3.TabIndex = 74 + ' + 'cboCBAM_KdSett_Status + ' + Me.cboCBAM_KdSett_Status._allowedValuesFreiText = Nothing + Me.cboCBAM_KdSett_Status._allowFreiText = False + Me.cboCBAM_KdSett_Status._value = "" + Me.cboCBAM_KdSett_Status.FormattingEnabled = True + Me.cboCBAM_KdSett_Status.Location = New System.Drawing.Point(110, 22) + Me.cboCBAM_KdSett_Status.Name = "cboCBAM_KdSett_Status" + Me.cboCBAM_KdSett_Status.Size = New System.Drawing.Size(256, 21) + Me.cboCBAM_KdSett_Status.TabIndex = 74 + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.Label25.Location = New System.Drawing.Point(182, 52) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(40, 13) + Me.Label25.TabIndex = 80 + Me.Label25.Text = "Warn 2" + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.Label24.Location = New System.Drawing.Point(118, 52) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(43, 13) + Me.Label24.TabIndex = 79 + Me.Label24.Text = "Warn 1 " + ' + 'txtCBAM_KdSett_ApplNo + ' + Me.txtCBAM_KdSett_ApplNo._DateTimeOnly = False + Me.txtCBAM_KdSett_ApplNo._numbersOnly = False + Me.txtCBAM_KdSett_ApplNo._numbersOnlyKommastellen = "" + Me.txtCBAM_KdSett_ApplNo._numbersOnlyTrennzeichen = False + Me.txtCBAM_KdSett_ApplNo._Prozent = False + Me.txtCBAM_KdSett_ApplNo._ShortDateNew = False + Me.txtCBAM_KdSett_ApplNo._ShortDateOnly = False + Me.txtCBAM_KdSett_ApplNo._TimeOnly = False + Me.txtCBAM_KdSett_ApplNo._TimeOnly_Seconds = False + Me.txtCBAM_KdSett_ApplNo._value = "" + Me.txtCBAM_KdSett_ApplNo._Waehrung = False + Me.txtCBAM_KdSett_ApplNo._WaehrungZeichen = True + Me.txtCBAM_KdSett_ApplNo.Enabled = False + Me.txtCBAM_KdSett_ApplNo.ForeColor = System.Drawing.Color.Red + Me.txtCBAM_KdSett_ApplNo.Location = New System.Drawing.Point(110, 95) + Me.txtCBAM_KdSett_ApplNo.MaxLength = 250 + Me.txtCBAM_KdSett_ApplNo.MaxLineLength = -1 + Me.txtCBAM_KdSett_ApplNo.MaxLines_Warning = "" + Me.txtCBAM_KdSett_ApplNo.MaxLines_Warning_Label = Nothing + Me.txtCBAM_KdSett_ApplNo.Name = "txtCBAM_KdSett_ApplNo" + Me.txtCBAM_KdSett_ApplNo.Size = New System.Drawing.Size(256, 20) + Me.txtCBAM_KdSett_ApplNo.TabIndex = 77 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(3, 98) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(79, 13) + Me.Label14.TabIndex = 78 + Me.Label14.Text = "Application-Nr.:" + ' + 'txtCBAM_KdSett_Warn2 + ' + Me.txtCBAM_KdSett_Warn2._DateTimeOnly = False + Me.txtCBAM_KdSett_Warn2._numbersOnly = True + Me.txtCBAM_KdSett_Warn2._numbersOnlyKommastellen = "" + Me.txtCBAM_KdSett_Warn2._numbersOnlyTrennzeichen = True + Me.txtCBAM_KdSett_Warn2._Prozent = False + Me.txtCBAM_KdSett_Warn2._ShortDateNew = False + Me.txtCBAM_KdSett_Warn2._ShortDateOnly = False + Me.txtCBAM_KdSett_Warn2._TimeOnly = False + Me.txtCBAM_KdSett_Warn2._TimeOnly_Seconds = False + Me.txtCBAM_KdSett_Warn2._value = "40" + Me.txtCBAM_KdSett_Warn2._Waehrung = False + Me.txtCBAM_KdSett_Warn2._WaehrungZeichen = True + Me.txtCBAM_KdSett_Warn2.ForeColor = System.Drawing.Color.Black + Me.txtCBAM_KdSett_Warn2.Location = New System.Drawing.Point(174, 66) + Me.txtCBAM_KdSett_Warn2.MaxLength = 10 + Me.txtCBAM_KdSett_Warn2.MaxLineLength = -1 + Me.txtCBAM_KdSett_Warn2.MaxLines_Warning = "" + Me.txtCBAM_KdSett_Warn2.MaxLines_Warning_Label = Nothing + Me.txtCBAM_KdSett_Warn2.Name = "txtCBAM_KdSett_Warn2" + Me.txtCBAM_KdSett_Warn2.Size = New System.Drawing.Size(58, 20) + Me.txtCBAM_KdSett_Warn2.TabIndex = 75 + Me.txtCBAM_KdSett_Warn2.Text = "40" + ' + 'Button9 + ' + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.Location = New System.Drawing.Point(149, 147) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(217, 28) + Me.Button9.TabIndex = 53 + Me.Button9.Text = "Speichern" + Me.Button9.UseVisualStyleBackColor = True + ' + 'txtCBAM_KdSett_CBAMNo + ' + Me.txtCBAM_KdSett_CBAMNo._DateTimeOnly = False + Me.txtCBAM_KdSett_CBAMNo._numbersOnly = False + Me.txtCBAM_KdSett_CBAMNo._numbersOnlyKommastellen = "" + Me.txtCBAM_KdSett_CBAMNo._numbersOnlyTrennzeichen = False + Me.txtCBAM_KdSett_CBAMNo._Prozent = False + Me.txtCBAM_KdSett_CBAMNo._ShortDateNew = False + Me.txtCBAM_KdSett_CBAMNo._ShortDateOnly = False + Me.txtCBAM_KdSett_CBAMNo._TimeOnly = False + Me.txtCBAM_KdSett_CBAMNo._TimeOnly_Seconds = False + Me.txtCBAM_KdSett_CBAMNo._value = "" + Me.txtCBAM_KdSett_CBAMNo._Waehrung = False + Me.txtCBAM_KdSett_CBAMNo._WaehrungZeichen = True + Me.txtCBAM_KdSett_CBAMNo.Enabled = False + Me.txtCBAM_KdSett_CBAMNo.ForeColor = System.Drawing.Color.Red + Me.txtCBAM_KdSett_CBAMNo.Location = New System.Drawing.Point(110, 118) + Me.txtCBAM_KdSett_CBAMNo.MaxLength = 250 + Me.txtCBAM_KdSett_CBAMNo.MaxLineLength = -1 + Me.txtCBAM_KdSett_CBAMNo.MaxLines_Warning = "" + Me.txtCBAM_KdSett_CBAMNo.MaxLines_Warning_Label = Nothing + Me.txtCBAM_KdSett_CBAMNo.Name = "txtCBAM_KdSett_CBAMNo" + Me.txtCBAM_KdSett_CBAMNo.Size = New System.Drawing.Size(256, 20) + Me.txtCBAM_KdSett_CBAMNo.TabIndex = 58 + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Location = New System.Drawing.Point(3, 121) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(88, 13) + Me.Label20.TabIndex = 59 + Me.Label20.Text = "CBAM Konto-Nr.:" + ' + 'Label21 + ' + Me.Label21.AutoSize = True + Me.Label21.Location = New System.Drawing.Point(2, 69) + Me.Label21.Name = "Label21" + Me.Label21.Size = New System.Drawing.Size(102, 13) + Me.Label21.TabIndex = 57 + Me.Label21.Text = "Warnschwelle/Jahr:" + ' + 'txtCBAM_KdSett_Warn1 + ' + Me.txtCBAM_KdSett_Warn1._DateTimeOnly = False + Me.txtCBAM_KdSett_Warn1._numbersOnly = True + Me.txtCBAM_KdSett_Warn1._numbersOnlyKommastellen = "" + Me.txtCBAM_KdSett_Warn1._numbersOnlyTrennzeichen = True + Me.txtCBAM_KdSett_Warn1._Prozent = False + Me.txtCBAM_KdSett_Warn1._ShortDateNew = False + Me.txtCBAM_KdSett_Warn1._ShortDateOnly = False + Me.txtCBAM_KdSett_Warn1._TimeOnly = False + Me.txtCBAM_KdSett_Warn1._TimeOnly_Seconds = False + Me.txtCBAM_KdSett_Warn1._value = "30" + Me.txtCBAM_KdSett_Warn1._Waehrung = False + Me.txtCBAM_KdSett_Warn1._WaehrungZeichen = True + Me.txtCBAM_KdSett_Warn1.ForeColor = System.Drawing.Color.Black + Me.txtCBAM_KdSett_Warn1.Location = New System.Drawing.Point(110, 66) + Me.txtCBAM_KdSett_Warn1.MaxLength = 10 + Me.txtCBAM_KdSett_Warn1.MaxLineLength = -1 + Me.txtCBAM_KdSett_Warn1.MaxLines_Warning = "" + Me.txtCBAM_KdSett_Warn1.MaxLines_Warning_Label = Nothing + Me.txtCBAM_KdSett_Warn1.Name = "txtCBAM_KdSett_Warn1" + Me.txtCBAM_KdSett_Warn1.Size = New System.Drawing.Size(58, 20) + Me.txtCBAM_KdSett_Warn1.TabIndex = 56 + Me.txtCBAM_KdSett_Warn1.Text = "30" + ' + 'Label22 + ' + Me.Label22.AutoSize = True + Me.Label22.Location = New System.Drawing.Point(3, 25) + Me.Label22.Name = "Label22" + Me.Label22.Size = New System.Drawing.Size(73, 13) + Me.Label22.TabIndex = 55 + Me.Label22.Text = "CBAM-Status:" + ' + 'Label23 + ' + Me.Label23.AutoSize = True + Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label23.Location = New System.Drawing.Point(3, 3) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(142, 13) + Me.Label23.TabIndex = 53 + Me.Label23.Text = "CBAM-Kundeneinstellungen:" + ' + 'usCntlCBAM_Status + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Panel3) + Me.Name = "usCntlCBAM_Status" + Me.Size = New System.Drawing.Size(380, 180) + Me.Panel3.ResumeLayout(False) + Me.Panel3.PerformLayout() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents Panel3 As Panel + Friend WithEvents cboCBAM_KdSett_Status As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label25 As Label + Friend WithEvents Label24 As Label + Friend WithEvents txtCBAM_KdSett_ApplNo As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label14 As Label + Friend WithEvents txtCBAM_KdSett_Warn2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button9 As Button + Friend WithEvents txtCBAM_KdSett_CBAMNo As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label20 As Label + Friend WithEvents Label21 As Label + Friend WithEvents txtCBAM_KdSett_Warn1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label22 As Label + Friend WithEvents Label23 As Label +End Class diff --git a/SDL/kunden/usCntlCBAM_Status.resx b/SDL/kunden/usCntlCBAM_Status.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/kunden/usCntlCBAM_Status.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/kunden/usCntlCBAM_Status.vb b/SDL/kunden/usCntlCBAM_Status.vb new file mode 100644 index 00000000..469491bd --- /dev/null +++ b/SDL/kunden/usCntlCBAM_Status.vb @@ -0,0 +1,92 @@ +Imports VERAG_PROG_ALLGEMEIN + +Public Class usCntlCBAM_Status + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Public kdnr As Integer = -1 + Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing + Dim KD As VERAG_PROG_ALLGEMEIN.cKunde = Nothing + Dim ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing + + Sub New() + InitializeComponent() + End Sub + + Sub New(kdNr) + InitializeComponent() + Me.kdnr = kdNr + End Sub + Private Sub usrCntlCBAM_Load(sender As Object, e As EventArgs) Handles Me.Load + Init(kdnr) + End Sub + + Sub Init(kdnr) + If kdnr > 0 Then + AD = New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr) + KD = New VERAG_PROG_ALLGEMEIN.cKunde(kdnr) + ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr) + End If + + If KD IsNot Nothing Then + ' Me.Text = KD.EORITIN + End If + + cboCBAM_KdSett_Status.Items.Clear() + cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("unbestimmt", "")) + cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("[Y137] < 50 to (de minis)", "50to")) + cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("[Y238] Antrag abgegeben", "APPL")) + cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("[Y128] CBAM Konto vorhanden", "CBAM")) + cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kein Interesse/Fremdkunde", "NO")) + cboCBAM_KdSett_Status.changeItem("undefined") + + If ERW IsNot Nothing Then + cboCBAM_KdSett_Status.changeItem(If(ERW.kde_CBAM_Status, "")) + txtCBAM_KdSett_Warn1._value = If(ERW.kde_CBAM_Warn1, "30") + txtCBAM_KdSett_Warn2._value = If(ERW.kde_CBAM_Warn2, "40") + txtCBAM_KdSett_ApplNo._value = If(ERW.kde_CBAM_ApplicationNo, "") + txtCBAM_KdSett_CBAMNo.Text = If(ERW.kde_CBAM_CBAMAccountNo, "") + End If + + End Sub + + Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboCBAM_KdSett_Status.SelectedIndexChanged + + txtCBAM_KdSett_ApplNo.Enabled = False + txtCBAM_KdSett_CBAMNo.Enabled = False + txtCBAM_KdSett_Warn1.Enabled = False + txtCBAM_KdSett_Warn2.Enabled = False + + Select Case cboCBAM_KdSett_Status._value + Case "" + txtCBAM_KdSett_Warn1.Enabled = True + txtCBAM_KdSett_Warn2.Enabled = True + Case "50to" + txtCBAM_KdSett_Warn1.Enabled = True + txtCBAM_KdSett_Warn2.Enabled = True + Case "APPL" + txtCBAM_KdSett_ApplNo.Enabled = True + Case "CBAM" + txtCBAM_KdSett_ApplNo.Enabled = True + txtCBAM_KdSett_CBAMNo.Enabled = True + Case "NO" 'nix + End Select + + End Sub + + + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click + If ERW Is Nothing Then ERW = New cKundenErweitert(kdnr) + + ERW.kde_CBAM_Status = cboCBAM_KdSett_Status._value + ERW.kde_CBAM_Warn1 = CDec(If(txtCBAM_KdSett_Warn1._value = "", 30, txtCBAM_KdSett_Warn1._value)) + ERW.kde_CBAM_Warn2 = CDec(If(txtCBAM_KdSett_Warn2._value = "", 40, txtCBAM_KdSett_Warn2._value)) + ERW.kde_CBAM_ApplicationNo = If(txtCBAM_KdSett_ApplNo._value <> "", txtCBAM_KdSett_ApplNo._value, Nothing) + ERW.kde_CBAM_CBAMAccountNo = If(txtCBAM_KdSett_CBAMNo._value <> "", txtCBAM_KdSett_CBAMNo._value, Nothing) + + If ERW.SAVE() Then + If Me.FindForm.Name = "frmCBAMStatus" Then Me.FindForm.DialogResult = DialogResult.OK + End If + + End Sub + +End Class diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb index 668dd2c3..3bbd470d 100644 --- a/SDL/kunden/usrCntlCBAM.Designer.vb +++ b/SDL/kunden/usrCntlCBAM.Designer.vb @@ -22,9 +22,8 @@ Partial Class usrCntlCBAM 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Me.lblOffert = New System.Windows.Forms.TextBox() - Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip() Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Label1 = New System.Windows.Forms.Label() Me.btnCBAMPruef_DAKOSY = New System.Windows.Forms.Button() @@ -117,21 +116,9 @@ Partial Class usrCntlCBAM Me.cbxIndirekt = New System.Windows.Forms.CheckBox() Me.Button8 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() - Me.Label25 = New System.Windows.Forms.Label() - Me.Label24 = New System.Windows.Forms.Label() - Me.txtCBAM_KdSett_ApplNo = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label14 = New System.Windows.Forms.Label() - Me.txtCBAM_KdSett_Warn2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Button9 = New System.Windows.Forms.Button() - Me.txtCBAM_KdSett_CBAMNo = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label20 = New System.Windows.Forms.Label() - Me.Label21 = New System.Windows.Forms.Label() - Me.txtCBAM_KdSett_Warn1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label22 = New System.Windows.Forms.Label() - Me.Label23 = New System.Windows.Forms.Label() Me.cboIndirekt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbo_VERAG_ImpLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() Me.cbxUNISPED = New System.Windows.Forms.CheckBox() Me.cbxIMEX = New System.Windows.Forms.CheckBox() Me.cbxVERAG = New System.Windows.Forms.CheckBox() @@ -140,7 +127,7 @@ Partial Class usrCntlCBAM Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboCBAM_KdSett_Status = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.UsCntlCBAM_Status1 = New SDL.usCntlCBAM_Status() Me.cntxtAddSdl.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -1405,200 +1392,12 @@ Partial Class usrCntlCBAM ' Me.Panel3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel3.BackColor = System.Drawing.Color.FloralWhite - Me.Panel3.Controls.Add(Me.cboCBAM_KdSett_Status) - Me.Panel3.Controls.Add(Me.Label25) - Me.Panel3.Controls.Add(Me.Label24) - Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_ApplNo) - Me.Panel3.Controls.Add(Me.Label14) - Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Warn2) - Me.Panel3.Controls.Add(Me.Button9) - Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_CBAMNo) - Me.Panel3.Controls.Add(Me.Label20) - Me.Panel3.Controls.Add(Me.Label21) - Me.Panel3.Controls.Add(Me.txtCBAM_KdSett_Warn1) - Me.Panel3.Controls.Add(Me.Label22) - Me.Panel3.Controls.Add(Me.Label23) + Me.Panel3.Controls.Add(Me.UsCntlCBAM_Status1) Me.Panel3.Location = New System.Drawing.Point(491, 511) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(382, 182) + Me.Panel3.Size = New System.Drawing.Size(380, 180) Me.Panel3.TabIndex = 73 ' - 'Label25 - ' - Me.Label25.AutoSize = True - Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label25.Location = New System.Drawing.Point(182, 52) - Me.Label25.Name = "Label25" - Me.Label25.Size = New System.Drawing.Size(40, 13) - Me.Label25.TabIndex = 80 - Me.Label25.Text = "Warn 2" - ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.Label24.Location = New System.Drawing.Point(118, 52) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(43, 13) - Me.Label24.TabIndex = 79 - Me.Label24.Text = "Warn 1 " - ' - 'txtCBAM_KdSett_ApplNo - ' - Me.txtCBAM_KdSett_ApplNo._DateTimeOnly = False - Me.txtCBAM_KdSett_ApplNo._numbersOnly = False - Me.txtCBAM_KdSett_ApplNo._numbersOnlyKommastellen = "" - Me.txtCBAM_KdSett_ApplNo._numbersOnlyTrennzeichen = False - Me.txtCBAM_KdSett_ApplNo._Prozent = False - Me.txtCBAM_KdSett_ApplNo._ShortDateNew = False - Me.txtCBAM_KdSett_ApplNo._ShortDateOnly = False - Me.txtCBAM_KdSett_ApplNo._TimeOnly = False - Me.txtCBAM_KdSett_ApplNo._TimeOnly_Seconds = False - Me.txtCBAM_KdSett_ApplNo._value = "" - Me.txtCBAM_KdSett_ApplNo._Waehrung = False - Me.txtCBAM_KdSett_ApplNo._WaehrungZeichen = True - Me.txtCBAM_KdSett_ApplNo.Enabled = False - Me.txtCBAM_KdSett_ApplNo.ForeColor = System.Drawing.Color.Red - Me.txtCBAM_KdSett_ApplNo.Location = New System.Drawing.Point(110, 95) - Me.txtCBAM_KdSett_ApplNo.MaxLength = 250 - Me.txtCBAM_KdSett_ApplNo.MaxLineLength = -1 - Me.txtCBAM_KdSett_ApplNo.MaxLines_Warning = "" - Me.txtCBAM_KdSett_ApplNo.MaxLines_Warning_Label = Nothing - Me.txtCBAM_KdSett_ApplNo.Name = "txtCBAM_KdSett_ApplNo" - Me.txtCBAM_KdSett_ApplNo.Size = New System.Drawing.Size(256, 20) - Me.txtCBAM_KdSett_ApplNo.TabIndex = 77 - ' - 'Label14 - ' - Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(3, 98) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(79, 13) - Me.Label14.TabIndex = 78 - Me.Label14.Text = "Application-Nr.:" - ' - 'txtCBAM_KdSett_Warn2 - ' - Me.txtCBAM_KdSett_Warn2._DateTimeOnly = False - Me.txtCBAM_KdSett_Warn2._numbersOnly = True - Me.txtCBAM_KdSett_Warn2._numbersOnlyKommastellen = "" - Me.txtCBAM_KdSett_Warn2._numbersOnlyTrennzeichen = True - Me.txtCBAM_KdSett_Warn2._Prozent = False - Me.txtCBAM_KdSett_Warn2._ShortDateNew = False - Me.txtCBAM_KdSett_Warn2._ShortDateOnly = False - Me.txtCBAM_KdSett_Warn2._TimeOnly = False - Me.txtCBAM_KdSett_Warn2._TimeOnly_Seconds = False - Me.txtCBAM_KdSett_Warn2._value = "40" - Me.txtCBAM_KdSett_Warn2._Waehrung = False - Me.txtCBAM_KdSett_Warn2._WaehrungZeichen = True - Me.txtCBAM_KdSett_Warn2.ForeColor = System.Drawing.Color.Black - Me.txtCBAM_KdSett_Warn2.Location = New System.Drawing.Point(174, 66) - Me.txtCBAM_KdSett_Warn2.MaxLength = 10 - Me.txtCBAM_KdSett_Warn2.MaxLineLength = -1 - Me.txtCBAM_KdSett_Warn2.MaxLines_Warning = "" - Me.txtCBAM_KdSett_Warn2.MaxLines_Warning_Label = Nothing - Me.txtCBAM_KdSett_Warn2.Name = "txtCBAM_KdSett_Warn2" - Me.txtCBAM_KdSett_Warn2.Size = New System.Drawing.Size(58, 20) - Me.txtCBAM_KdSett_Warn2.TabIndex = 75 - Me.txtCBAM_KdSett_Warn2.Text = "40" - ' - 'Button9 - ' - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.Location = New System.Drawing.Point(149, 147) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(217, 28) - Me.Button9.TabIndex = 53 - Me.Button9.Text = "Speichern" - Me.Button9.UseVisualStyleBackColor = True - ' - 'txtCBAM_KdSett_CBAMNo - ' - Me.txtCBAM_KdSett_CBAMNo._DateTimeOnly = False - Me.txtCBAM_KdSett_CBAMNo._numbersOnly = False - Me.txtCBAM_KdSett_CBAMNo._numbersOnlyKommastellen = "" - Me.txtCBAM_KdSett_CBAMNo._numbersOnlyTrennzeichen = False - Me.txtCBAM_KdSett_CBAMNo._Prozent = False - Me.txtCBAM_KdSett_CBAMNo._ShortDateNew = False - Me.txtCBAM_KdSett_CBAMNo._ShortDateOnly = False - Me.txtCBAM_KdSett_CBAMNo._TimeOnly = False - Me.txtCBAM_KdSett_CBAMNo._TimeOnly_Seconds = False - Me.txtCBAM_KdSett_CBAMNo._value = "" - Me.txtCBAM_KdSett_CBAMNo._Waehrung = False - Me.txtCBAM_KdSett_CBAMNo._WaehrungZeichen = True - Me.txtCBAM_KdSett_CBAMNo.Enabled = False - Me.txtCBAM_KdSett_CBAMNo.ForeColor = System.Drawing.Color.Red - Me.txtCBAM_KdSett_CBAMNo.Location = New System.Drawing.Point(110, 118) - Me.txtCBAM_KdSett_CBAMNo.MaxLength = 250 - Me.txtCBAM_KdSett_CBAMNo.MaxLineLength = -1 - Me.txtCBAM_KdSett_CBAMNo.MaxLines_Warning = "" - Me.txtCBAM_KdSett_CBAMNo.MaxLines_Warning_Label = Nothing - Me.txtCBAM_KdSett_CBAMNo.Name = "txtCBAM_KdSett_CBAMNo" - Me.txtCBAM_KdSett_CBAMNo.Size = New System.Drawing.Size(256, 20) - Me.txtCBAM_KdSett_CBAMNo.TabIndex = 58 - ' - 'Label20 - ' - Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(3, 121) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(88, 13) - Me.Label20.TabIndex = 59 - Me.Label20.Text = "CBAM Konto-Nr.:" - ' - 'Label21 - ' - Me.Label21.AutoSize = True - Me.Label21.Location = New System.Drawing.Point(2, 69) - Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(102, 13) - Me.Label21.TabIndex = 57 - Me.Label21.Text = "Warnschwelle/Jahr:" - ' - 'txtCBAM_KdSett_Warn1 - ' - Me.txtCBAM_KdSett_Warn1._DateTimeOnly = False - Me.txtCBAM_KdSett_Warn1._numbersOnly = True - Me.txtCBAM_KdSett_Warn1._numbersOnlyKommastellen = "" - Me.txtCBAM_KdSett_Warn1._numbersOnlyTrennzeichen = True - Me.txtCBAM_KdSett_Warn1._Prozent = False - Me.txtCBAM_KdSett_Warn1._ShortDateNew = False - Me.txtCBAM_KdSett_Warn1._ShortDateOnly = False - Me.txtCBAM_KdSett_Warn1._TimeOnly = False - Me.txtCBAM_KdSett_Warn1._TimeOnly_Seconds = False - Me.txtCBAM_KdSett_Warn1._value = "30" - Me.txtCBAM_KdSett_Warn1._Waehrung = False - Me.txtCBAM_KdSett_Warn1._WaehrungZeichen = True - Me.txtCBAM_KdSett_Warn1.ForeColor = System.Drawing.Color.Black - Me.txtCBAM_KdSett_Warn1.Location = New System.Drawing.Point(110, 66) - Me.txtCBAM_KdSett_Warn1.MaxLength = 10 - Me.txtCBAM_KdSett_Warn1.MaxLineLength = -1 - Me.txtCBAM_KdSett_Warn1.MaxLines_Warning = "" - Me.txtCBAM_KdSett_Warn1.MaxLines_Warning_Label = Nothing - Me.txtCBAM_KdSett_Warn1.Name = "txtCBAM_KdSett_Warn1" - Me.txtCBAM_KdSett_Warn1.Size = New System.Drawing.Size(58, 20) - Me.txtCBAM_KdSett_Warn1.TabIndex = 56 - Me.txtCBAM_KdSett_Warn1.Text = "30" - ' - 'Label22 - ' - Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(3, 25) - Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(73, 13) - Me.Label22.TabIndex = 55 - Me.Label22.Text = "CBAM-Status:" - ' - 'Label23 - ' - Me.Label23.AutoSize = True - Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label23.Location = New System.Drawing.Point(3, 3) - Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(142, 13) - Me.Label23.TabIndex = 53 - Me.Label23.Text = "CBAM-Kundeneinstellungen:" - ' 'cboIndirekt ' Me.cboIndirekt._allowedValuesFreiText = Nothing @@ -1768,16 +1567,13 @@ Partial Class usrCntlCBAM Me.txtEori.Size = New System.Drawing.Size(341, 20) Me.txtEori.TabIndex = 1 ' - 'cboCBAM_KdSett_Status + 'UsCntlCBAM_Status1 ' - Me.cboCBAM_KdSett_Status._allowedValuesFreiText = Nothing - Me.cboCBAM_KdSett_Status._allowFreiText = False - Me.cboCBAM_KdSett_Status._value = "" - Me.cboCBAM_KdSett_Status.FormattingEnabled = True - Me.cboCBAM_KdSett_Status.Location = New System.Drawing.Point(110, 22) - Me.cboCBAM_KdSett_Status.Name = "cboCBAM_KdSett_Status" - Me.cboCBAM_KdSett_Status.Size = New System.Drawing.Size(256, 21) - Me.cboCBAM_KdSett_Status.TabIndex = 74 + Me.UsCntlCBAM_Status1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsCntlCBAM_Status1.Location = New System.Drawing.Point(0, 0) + Me.UsCntlCBAM_Status1.Name = "UsCntlCBAM_Status1" + Me.UsCntlCBAM_Status1.Size = New System.Drawing.Size(380, 180) + Me.UsCntlCBAM_Status1.TabIndex = 0 ' 'usrCntlCBAM ' @@ -1867,7 +1663,6 @@ Partial Class usrCntlCBAM Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.Panel3.ResumeLayout(False) - Me.Panel3.PerformLayout() Me.MyPanel1.ResumeLayout(False) Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) @@ -1979,17 +1774,5 @@ Partial Class usrCntlCBAM Friend WithEvents cbxIndirekt As CheckBox Friend WithEvents Button8 As Button Friend WithEvents Panel3 As Panel - Friend WithEvents txtCBAM_KdSett_ApplNo As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label14 As Label - Friend WithEvents txtCBAM_KdSett_Warn2 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Button9 As Button - Friend WithEvents txtCBAM_KdSett_CBAMNo As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label20 As Label - Friend WithEvents Label21 As Label - Friend WithEvents txtCBAM_KdSett_Warn1 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label22 As Label - Friend WithEvents Label23 As Label - Friend WithEvents Label25 As Label - Friend WithEvents Label24 As Label - Friend WithEvents cboCBAM_KdSett_Status As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents UsCntlCBAM_Status1 As usCntlCBAM_Status End Class diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index af2504c6..125fc893 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -2,6 +2,7 @@ Imports DocumentFormat.OpenXml.Spreadsheet Imports Org.BouncyCastle.Crypto.Agreement Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN.agsCustomsExchange Public Class usrCntlCBAM @@ -423,15 +424,6 @@ Public Class usrCntlCBAM txtEori.Text = KD.EORITIN End If - cboCBAM_KdSett_Status.Items.Clear() - cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("unbestimmt", "")) - cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("< 50 to (de minis)", "50to")) - cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Antrag abgegeben", "APPL")) - cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CBAM Konto vorhanden", "CBAM")) - cboCBAM_KdSett_Status.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kein Interesse/Fremdkunde", "NO")) - cboCBAM_KdSett_Status.changeItem("undefined") - - cboIndirekt.Items.Clear() cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition GmbH - DE4824105", "DE4824105")) cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH - ATEOS1000059121", "DE4ATEOS1000059121824105")) @@ -442,14 +434,8 @@ Public Class usrCntlCBAM cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Zollservice GmbH - ATEOS1000040508", "ATEOS1000040508")) cboIndirekt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Deutschland GmbH - DE7467540", "DE7467540")) - If ERW IsNot Nothing Then - cboCBAM_KdSett_Status.changeItem(If(ERW.kde_CBAM_Status, "")) - txtCBAM_KdSett_Warn1._value = If(ERW.kde_CBAM_Warn1, "") - txtCBAM_KdSett_Warn2._value = If(ERW.kde_CBAM_Warn2, "") - txtCBAM_KdSett_ApplNo._value = If(ERW.kde_CBAM_ApplicationNo, "") - txtCBAM_KdSett_CBAMNo.Text = If(ERW.kde_CBAM_CBAMAccountNo, "") - End If + UsCntlCBAM_Status1.Init(kdnr) End Sub @@ -2343,9 +2329,9 @@ Public Class usrCntlCBAM From za In LIST From it In za.Items Let importer = za.Parties. - FirstOrDefault(Function(p) {"CN", "IM", "IMP", "IMPORTER"}.Contains(p.zaParty_Role)) + FirstOrDefault(Function(p) cVERAG_CustomsDeclarations.IMPORTER_ROLES.Contains(p.zaParty_Role)) Let exporter = za.Parties. - FirstOrDefault(Function(p) {"CZ", "EX", "EXP", "EXPORTER"}.Contains(p.zaParty_Role)) + FirstOrDefault(Function(p) cVERAG_CustomsDeclarations.EXPORTER_ROLES.Contains(p.zaParty_Role)) Let invoice = it.Documents.FirstOrDefault(Function(d) d.zaDoc_Code = "N380" OrElse d.zaDoc_Code = "N325") Let Anmeldedatum = (Function(x) If(x.za_releaseDate, x.za_DeclarationDate)) @@ -2454,12 +2440,6 @@ Public Class usrCntlCBAM btnCBAM_DS_VERAG_GP.Tag = "" Try - ' ------------------------------------------------------------ - ' Rollen - ' ------------------------------------------------------------ - Dim ImporterRoles = {"CN", "IM", "IMP", "IMPORTER"} - Dim ExporterRoles = {"CZ", "EX", "EXP", "EXPORTER"} - ' ------------------------------------------------------------ ' LINQ: Greenpulse-Logik (MRN-aggregiert) ' ------------------------------------------------------------ @@ -2468,10 +2448,10 @@ Public Class usrCntlCBAM Group By MRN = za.za_MRN Into grp = Group Let importer = grp. SelectMany(Function(x) x.Parties). - FirstOrDefault(Function(p) ImporterRoles.Contains(p.zaParty_Role)) + FirstOrDefault(Function(p) cVERAG_CustomsDeclarations.IMPORTER_ROLES.Contains(p.zaParty_Role)) Let exporter = grp. SelectMany(Function(x) x.Parties). - FirstOrDefault(Function(p) ExporterRoles.Contains(p.zaParty_Role)) + FirstOrDefault(Function(p) cVERAG_CustomsDeclarations.EXPORTER_ROLES.Contains(p.zaParty_Role)) Let invoice = grp. SelectMany(Function(x) x.Documents). FirstOrDefault(Function(d) d.zaDoc_Code = "N380" OrElse d.zaDoc_Code = "N325") @@ -2649,7 +2629,7 @@ Public Class usrCntlCBAM Me.Cursor = Cursors.WaitCursor ' summary - Dim ImporterRoles = {"CN", "IM", "IMP", "IMPORTER"} + Dim ImporterRoles = cVERAG_CustomsDeclarations.IMPORTER_ROLES Dim summary = From za In LIST Let importer = za.Parties.FirstOrDefault(Function(p) ImporterRoles.Contains(p.zaParty_Role)) @@ -2845,41 +2825,6 @@ Public Class usrCntlCBAM Where(Function(x) Not String.IsNullOrWhiteSpace(x.za_LRN)))) End Sub - Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboCBAM_KdSett_Status.SelectedIndexChanged - txtCBAM_KdSett_ApplNo.Enabled = False - txtCBAM_KdSett_CBAMNo.Enabled = False - txtCBAM_KdSett_Warn1.Enabled = False - txtCBAM_KdSett_Warn2.Enabled = False - - Select Case cboCBAM_KdSett_Status._value - Case "" - txtCBAM_KdSett_Warn1.Enabled = True - txtCBAM_KdSett_Warn2.Enabled = True - Case "50to" - txtCBAM_KdSett_Warn1.Enabled = True - txtCBAM_KdSett_Warn2.Enabled = True - Case "APPL" - txtCBAM_KdSett_ApplNo.Enabled = True - Case "CBAM" - txtCBAM_KdSett_ApplNo.Enabled = True - txtCBAM_KdSett_CBAMNo.Enabled = True - Case "NO" 'nix - End Select - - End Sub - - Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click - If ERW Is Nothing Then ERW = New cKundenErweitert(kdnr) - - ERW.kde_CBAM_Status = cboCBAM_KdSett_Status._value - ERW.kde_CBAM_Warn1 = cProgramFunctions.isLeerNothing(txtCBAM_KdSett_Warn1._value) - ERW.kde_CBAM_Warn2 = cProgramFunctions.isLeerNothing(txtCBAM_KdSett_Warn2._value) - ERW.kde_CBAM_ApplicationNo = If(txtCBAM_KdSett_ApplNo._value <> "", txtCBAM_KdSett_ApplNo._value, Nothing) - ERW.kde_CBAM_CBAMAccountNo = If(txtCBAM_KdSett_CBAMNo._value <> "", txtCBAM_KdSett_CBAMNo._value, Nothing) - - ERW.SAVE() - - End Sub End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 4c434706..1d592c71 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht)) - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() @@ -268,6 +268,9 @@ Partial Class usrCntlKundenuebersicht Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SessionService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService() + Me.Label20 = New System.Windows.Forms.Label() + Me.txtCBAM_Status = New System.Windows.Forms.TextBox() + Me.Button15 = New System.Windows.Forms.Button() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() Me.tbOfferten.SuspendLayout() @@ -384,7 +387,7 @@ Partial Class usrCntlKundenuebersicht Me.tbWeitereKundenDetails.Location = New System.Drawing.Point(509, 368) Me.tbWeitereKundenDetails.Name = "tbWeitereKundenDetails" Me.tbWeitereKundenDetails.SelectedIndex = 0 - Me.tbWeitereKundenDetails.Size = New System.Drawing.Size(669, 326) + Me.tbWeitereKundenDetails.Size = New System.Drawing.Size(669, 379) Me.tbWeitereKundenDetails.TabIndex = 7 ' 'tbOfferten @@ -400,7 +403,7 @@ Partial Class usrCntlKundenuebersicht Me.tbOfferten.Location = New System.Drawing.Point(4, 22) Me.tbOfferten.Name = "tbOfferten" Me.tbOfferten.Padding = New System.Windows.Forms.Padding(3) - Me.tbOfferten.Size = New System.Drawing.Size(661, 300) + Me.tbOfferten.Size = New System.Drawing.Size(661, 353) Me.tbOfferten.TabIndex = 4 Me.tbOfferten.Text = "Offerte/Sperrliste" ' @@ -431,8 +434,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -443,7 +446,7 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.ReadOnly = True Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(477, 257) + Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(477, 310) Me.dgvOfferteDetailsUebersicht.TabIndex = 2 ' 'dgvOffertenSperrliste @@ -452,8 +455,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True Me.dgvOffertenSperrliste.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -463,12 +466,12 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True Me.dgvOffertenSperrliste.RowHeadersVisible = False - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle27 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257) + Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 310) Me.dgvOffertenSperrliste.TabIndex = 0 ' 'lblKeineSperren @@ -490,7 +493,7 @@ Partial Class usrCntlKundenuebersicht Me.pnlSperre.Controls.Add(Me.Label36) Me.pnlSperre.Controls.Add(Me.Label67) Me.pnlSperre.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlSperre.Location = New System.Drawing.Point(3, 260) + Me.pnlSperre.Location = New System.Drawing.Point(3, 313) Me.pnlSperre.Name = "pnlSperre" Me.pnlSperre.Size = New System.Drawing.Size(653, 35) Me.pnlSperre.TabIndex = 3 @@ -604,8 +607,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffenePosten.AllowUserToAddRows = False Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill @@ -685,8 +688,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill @@ -749,8 +752,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvAnhaenge.AllowUserToAddRows = False Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -2361,6 +2364,9 @@ Partial Class usrCntlKundenuebersicht 'grpSonstiges ' Me.grpSonstiges.BackColor = System.Drawing.Color.White + Me.grpSonstiges.Controls.Add(Me.Button15) + Me.grpSonstiges.Controls.Add(Me.Label20) + Me.grpSonstiges.Controls.Add(Me.txtCBAM_Status) Me.grpSonstiges.Controls.Add(Me.Button14) Me.grpSonstiges.Controls.Add(Me.Button13) Me.grpSonstiges.Controls.Add(Me.Button2) @@ -2377,7 +2383,7 @@ Partial Class usrCntlKundenuebersicht Me.grpSonstiges.Controls.Add(Me.dgvAufschub) Me.grpSonstiges.Location = New System.Drawing.Point(3, 362) Me.grpSonstiges.Name = "grpSonstiges" - Me.grpSonstiges.Size = New System.Drawing.Size(499, 328) + Me.grpSonstiges.Size = New System.Drawing.Size(499, 381) Me.grpSonstiges.TabIndex = 6 Me.grpSonstiges.TabStop = False ' @@ -2489,10 +2495,10 @@ Partial Class usrCntlKundenuebersicht Me.tbcntrAllg.Controls.Add(Me.tbAvisoMail) Me.tbcntrAllg.Controls.Add(Me.tbKdSpez) Me.tbcntrAllg.Controls.Add(Me.tbSonstiges) - Me.tbcntrAllg.Location = New System.Drawing.Point(6, 142) + Me.tbcntrAllg.Location = New System.Drawing.Point(6, 172) Me.tbcntrAllg.Name = "tbcntrAllg" Me.tbcntrAllg.SelectedIndex = 0 - Me.tbcntrAllg.Size = New System.Drawing.Size(487, 190) + Me.tbcntrAllg.Size = New System.Drawing.Size(487, 203) Me.tbcntrAllg.TabIndex = 12 ' 'tbVollmachten @@ -2502,7 +2508,7 @@ Partial Class usrCntlKundenuebersicht Me.tbVollmachten.Location = New System.Drawing.Point(4, 22) Me.tbVollmachten.Name = "tbVollmachten" Me.tbVollmachten.Padding = New System.Windows.Forms.Padding(3) - Me.tbVollmachten.Size = New System.Drawing.Size(479, 164) + Me.tbVollmachten.Size = New System.Drawing.Size(479, 177) Me.tbVollmachten.TabIndex = 0 Me.tbVollmachten.Text = "Vollmachten" Me.tbVollmachten.UseVisualStyleBackColor = True @@ -2513,8 +2519,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.AllowUserToDeleteRows = False Me.dgvVollmachten.AllowUserToOrderColumns = True Me.dgvVollmachten.AllowUserToResizeRows = False - DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34 Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill @@ -2524,7 +2530,7 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.ReadOnly = True Me.dgvVollmachten.RowHeadersVisible = False Me.dgvVollmachten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvVollmachten.Size = New System.Drawing.Size(473, 122) + Me.dgvVollmachten.Size = New System.Drawing.Size(473, 135) Me.dgvVollmachten.TabIndex = 0 ' 'Panel8 @@ -2532,7 +2538,7 @@ Partial Class usrCntlKundenuebersicht Me.Panel8.BackColor = System.Drawing.Color.White Me.Panel8.Controls.Add(Me.btnVMhinzufuegen) Me.Panel8.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel8.Location = New System.Drawing.Point(3, 125) + Me.Panel8.Location = New System.Drawing.Point(3, 138) Me.Panel8.Name = "Panel8" Me.Panel8.Size = New System.Drawing.Size(473, 36) Me.Panel8.TabIndex = 2 @@ -2567,8 +2573,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVertraege.AllowUserToDeleteRows = False Me.dgvVertraege.AllowUserToOrderColumns = True Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle35 Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill @@ -2768,8 +2774,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvGestGarantie.AllowUserToDeleteRows = False Me.dgvGestGarantie.AllowUserToOrderColumns = True Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle36.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle36 Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill @@ -3259,24 +3265,24 @@ Partial Class usrCntlKundenuebersicht Me.dgvAufschub.AllowUserToResizeColumns = False Me.dgvAufschub.AllowUserToResizeRows = False Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31 Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle33 Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) Me.dgvAufschub.MultiSelect = False Me.dgvAufschub.Name = "dgvAufschub" @@ -3303,8 +3309,8 @@ Partial Class usrCntlKundenuebersicht ' 'HZA ' - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle32 Me.HZA.HeaderText = "HZA" Me.HZA.Name = "HZA" Me.HZA.ReadOnly = True @@ -3529,6 +3535,40 @@ Partial Class usrCntlKundenuebersicht Me.SessionService1.Url = "https://finanzonline.bmf.gv.at/fonws/ws/session" Me.SessionService1.UseDefaultCredentials = False ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label20.Location = New System.Drawing.Point(10, 139) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(95, 17) + Me.Label20.TabIndex = 15 + Me.Label20.Text = "CBAM-Status:" + ' + 'txtCBAM_Status + ' + Me.txtCBAM_Status.BackColor = System.Drawing.Color.White + Me.txtCBAM_Status.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtCBAM_Status.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtCBAM_Status.Location = New System.Drawing.Point(110, 140) + Me.txtCBAM_Status.Name = "txtCBAM_Status" + Me.txtCBAM_Status.ReadOnly = True + Me.txtCBAM_Status.Size = New System.Drawing.Size(345, 16) + Me.txtCBAM_Status.TabIndex = 16 + Me.txtCBAM_Status.Text = "DE 000000000 , geprüft am: 01.01.2000" + ' + 'Button15 + ' + Me.Button15.BackgroundImage = Global.SDL.My.Resources.Resources.stift1 + Me.Button15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button15.FlatAppearance.BorderSize = 0 + Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button15.Location = New System.Drawing.Point(461, 139) + Me.Button15.Name = "Button15" + Me.Button15.Size = New System.Drawing.Size(25, 20) + Me.Button15.TabIndex = 17 + Me.Button15.UseVisualStyleBackColor = True + ' 'usrCntlKundenuebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3550,7 +3590,7 @@ Partial Class usrCntlKundenuebersicht Me.Controls.Add(Me.grpSonstiges) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "usrCntlKundenuebersicht" - Me.Size = New System.Drawing.Size(1182, 697) + Me.Size = New System.Drawing.Size(1182, 750) Me.cntxtAddVM.ResumeLayout(False) Me.tbWeitereKundenDetails.ResumeLayout(False) Me.tbOfferten.ResumeLayout(False) @@ -3856,5 +3896,4 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents txtBelegMail_FixBetreffText As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxBelegMail_FixBetreff As CheckBox Friend WithEvents datVertragBis As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents MailHochladenToolStripMenuItem1 As ToolStripMenuItem End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 9e81b4f1..252bf3cf 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -677,6 +677,9 @@ Public Class usrCntlKundenuebersicht End If rtbAbf_Besonderheiten.Visible = Not UsrCntlKundenBesonderheiten1.Visible + + + initCbam() initAufschub() Button1.BackgroundImage = My.Resources.fragezeichen @@ -691,6 +694,20 @@ Public Class usrCntlKundenuebersicht End Try End Sub + Sub initCbam() + txtCBAM_Status.Text = "" + If KUNDE_ERW IsNot Nothing Then + If KUNDE_ERW.kde_CBAM_Status IsNot Nothing Then + Select Case KUNDE_ERW.kde_CBAM_Status + Case "" : txtCBAM_Status.Text = "unbekannt" + Case "50to" : txtCBAM_Status.Text = "[Y137] < 50 to (de-minimis Regel)" + Case "APPL" : txtCBAM_Status.Text = "[Y238] " & If(KUNDE_ERW.kde_CBAM_ApplicationNo, "") + Case "CBAM" : txtCBAM_Status.Text = "[Y128] " & If(KUNDE_ERW.kde_CBAM_CBAMAccountNo, "") + Case "NO" : txtCBAM_Status.Text = "Kein Interesse/Fremdkunde" + End Select + End If + End If + End Sub Private Sub FlatButton4_Click(sender As Object, e As EventArgs) Handles FlatButton4.Click Try Dim kdTmp As New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) @@ -3487,5 +3504,20 @@ Public Class usrCntlKundenuebersicht txtBelegMail_FixBetreffText.Enabled = cbxBelegMail_FixBetreff.Checked End Sub + Private Sub Button15_Click_3(sender As Object, e As EventArgs) Handles Button15.Click + Dim f As New Form + Dim cbam As New usCntlCBAM_Status(kdNr) + cbam.Dock = DockStyle.Fill + f.Controls.Add(cbam) + f.Size = New Size(420, 250) + f.Icon = My.Resources.sdl_ico + f.StartPosition = FormStartPosition.CenterParent + f.Text = "CBAM - " & ADRESSE.Ordnungsbegriff + f.Name = "frmCBAMStatus" + If f.ShowDialog(Me) = DialogResult.OK Then + KUNDE_ERW = New cKundenErweitert(kdNr) + initCbam() + End If + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb index 24e13c0a..1efc1a48 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb @@ -52,6 +52,38 @@ Public Class cKundenVertraege Public Shared Function LOAD_LIST(KundenNr As Integer) As DataTable Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_datenarchivId_mail],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL") End Function + Public Shared Function LOAD_LISTOF(KundenNr As Integer) As List(Of cKundenVertraege) + Dim LIST As New List(Of cKundenVertraege) + Try + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("Select * FROM tblKundenVertraege WHERE kv_KundenNr=@KundenNr ", conn) + cmd.Parameters.AddWithValue("@KundenNr", KundenNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + Dim VERTR As New cKundenVertraege + + For Each li In VERTR.getParameterList() + Dim propInfo As PropertyInfo = VERTR.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(VERTR, Nothing) + Else + propInfo.SetValue(VERTR, dr.Item(li.Text)) + End If + + Next + VERTR.hasEntry = True + LIST.Add(VERTR) + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return List + End Function + Public Shared Function ENTRY_Exists(KundenNr As Integer, kv_vertragArtId As Integer) As Boolean Return (CInt((New SQL).getValueTxtBySql("SELECT count(*) FROM tblKundenVertraege WHERE kv_KundenNr=" & KundenNr & " AND kv_vertragArtId='" & kv_vertragArtId & "'", "FMZOLL")) > 0) diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb index 6d919b35..727c11ad 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb +++ b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb @@ -84,6 +84,9 @@ Public Class cVERAG_CustomsDeclarations Public Property hasEntry As Boolean = False + Public Shared IMPORTER_ROLES As String() = {"CN", "IM", "IMP", "IMPORTER", "CONSIGNEE"} + Public Shared EXPORTER_ROLES As String() = {"CZ", "EX", "EXP", "EXPORTER", "CONSIGNOR"} + Public Shared DECLARANT_ROLES As String() = {"CB", "DT", "ANM", "DEC", "VERTRETER", "DEKLARANT", "DECLARANT"} Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -368,12 +371,12 @@ Public Class cVERAG_CustomsDeclarations If hasCBAM(CBAM_ITEMS) Then - Dim vertreterEORI As String = Me.Parties.Where(Function(p) {"CB", "DT", "VERTRETER", "DEKLARANT", "DECLARANT"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() - Dim vertretenerEORI As String = Nothing 'Me.Parties.Where(Function(p) {"CN", "IM", "IMP", "IMPORTER"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() - Dim importerEORI As String = Me.Parties.Where(Function(p) {"CN", "IM", "IMP", "IMPORTER", "CONSIGNEE"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() - Dim ImporterString As String = Me.Parties.Where(Function(p) {"CN", "IM", "IMP", "IMPORTER", "CONSIGNEE"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault() - Dim ExporterEORI As String = Me.Parties.Where(Function(p) {"CZ", "EX", "EXP", "EXPORTER", "CONSIGNOR"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() - Dim ExporterString As String = Me.Parties.Where(Function(p) {"CZ", "EX", "EXP", "EXPORTER", "CONSIGNOR"}.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault() + Dim vertreterEORI As String = Me.Parties.Where(Function(p) DECLARANT_ROLES.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() + Dim vertreterString As String = Me.Parties.Where(Function(p) DECLARANT_ROLES.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault() + Dim importerEORI As String = Me.Parties.Where(Function(p) IMPORTER_ROLES.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() + Dim ImporterString As String = Me.Parties.Where(Function(p) IMPORTER_ROLES.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault() + Dim ExporterEORI As String = Me.Parties.Where(Function(p) EXPORTER_ROLES.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_EORI).FirstOrDefault() + Dim ExporterString As String = Me.Parties.Where(Function(p) EXPORTER_ROLES.Contains(p.zaParty_Role)).Select(Function(p) p.zaParty_Name).FirstOrDefault() Dim KD As cKunde = Nothing Dim AD As cAdressen = Nothing @@ -403,7 +406,32 @@ Public Class cVERAG_CustomsDeclarations If isIndirect() Then - Dim EORI_IND = If(vertretenerEORI IsNot Nothing, vertretenerEORI, If(importerEORI IsNot Nothing, importerEORI, ExporterEORI)) + Dim vertretenerEORI = "" + Dim vertretenerString = "" + If importerEORI IsNot Nothing Then + vertretenerEORI = importerEORI + vertretenerString = ImporterString + Else + vertretenerEORI = ExporterEORI + vertretenerString = ExporterString + End If + + Dim KD_IND As cKunde = Nothing + Dim AD_IND As cAdressen = Nothing + Dim ERW_IND As cKundenErweitert = Nothing + Dim VERTR_IND As List(Of cKundenVertraege) = Nothing + If If(ExporterEORI, "") <> "" Then + KD_IND = cKunde.LOAD_ByEORI(ExporterEORI, If(za_Firma, "")) + If KD_IND Is Nothing Then KD_IND = cKunde.LOAD_ByEORI(ExporterEORI) 'Wenn kein Kunde mit Firma gefunden wurde, nur nach EORI suchen (default VERAG) + AD_IND = New cAdressen(KD_IND.KundenNr) + + End If + If AD_IND IsNot Nothing Then + vertretenerString = AD_IND.Name_1 & " " & If(AD_IND.Name_2, "") & "
" & If(AD_IND.LandKz, "") & " " & If(AD_IND.PLZ, "") & " " & If(AD_IND.Ort, "") + ERW_IND = New cKundenErweitert(AD.AdressenNr) + VERTR_IND = cKundenVertraege.LOAD_LISTOF(AD.AdressenNr) + End If + '==================>> INDIRECT <<========================= Dim itemsHtml As String = @@ -414,6 +442,27 @@ Public Class cVERAG_CustomsDeclarations "" )) + Dim dateCBAM = If(If(za_ReleaseDate, za_DeclarationDate), Now) + Dim eigenmasseSumme_YEAR As Decimal = getCBAM_KG(vertretenerEORI, CDate("01.01." & dateCBAM.Year), CDate("31.12." & dateCBAM.Year), za_MRN) / 1000 + + + 'Prüft, ob Vertrag vorliegt: + Dim hasValidVertrag_CBAM As Boolean = + VERTR_IND.Any(Function(v) _ + v.kv_vertragArtId = 8 AndAlso + v.kv_gueltig AndAlso + (Not v.kv_gueltigBis_Datum.HasValue OrElse + v.kv_gueltigBis_Datum.Value.Date <= dateCBAM) + ) + Dim vertragHinweisHtml As String = + If(Not hasValidVertrag_CBAM, + "
" & + "⚠️ ACHTUNG: Es liegt kein gültiger CBAM-Vertrag vor!" & + "
", + "") + + Dim bodyHtml As String = "" & "

CBAM-Warnmeldung bei Zollanmeldung " & Me.za_MRN & "

" & @@ -421,6 +470,7 @@ Public Class cVERAG_CustomsDeclarations "Bei der Zollanmeldung mit der MRN " & Me.za_MRN & " wurden CBAM-relevante Warenpositionen erkannt.
" & "Bitte prüfen Sie diese Anmeldung im Hinblick auf die CBAM-Meldepflicht." & "

" & + vertragHinweisHtml & ' <<< HIER die Einblendung abhängig von vertrag99 "

Erkannte CBAM-Positionen

" & "" & "" & @@ -430,15 +480,21 @@ Public Class cVERAG_CustomsDeclarations "" & itemsHtml & "
" & - "

" & + "

" & + "Ind.Vertreter:
" & + If(vertreterEORI, "") & "
" & If(vertreterString, "") & + "

" & + "

" & + "Kunde:
" & + If(vertretenerEORI, "") & "
" & If(vertretenerString, "") & + "

" & + "

" & "Importeur:
" & If(importerEORI, "") & "
" & If(ImporterString, "") & "

" & - "

" & + "

" & "Exporteur:
" & - If(ExporterEORI, "") & " – " & vbNewLine & - If(AD_EX Is Nothing, ExporterString, AD_EX.Name_1 & " " & If(AD_EX.Name_2, "") & "
" & - If(AD_EX.LandKz, "") & " " & If(AD_EX.PLZ, "") & " " & If(AD_EX.Ort, "")) & + If(ExporterEORI, "") & "
" & If(ExporterString, "") & "

" & "

VERAG – CBAM Compliance Services

" & "" @@ -466,7 +522,7 @@ Public Class cVERAG_CustomsDeclarations Dim dateCBAM = If(If(za_ReleaseDate, za_DeclarationDate), Now) Dim eigenmasseSumme_Shipment As Decimal = CBAM_ITEMS.Sum(Function(i) If(i.zaItem_NetMass, 0D)) / 1000 - Dim eigenmasseSumme_YEAR As Decimal = getCBAM_KG(importerEORI, CDate("01.01." & dateCBAM.Year), CDate("31.12." & dateCBAM.Year), za_MRN) / 1000 + Dim eigenmasseSumme_YEAR As Decimal = getCBAM_KG(importerEORI, CDate("01.01." & dateCBAM.Year), CDate("31.12." & dateCBAM.Year)) / 1000 Dim WarnLevel As String = "" Dim Schwellenwert As Decimal = 0 @@ -572,8 +628,9 @@ Public Class cVERAG_CustomsDeclarations End Sub - Public Function getCBAM_KG(EORI As String, von As Date, bis As Date, Optional without_MRN As String = "") As Decimal + Public Function getCBAM_KG(EORI As String, von As Date, bis As Date, Optional without_MRN As String = "", Optional isDeclarant As Boolean = False) As Decimal Try + If EORI = "" Then Return 0 Dim sqlstr = "SELECT SUM(i.zaItem_NetMass) AS CBAM_Eigenmasse_kg FROM VERAG.dbo.tblVERAG_CustomsDeclarations_Items i JOIN VERAG.dbo.tblVERAG_CustomsDeclarations z @@ -582,7 +639,9 @@ Public Class cVERAG_CustomsDeclarations JOIN VERAG.dbo.tblVERAG_CustomsDeclarations_Parties p ON p.zaParty_zaId = z.za_Id AND p.zaParty_EORI = '" & EORI & "' - AND p.zaParty_Role IN ('CN','IM','IMP','IMPORTER') + " & If(isDeclarant, "AND (p.zaParty_Role IN ('CB','DT','DEKLARANT','DECLARANT') ", + " AND (p.zaParty_Role IN ('CN','IM','IMP','IMPORTER','CONSIGNEE') OR + p.zaParty_Role IN ('CZ','EX','EXP','EXPORTER','CONSIGNOR'))") & " WHERE z.za_ReleaseDate BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "' AND EXISTS (