diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb index 3bbd470d..b3bbd3e5 100644 --- a/SDL/kunden/usrCntlCBAM.Designer.vb +++ b/SDL/kunden/usrCntlCBAM.Designer.vb @@ -22,8 +22,9 @@ 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.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Label1 = New System.Windows.Forms.Label() Me.btnCBAMPruef_DAKOSY = New System.Windows.Forms.Button() @@ -116,22 +117,26 @@ 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.UsCntlCBAM_Status1 = New SDL.usCntlCBAM_Status() + Me.Panel4 = New System.Windows.Forms.Panel() + Me.cboJahr = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboIndirekt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbo_VERAG_ImpLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.cbxUNISPED = New System.Windows.Forms.CheckBox() Me.cbxIMEX = New System.Windows.Forms.CheckBox() Me.cbxVERAG = New System.Windows.Forms.CheckBox() - Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.UsCntlCBAM_Status1 = New SDL.usCntlCBAM_Status() + Me.txtVERA_ZertPreis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label14 = New System.Windows.Forms.Label() Me.cntxtAddSdl.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() Me.Panel3.SuspendLayout() + Me.Panel4.SuspendLayout() Me.MyPanel1.SuspendLayout() Me.SuspendLayout() ' @@ -172,7 +177,7 @@ Partial Class usrCntlCBAM 'btnCBAMPruef_DAKOSY ' Me.btnCBAMPruef_DAKOSY.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAMPruef_DAKOSY.Location = New System.Drawing.Point(279, 74) + Me.btnCBAMPruef_DAKOSY.Location = New System.Drawing.Point(3, 4) Me.btnCBAMPruef_DAKOSY.Name = "btnCBAMPruef_DAKOSY" Me.btnCBAMPruef_DAKOSY.Size = New System.Drawing.Size(168, 42) Me.btnCBAMPruef_DAKOSY.TabIndex = 3 @@ -182,7 +187,7 @@ Partial Class usrCntlCBAM 'btnCBAMPruef_DHF_VERAG ' Me.btnCBAMPruef_DHF_VERAG.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAMPruef_DHF_VERAG.Location = New System.Drawing.Point(453, 74) + Me.btnCBAMPruef_DHF_VERAG.Location = New System.Drawing.Point(177, 4) Me.btnCBAMPruef_DHF_VERAG.Name = "btnCBAMPruef_DHF_VERAG" Me.btnCBAMPruef_DHF_VERAG.Size = New System.Drawing.Size(168, 42) Me.btnCBAMPruef_DHF_VERAG.TabIndex = 4 @@ -192,7 +197,7 @@ Partial Class usrCntlCBAM 'btnCBAMPruef_TELOTEC ' Me.btnCBAMPruef_TELOTEC.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAMPruef_TELOTEC.Location = New System.Drawing.Point(763, 74) + Me.btnCBAMPruef_TELOTEC.Location = New System.Drawing.Point(487, 4) Me.btnCBAMPruef_TELOTEC.Name = "btnCBAMPruef_TELOTEC" Me.btnCBAMPruef_TELOTEC.Size = New System.Drawing.Size(130, 42) Me.btnCBAMPruef_TELOTEC.TabIndex = 5 @@ -202,7 +207,7 @@ Partial Class usrCntlCBAM 'btnCBAMPruef_DHF_UNISPED ' Me.btnCBAMPruef_DHF_UNISPED.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAMPruef_DHF_UNISPED.Location = New System.Drawing.Point(627, 74) + Me.btnCBAMPruef_DHF_UNISPED.Location = New System.Drawing.Point(351, 4) Me.btnCBAMPruef_DHF_UNISPED.Name = "btnCBAMPruef_DHF_UNISPED" Me.btnCBAMPruef_DHF_UNISPED.Size = New System.Drawing.Size(130, 42) Me.btnCBAMPruef_DHF_UNISPED.TabIndex = 6 @@ -221,7 +226,7 @@ Partial Class usrCntlCBAM 'btnCBAMPruef_ALLE ' Me.btnCBAMPruef_ALLE.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAMPruef_ALLE.Location = New System.Drawing.Point(899, 74) + Me.btnCBAMPruef_ALLE.Location = New System.Drawing.Point(623, 4) Me.btnCBAMPruef_ALLE.Name = "btnCBAMPruef_ALLE" Me.btnCBAMPruef_ALLE.Size = New System.Drawing.Size(168, 42) Me.btnCBAMPruef_ALLE.TabIndex = 8 @@ -233,7 +238,7 @@ Partial Class usrCntlCBAM Me.txtCBAMPruef_DAKOSY.BackColor = System.Drawing.Color.White Me.txtCBAMPruef_DAKOSY.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtCBAMPruef_DAKOSY.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCBAMPruef_DAKOSY.Location = New System.Drawing.Point(279, 125) + Me.txtCBAMPruef_DAKOSY.Location = New System.Drawing.Point(3, 55) Me.txtCBAMPruef_DAKOSY.Multiline = True Me.txtCBAMPruef_DAKOSY.Name = "txtCBAMPruef_DAKOSY" Me.txtCBAMPruef_DAKOSY.ReadOnly = True @@ -247,7 +252,7 @@ Partial Class usrCntlCBAM Me.txtCBAMPruef_DHF_VERAG.BackColor = System.Drawing.Color.White Me.txtCBAMPruef_DHF_VERAG.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtCBAMPruef_DHF_VERAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCBAMPruef_DHF_VERAG.Location = New System.Drawing.Point(453, 125) + Me.txtCBAMPruef_DHF_VERAG.Location = New System.Drawing.Point(177, 55) Me.txtCBAMPruef_DHF_VERAG.Multiline = True Me.txtCBAMPruef_DHF_VERAG.Name = "txtCBAMPruef_DHF_VERAG" Me.txtCBAMPruef_DHF_VERAG.ReadOnly = True @@ -261,7 +266,7 @@ Partial Class usrCntlCBAM Me.txtCBAMPruef_DHF_UNISPED.BackColor = System.Drawing.Color.White Me.txtCBAMPruef_DHF_UNISPED.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtCBAMPruef_DHF_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCBAMPruef_DHF_UNISPED.Location = New System.Drawing.Point(627, 125) + Me.txtCBAMPruef_DHF_UNISPED.Location = New System.Drawing.Point(351, 55) Me.txtCBAMPruef_DHF_UNISPED.Multiline = True Me.txtCBAMPruef_DHF_UNISPED.Name = "txtCBAMPruef_DHF_UNISPED" Me.txtCBAMPruef_DHF_UNISPED.ReadOnly = True @@ -275,7 +280,7 @@ Partial Class usrCntlCBAM Me.txtCBAMPruef_TELOTEC.BackColor = System.Drawing.Color.White Me.txtCBAMPruef_TELOTEC.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtCBAMPruef_TELOTEC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCBAMPruef_TELOTEC.Location = New System.Drawing.Point(763, 125) + Me.txtCBAMPruef_TELOTEC.Location = New System.Drawing.Point(487, 55) Me.txtCBAMPruef_TELOTEC.Multiline = True Me.txtCBAMPruef_TELOTEC.Name = "txtCBAMPruef_TELOTEC" Me.txtCBAMPruef_TELOTEC.ReadOnly = True @@ -287,7 +292,7 @@ Partial Class usrCntlCBAM 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(713, 51) + Me.Label4.Location = New System.Drawing.Point(658, 51) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(44, 13) Me.Label4.TabIndex = 17 @@ -296,7 +301,7 @@ Partial Class usrCntlCBAM 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(453, 51) + Me.Label5.Location = New System.Drawing.Point(437, 51) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(51, 13) Me.Label5.TabIndex = 18 @@ -305,7 +310,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_DHF_UNISPED ' Me.btnCBAM_DS_DHF_UNISPED.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(627, 190) + Me.btnCBAM_DS_DHF_UNISPED.Location = New System.Drawing.Point(351, 120) Me.btnCBAM_DS_DHF_UNISPED.Name = "btnCBAM_DS_DHF_UNISPED" Me.btnCBAM_DS_DHF_UNISPED.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED.TabIndex = 24 @@ -315,7 +320,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_TELOTEC ' Me.btnCBAM_DS_TELOTEC.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(763, 190) + Me.btnCBAM_DS_TELOTEC.Location = New System.Drawing.Point(487, 120) Me.btnCBAM_DS_TELOTEC.Name = "btnCBAM_DS_TELOTEC" Me.btnCBAM_DS_TELOTEC.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC.TabIndex = 23 @@ -325,7 +330,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_DHF_VERAG ' Me.btnCBAM_DS_DHF_VERAG.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(453, 190) + Me.btnCBAM_DS_DHF_VERAG.Location = New System.Drawing.Point(177, 120) Me.btnCBAM_DS_DHF_VERAG.Name = "btnCBAM_DS_DHF_VERAG" Me.btnCBAM_DS_DHF_VERAG.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_DHF_VERAG.TabIndex = 22 @@ -335,7 +340,7 @@ Partial Class usrCntlCBAM 'btnCBAM_DS_DAKOSY ' Me.btnCBAM_DS_DAKOSY.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(279, 190) + Me.btnCBAM_DS_DAKOSY.Location = New System.Drawing.Point(3, 120) Me.btnCBAM_DS_DAKOSY.Name = "btnCBAM_DS_DAKOSY" Me.btnCBAM_DS_DAKOSY.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_DAKOSY.TabIndex = 21 @@ -357,7 +362,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DAKOSY_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Detail.Location = New System.Drawing.Point(317, 238) + Me.btnCBAM_DS_DAKOSY_Detail.Location = New System.Drawing.Point(41, 168) Me.btnCBAM_DS_DAKOSY_Detail.Name = "btnCBAM_DS_DAKOSY_Detail" Me.btnCBAM_DS_DAKOSY_Detail.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Detail.TabIndex = 26 @@ -371,7 +376,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DAKOSY_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(317, 324) + Me.btnCBAM_DS_DAKOSY_Summe.Location = New System.Drawing.Point(41, 254) Me.btnCBAM_DS_DAKOSY_Summe.Name = "btnCBAM_DS_DAKOSY_Summe" Me.btnCBAM_DS_DAKOSY_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Summe.TabIndex = 27 @@ -385,7 +390,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_VERAG_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_VERAG_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(491, 324) + Me.btnCBAM_DS_DHF_VERAG_Summe.Location = New System.Drawing.Point(215, 254) Me.btnCBAM_DS_DHF_VERAG_Summe.Name = "btnCBAM_DS_DHF_VERAG_Summe" Me.btnCBAM_DS_DHF_VERAG_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_VERAG_Summe.TabIndex = 29 @@ -399,7 +404,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_VERAG_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_VERAG_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_Detail.Location = New System.Drawing.Point(491, 238) + Me.btnCBAM_DS_DHF_VERAG_Detail.Location = New System.Drawing.Point(215, 168) Me.btnCBAM_DS_DHF_VERAG_Detail.Name = "btnCBAM_DS_DHF_VERAG_Detail" Me.btnCBAM_DS_DHF_VERAG_Detail.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_VERAG_Detail.TabIndex = 28 @@ -413,7 +418,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_UNISPED_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_UNISPED_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(627, 324) + Me.btnCBAM_DS_DHF_UNISPED_Summe.Location = New System.Drawing.Point(351, 254) Me.btnCBAM_DS_DHF_UNISPED_Summe.Name = "btnCBAM_DS_DHF_UNISPED_Summe" Me.btnCBAM_DS_DHF_UNISPED_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED_Summe.TabIndex = 31 @@ -427,7 +432,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_UNISPED_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_UNISPED_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_Detail.Location = New System.Drawing.Point(627, 238) + Me.btnCBAM_DS_DHF_UNISPED_Detail.Location = New System.Drawing.Point(351, 168) Me.btnCBAM_DS_DHF_UNISPED_Detail.Name = "btnCBAM_DS_DHF_UNISPED_Detail" Me.btnCBAM_DS_DHF_UNISPED_Detail.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED_Detail.TabIndex = 30 @@ -441,7 +446,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Summe.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_Summe.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_TELOTEC_Summe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(763, 324) + Me.btnCBAM_DS_TELOTEC_Summe.Location = New System.Drawing.Point(487, 254) Me.btnCBAM_DS_TELOTEC_Summe.Name = "btnCBAM_DS_TELOTEC_Summe" Me.btnCBAM_DS_TELOTEC_Summe.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_Summe.TabIndex = 33 @@ -455,7 +460,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Detail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_Detail.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_TELOTEC_Detail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(763, 238) + Me.btnCBAM_DS_TELOTEC_Detail.Location = New System.Drawing.Point(487, 168) Me.btnCBAM_DS_TELOTEC_Detail.Name = "btnCBAM_DS_TELOTEC_Detail" Me.btnCBAM_DS_TELOTEC_Detail.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_Detail.TabIndex = 32 @@ -477,7 +482,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Copy.Enabled = False Me.btnCBAM_DS_DAKOSY_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(317, 417) + Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(41, 347) Me.btnCBAM_DS_DAKOSY_Copy.Name = "btnCBAM_DS_DAKOSY_Copy" Me.btnCBAM_DS_DAKOSY_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Copy.TabIndex = 35 @@ -489,7 +494,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Copy.Enabled = False Me.btnCBAM_DS_DHF_VERAG_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_VERAG_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(491, 370) + Me.btnCBAM_DS_DHF_VERAG_Copy.Location = New System.Drawing.Point(215, 300) Me.btnCBAM_DS_DHF_VERAG_Copy.Name = "btnCBAM_DS_DHF_VERAG_Copy" Me.btnCBAM_DS_DHF_VERAG_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_VERAG_Copy.TabIndex = 36 @@ -501,7 +506,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False Me.btnCBAM_DS_DHF_UNISPED_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_UNISPED_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(627, 370) + Me.btnCBAM_DS_DHF_UNISPED_Copy.Location = New System.Drawing.Point(351, 300) Me.btnCBAM_DS_DHF_UNISPED_Copy.Name = "btnCBAM_DS_DHF_UNISPED_Copy" Me.btnCBAM_DS_DHF_UNISPED_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED_Copy.TabIndex = 37 @@ -513,7 +518,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Copy.Enabled = False Me.btnCBAM_DS_TELOTEC_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(763, 370) + Me.btnCBAM_DS_TELOTEC_Copy.Location = New System.Drawing.Point(487, 300) Me.btnCBAM_DS_TELOTEC_Copy.Name = "btnCBAM_DS_TELOTEC_Copy" Me.btnCBAM_DS_TELOTEC_Copy.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_Copy.TabIndex = 38 @@ -526,7 +531,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(317, 508) + Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(41, 438) Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML" Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40 @@ -538,7 +543,7 @@ Partial Class usrCntlCBAM Me.Button2.Enabled = False Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(317, 555) + Me.Button2.Location = New System.Drawing.Point(41, 485) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(130, 42) Me.Button2.TabIndex = 42 @@ -548,7 +553,7 @@ Partial Class usrCntlCBAM 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(279, 461) + Me.Button1.Location = New System.Drawing.Point(3, 391) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(168, 42) Me.Button1.TabIndex = 44 @@ -561,7 +566,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Spedb.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Spedb.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DAKOSY_Spedb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(317, 370) + Me.btnCBAM_DS_DAKOSY_Spedb.Location = New System.Drawing.Point(41, 300) Me.btnCBAM_DS_DAKOSY_Spedb.Name = "btnCBAM_DS_DAKOSY_Spedb" Me.btnCBAM_DS_DAKOSY_Spedb.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_Spedb.TabIndex = 45 @@ -575,7 +580,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DAKOSY_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_GP.Location = New System.Drawing.Point(317, 281) + Me.btnCBAM_DS_DAKOSY_GP.Location = New System.Drawing.Point(41, 211) Me.btnCBAM_DS_DAKOSY_GP.Name = "btnCBAM_DS_DAKOSY_GP" Me.btnCBAM_DS_DAKOSY_GP.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DAKOSY_GP.TabIndex = 46 @@ -589,7 +594,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_VERAG_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_VERAG_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_VERAG_GP.Location = New System.Drawing.Point(491, 281) + Me.btnCBAM_DS_DHF_VERAG_GP.Location = New System.Drawing.Point(215, 211) Me.btnCBAM_DS_DHF_VERAG_GP.Name = "btnCBAM_DS_DHF_VERAG_GP" Me.btnCBAM_DS_DHF_VERAG_GP.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_VERAG_GP.TabIndex = 47 @@ -603,7 +608,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_UNISPED_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DHF_UNISPED_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_DHF_UNISPED_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DHF_UNISPED_GP.Location = New System.Drawing.Point(627, 281) + Me.btnCBAM_DS_DHF_UNISPED_GP.Location = New System.Drawing.Point(351, 211) Me.btnCBAM_DS_DHF_UNISPED_GP.Name = "btnCBAM_DS_DHF_UNISPED_GP" Me.btnCBAM_DS_DHF_UNISPED_GP.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_DHF_UNISPED_GP.TabIndex = 48 @@ -617,7 +622,7 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_GP.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_TELOTEC_GP.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.btnCBAM_DS_TELOTEC_GP.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_TELOTEC_GP.Location = New System.Drawing.Point(763, 281) + Me.btnCBAM_DS_TELOTEC_GP.Location = New System.Drawing.Point(487, 211) Me.btnCBAM_DS_TELOTEC_GP.Name = "btnCBAM_DS_TELOTEC_GP" Me.btnCBAM_DS_TELOTEC_GP.Size = New System.Drawing.Size(130, 42) Me.btnCBAM_DS_TELOTEC_GP.TabIndex = 49 @@ -630,7 +635,7 @@ Partial Class usrCntlCBAM Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Image = Global.SDL.My.Resources.Resources.ico_greenpulse Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(279, 651) + Me.Button3.Location = New System.Drawing.Point(3, 581) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(168, 42) Me.Button3.TabIndex = 50 @@ -641,7 +646,7 @@ Partial Class usrCntlCBAM 'lblKafkaCnt ' Me.lblKafkaCnt.AutoSize = True - Me.lblKafkaCnt.Location = New System.Drawing.Point(453, 632) + Me.lblKafkaCnt.Location = New System.Drawing.Point(177, 562) Me.lblKafkaCnt.Name = "lblKafkaCnt" Me.lblKafkaCnt.Size = New System.Drawing.Size(10, 13) Me.lblKafkaCnt.TabIndex = 51 @@ -913,7 +918,7 @@ Partial Class usrCntlCBAM 'Button5 ' Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Location = New System.Drawing.Point(1097, 79) + Me.Button5.Location = New System.Drawing.Point(658, 68) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(68, 37) Me.Button5.TabIndex = 53 @@ -1380,7 +1385,7 @@ Partial Class usrCntlCBAM 'Button8 ' Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Location = New System.Drawing.Point(1097, 131) + Me.Button8.Location = New System.Drawing.Point(740, 68) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(68, 37) Me.Button8.TabIndex = 72 @@ -1393,11 +1398,80 @@ 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.UsCntlCBAM_Status1) - Me.Panel3.Location = New System.Drawing.Point(491, 511) + Me.Panel3.Location = New System.Drawing.Point(215, 442) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(380, 180) + Me.Panel3.Size = New System.Drawing.Size(421, 199) Me.Panel3.TabIndex = 73 ' + 'UsCntlCBAM_Status1 + ' + 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(421, 199) + Me.UsCntlCBAM_Status1.TabIndex = 0 + ' + 'Panel4 + ' + Me.Panel4.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel4.Controls.Add(Me.Panel3) + Me.Panel4.Controls.Add(Me.Button8) + Me.Panel4.Controls.Add(Me.Button5) + Me.Panel4.Controls.Add(Me.lblKafkaCnt) + Me.Panel4.Controls.Add(Me.Button3) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_TELOTEC_GP) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_GP) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_GP) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY_GP) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY_Spedb) + Me.Panel4.Controls.Add(Me.Button1) + Me.Panel4.Controls.Add(Me.Button2) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY_XML) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_TELOTEC_Copy) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Copy) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Copy) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY_Copy) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_TELOTEC_Summe) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_TELOTEC_Detail) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Summe) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Detail) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Summe) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Detail) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY_Summe) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY_Detail) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_TELOTEC) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DHF_VERAG) + Me.Panel4.Controls.Add(Me.btnCBAM_DS_DAKOSY) + Me.Panel4.Controls.Add(Me.txtCBAMPruef_TELOTEC) + Me.Panel4.Controls.Add(Me.txtCBAMPruef_DHF_UNISPED) + Me.Panel4.Controls.Add(Me.txtCBAMPruef_DHF_VERAG) + Me.Panel4.Controls.Add(Me.txtCBAMPruef_DAKOSY) + Me.Panel4.Controls.Add(Me.btnCBAMPruef_ALLE) + Me.Panel4.Controls.Add(Me.btnCBAMPruef_DHF_UNISPED) + Me.Panel4.Controls.Add(Me.btnCBAMPruef_TELOTEC) + Me.Panel4.Controls.Add(Me.btnCBAMPruef_DHF_VERAG) + Me.Panel4.Controls.Add(Me.btnCBAMPruef_DAKOSY) + Me.Panel4.Location = New System.Drawing.Point(317, 71) + Me.Panel4.Name = "Panel4" + Me.Panel4.Size = New System.Drawing.Size(853, 640) + Me.Panel4.TabIndex = 74 + ' + 'cboJahr + ' + Me.cboJahr._allowedValuesFreiText = Nothing + Me.cboJahr._allowFreiText = False + Me.cboJahr._value = "" + Me.cboJahr.FormattingEnabled = True + Me.cboJahr.Items.AddRange(New Object() {"", "Q1", "Q2", "Q3", "Q4", "JAHR"}) + Me.cboJahr.Location = New System.Drawing.Point(543, 48) + Me.cboJahr.Name = "cboJahr" + Me.cboJahr.Size = New System.Drawing.Size(60, 21) + Me.cboJahr.TabIndex = 75 + ' 'cboIndirekt ' Me.cboIndirekt._allowedValuesFreiText = Nothing @@ -1408,7 +1482,7 @@ Partial Class usrCntlCBAM Me.cboIndirekt.Items.AddRange(New Object() {"", "Q1", "Q2", "Q3", "Q4"}) Me.cboIndirekt.Location = New System.Drawing.Point(106, 48) Me.cboIndirekt.Name = "cboIndirekt" - Me.cboIndirekt.Size = New System.Drawing.Size(341, 21) + Me.cboIndirekt.Size = New System.Drawing.Size(322, 21) Me.cboIndirekt.TabIndex = 71 Me.cboIndirekt.Visible = False ' @@ -1463,29 +1537,6 @@ Partial Class usrCntlCBAM Me.cbxVERAG.Text = "VERAG" Me.cbxVERAG.UseVisualStyleBackColor = True ' - 'txtJahr - ' - Me.txtJahr._DateTimeOnly = False - Me.txtJahr._numbersOnly = False - Me.txtJahr._numbersOnlyKommastellen = "" - Me.txtJahr._numbersOnlyTrennzeichen = True - Me.txtJahr._Prozent = False - Me.txtJahr._ShortDateNew = False - Me.txtJahr._ShortDateOnly = False - Me.txtJahr._TimeOnly = False - Me.txtJahr._TimeOnly_Seconds = False - Me.txtJahr._value = "" - Me.txtJahr._Waehrung = False - Me.txtJahr._WaehrungZeichen = True - Me.txtJahr.ForeColor = System.Drawing.Color.Black - Me.txtJahr.Location = New System.Drawing.Point(562, 49) - Me.txtJahr.MaxLineLength = -1 - Me.txtJahr.MaxLines_Warning = "" - Me.txtJahr.MaxLines_Warning_Label = Nothing - Me.txtJahr.Name = "txtJahr" - Me.txtJahr.Size = New System.Drawing.Size(60, 20) - Me.txtJahr.TabIndex = 20 - ' 'cboQuartal ' Me.cboQuartal._allowedValuesFreiText = Nothing @@ -1493,7 +1544,7 @@ Partial Class usrCntlCBAM Me.cboQuartal._value = "" Me.cboQuartal.FormattingEnabled = True Me.cboQuartal.Items.AddRange(New Object() {"", "Q1", "Q2", "Q3", "Q4", "JAHR"}) - Me.cboQuartal.Location = New System.Drawing.Point(511, 48) + Me.cboQuartal.Location = New System.Drawing.Point(495, 48) Me.cboQuartal.Name = "cboQuartal" Me.cboQuartal.Size = New System.Drawing.Size(45, 21) Me.cboQuartal.TabIndex = 19 @@ -1513,7 +1564,7 @@ Partial Class usrCntlCBAM Me.txtVon._Waehrung = False Me.txtVon._WaehrungZeichen = True Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(763, 48) + Me.txtVon.Location = New System.Drawing.Point(708, 48) Me.txtVon.MaxLineLength = -1 Me.txtVon.MaxLines_Warning = "" Me.txtVon.MaxLines_Warning_Label = Nothing @@ -1536,7 +1587,7 @@ Partial Class usrCntlCBAM Me.txtBis._Waehrung = False Me.txtBis._WaehrungZeichen = True Me.txtBis.ForeColor = System.Drawing.Color.Black - Me.txtBis.Location = New System.Drawing.Point(879, 48) + Me.txtBis.Location = New System.Drawing.Point(824, 48) Me.txtBis.MaxLineLength = -1 Me.txtBis.MaxLines_Warning = "" Me.txtBis.MaxLines_Warning_Label = Nothing @@ -1564,24 +1615,50 @@ Partial Class usrCntlCBAM Me.txtEori.MaxLines_Warning = "" Me.txtEori.MaxLines_Warning_Label = Nothing Me.txtEori.Name = "txtEori" - Me.txtEori.Size = New System.Drawing.Size(341, 20) + Me.txtEori.Size = New System.Drawing.Size(322, 20) Me.txtEori.TabIndex = 1 ' - 'UsCntlCBAM_Status1 + 'txtVERA_ZertPreis ' - 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 + Me.txtVERA_ZertPreis._DateTimeOnly = False + Me.txtVERA_ZertPreis._numbersOnly = True + Me.txtVERA_ZertPreis._numbersOnlyKommastellen = "" + Me.txtVERA_ZertPreis._numbersOnlyTrennzeichen = True + Me.txtVERA_ZertPreis._Prozent = False + Me.txtVERA_ZertPreis._ShortDateNew = False + Me.txtVERA_ZertPreis._ShortDateOnly = False + Me.txtVERA_ZertPreis._TimeOnly = False + Me.txtVERA_ZertPreis._TimeOnly_Seconds = False + Me.txtVERA_ZertPreis._value = "" + Me.txtVERA_ZertPreis._Waehrung = False + Me.txtVERA_ZertPreis._WaehrungZeichen = True + Me.txtVERA_ZertPreis.ForeColor = System.Drawing.Color.Red + Me.txtVERA_ZertPreis.Location = New System.Drawing.Point(52, 250) + Me.txtVERA_ZertPreis.MaxLength = 10 + Me.txtVERA_ZertPreis.MaxLineLength = -1 + Me.txtVERA_ZertPreis.MaxLines_Warning = "" + Me.txtVERA_ZertPreis.MaxLines_Warning_Label = Nothing + Me.txtVERA_ZertPreis.Name = "txtVERA_ZertPreis" + Me.txtVERA_ZertPreis.Size = New System.Drawing.Size(54, 20) + Me.txtVERA_ZertPreis.TabIndex = 76 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(0, 253) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(55, 13) + Me.Label14.TabIndex = 77 + Me.Label14.Text = "Zert.Preis:" ' '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.Panel3) - Me.Controls.Add(Me.Button8) + Me.Controls.Add(Me.txtVERA_ZertPreis) + Me.Controls.Add(Me.Label14) + Me.Controls.Add(Me.cboJahr) Me.Controls.Add(Me.cboIndirekt) Me.Controls.Add(Me.cbxIndirekt) Me.Controls.Add(Me.cbxVERAG_GPXLS) @@ -1604,56 +1681,20 @@ Partial Class usrCntlCBAM Me.Controls.Add(Me.btnCBAM_DS_VERAG) Me.Controls.Add(Me.lblErg_VERAG) Me.Controls.Add(Me.Button6) - Me.Controls.Add(Me.Button5) Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.lblKafkaCnt) - Me.Controls.Add(Me.Button3) - Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_GP) - Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_GP) - Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_GP) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_GP) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Spedb) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.Button2) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_XML) Me.Controls.Add(Me.MyPanel1) - Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Copy) - Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Copy) - Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Copy) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Copy) Me.Controls.Add(Me.Label6) - Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Summe) - Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Detail) - Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Summe) - Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Detail) - Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Summe) - Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Detail) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Summe) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_Detail) Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED) - Me.Controls.Add(Me.btnCBAM_DS_TELOTEC) - Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG) - Me.Controls.Add(Me.btnCBAM_DS_DAKOSY) - Me.Controls.Add(Me.txtJahr) Me.Controls.Add(Me.cboQuartal) Me.Controls.Add(Me.Label5) Me.Controls.Add(Me.Label4) Me.Controls.Add(Me.txtVon) Me.Controls.Add(Me.txtBis) - Me.Controls.Add(Me.txtCBAMPruef_TELOTEC) - Me.Controls.Add(Me.txtCBAMPruef_DHF_UNISPED) - Me.Controls.Add(Me.txtCBAMPruef_DHF_VERAG) - Me.Controls.Add(Me.txtCBAMPruef_DAKOSY) - Me.Controls.Add(Me.btnCBAMPruef_ALLE) Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.btnCBAMPruef_DHF_UNISPED) - Me.Controls.Add(Me.btnCBAMPruef_TELOTEC) - Me.Controls.Add(Me.btnCBAMPruef_DHF_VERAG) - Me.Controls.Add(Me.btnCBAMPruef_DAKOSY) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.txtEori) Me.Controls.Add(Me.lblOffert) + Me.Controls.Add(Me.Panel4) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "usrCntlCBAM" Me.Size = New System.Drawing.Size(1171, 712) @@ -1663,6 +1704,8 @@ Partial Class usrCntlCBAM Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.Panel3.ResumeLayout(False) + Me.Panel4.ResumeLayout(False) + Me.Panel4.PerformLayout() Me.MyPanel1.ResumeLayout(False) Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) @@ -1689,7 +1732,6 @@ Partial Class usrCntlCBAM Friend WithEvents Label4 As Label Friend WithEvents Label5 As Label Friend WithEvents cboQuartal As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents txtJahr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents btnCBAM_DS_DHF_UNISPED As Button Friend WithEvents btnCBAM_DS_TELOTEC As Button Friend WithEvents btnCBAM_DS_DHF_VERAG As Button @@ -1775,4 +1817,8 @@ Partial Class usrCntlCBAM Friend WithEvents Button8 As Button Friend WithEvents Panel3 As Panel Friend WithEvents UsCntlCBAM_Status1 As usCntlCBAM_Status + Friend WithEvents Panel4 As Panel + Friend WithEvents cboJahr As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtVERA_ZertPreis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label14 As Label End Class diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 46f63365..d000d927 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1,5 +1,6 @@ Imports DAKOSY_Worker Imports DocumentFormat.OpenXml.Spreadsheet +Imports GrapeCity.DataVisualization.TypeScript Imports Org.BouncyCastle.Crypto.Agreement Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN.agsCustomsExchange @@ -401,14 +402,23 @@ Public Class usrCntlCBAM End Sub Private Sub usrCntlCBAM_Load(sender As Object, e As EventArgs) Handles Me.Load - txtJahr.Text = Now.Year + + cboJahr.Items.Clear() + For yearCnt = 2023 To Now.Year + cboJahr.Items.Add(yearCnt) + Next + + cboJahr.Text = Now.Year txtCalcJahr.Text = Now.Year txtCalc_Defaut_Year.Text = Now.Year - txtCalc_Defaut_CertPrice._value = 95 + + Dim ZertPreis As Double = 100 + txtCalc_Defaut_CertPrice._value = ZertPreis + txtVERA_ZertPreis._value = ZertPreis Button8.Visible = True If Now.Month < 3 Then - txtJahr.Text = Now.Year - 1 + cboJahr.Text = Now.Year - 1 cboQuartal.Text = "Q4" ElseIf Now.Month < 6 Then : cboQuartal.Text = "Q1" ElseIf Now.Month < 9 Then : cboQuartal.Text = "Q2" @@ -439,19 +449,18 @@ Public Class usrCntlCBAM End Sub - Private Sub cboQuartal_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboQuartal.SelectedIndexChanged - If cboQuartal.Text <> "" And IsNumeric(txtJahr.Text) AndAlso txtJahr.Text.Length = 4 Then + Private Sub cboQuartal_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboQuartal.SelectedIndexChanged, cboJahr.TextChanged + If cboQuartal.Text <> "" And IsNumeric(cboJahr.Text) AndAlso cboJahr.Text.Length = 4 Then Select Case cboQuartal.Text - Case "Q1" : txtVon._value = CDate("01.01." & txtJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) - Case "Q2" : txtVon._value = CDate("01.04." & txtJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) - Case "Q3" : txtVon._value = CDate("01.07." & txtJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) - Case "Q4" : txtVon._value = CDate("01.10." & txtJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) - Case "JAHR" : txtVon._value = CDate("01.01." & txtJahr.Text) : txtBis._value = CDate("31.12." & txtJahr.Text) + Case "Q1" : txtVon._value = CDate("01.01." & cboJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) + Case "Q2" : txtVon._value = CDate("01.04." & cboJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) + Case "Q3" : txtVon._value = CDate("01.07." & cboJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) + Case "Q4" : txtVon._value = CDate("01.10." & cboJahr.Text) : txtBis._value = CDate(txtVon._value).AddMonths(3).AddDays(-1) + Case "JAHR" : txtVon._value = CDate("01.01." & cboJahr.Text) : txtBis._value = CDate("31.12." & cboJahr.Text) End Select - End If End Sub @@ -541,7 +550,7 @@ Public Class usrCntlCBAM Next - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value,, True) btnCBAM_DS_DAKOSY_Detail.Tag = path btnCBAM_DS_DAKOSY_Detail.Enabled = True btnCBAM_DS_DAKOSY_Copy.Enabled = True @@ -589,7 +598,7 @@ Public Class usrCntlCBAM Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600) If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value,, True) btnCBAM_DS_DAKOSY_Spedb.Enabled = True btnCBAM_DS_DAKOSY_Spedb.Tag = path Me.Cursor = Cursors.Default @@ -716,14 +725,25 @@ Public Class usrCntlCBAM Dim weight = If(r("Rohmasse") Is DBNull.Value, r("Eigenmasse"), Convert.ToDecimal(r("Rohmasse"))) Dim year = If(txtBis._value <> "", CDate(txtBis._value).Year, Now.Year) - Dim cost As String = cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM( - cn_code:=Convert.ToString(r("Tarifnummer")), - weight, - country_code:=Convert.ToString(r("VersendungsLand")), - see_total:=emission, - year, - benchmark_value:=benchmark - ) + Dim cost As String = "0" + If IsNumeric(txtVERA_ZertPreis._value) Then + cost = cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM_ByCertificatePrice( + cn_code:=Convert.ToString(r("Tarifnummer")), + weight / 1000, + country_code:=Convert.ToString(r("VersendungsLand")), + CDbl(txtVERA_ZertPreis._value), + year + ) + Else + cost = cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM( + cn_code:=Convert.ToString(r("Tarifnummer")), + weight / 1000, + country_code:=Convert.ToString(r("VersendungsLand")), + see_total:=emission, + year, + benchmark_value:=benchmark + ) + End If r("Def_benchmark") = If(benchmark Is Nothing, DBNull.Value, benchmark) r("Def_Emission") = If(emission Is Nothing, DBNull.Value, emission) @@ -1517,7 +1537,7 @@ Public Class usrCntlCBAM Private Sub doCBAM_XML(dt As DataTable, EORI As String) Dim CBAM_XML As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.QReportType - CBAM_XML.Year = txtJahr.Text + CBAM_XML.Year = cboJahr.Text CBAM_XML.ReportingPeriod = cboQuartal._value EORI = txtEori.Text ' Sont VERAG problem.. @@ -2257,7 +2277,7 @@ Public Class usrCntlCBAM From it In za.Items Group By Tarifnummer = LeftStr(it.zaItem_HSCode, 8), - VersendungsLand = za.za_CountryDispatch + Ursprungsland = it.zaItem_OriginCountry Into grp = Group Let verfahren = grp.Select(Function(x) LeftStr(x.za.za_MainProcedure, 2)). @@ -2275,9 +2295,9 @@ Public Class usrCntlCBAM Select New With { .Tarifnummer = Tarifnummer, .Eigenmasse = grp.Sum(Function(x) If(x.it.zaItem_NetMass, 0D)), - .Rohmasse = Math.Max(rohmasseItems, rohmasseZA), + .Rohmasse = Math.max(rohmasseItems, rohmasseZA), .Rechnungspreis = grp.Sum(Function(x) If(x.it.zaItem_InvoiceValueEUR, x.it.zaItem_StatisticalValueEUR)), - .VersendungsLand = VersendungsLand, + .Ursprungsland = Ursprungsland, .Verfahren = If(verfahrenFallback, verfahren), .VorangegangenesVerfahren = vorverfahren } @@ -2286,22 +2306,89 @@ Public Class usrCntlCBAM dt.Columns.Add("Tarifnummer", GetType(String)) dt.Columns.Add("Eigenmasse", GetType(Decimal)) - dt.Columns.Add("Rohmasse", GetType(Decimal)) + ' dt.Columns.Add("Rohmasse", GetType(Decimal)) dt.Columns.Add("Rechnungspreis", GetType(Decimal)) - dt.Columns.Add("VersendungsLand", GetType(String)) + dt.Columns.Add("Ursprungsland", GetType(String)) dt.Columns.Add("Verfahren", GetType(String)) dt.Columns.Add("VorangegangenesVerfahren", GetType(String)) + If cbxKosten.Checked Then + dt.Columns.Add("Def_benchmark", GetType(Decimal)) + dt.Columns.Add("Def_Emission", GetType(Decimal)) + dt.Columns.Add("Faktor", GetType(Decimal)) + dt.Columns.Add("EstimatedCost", GetType(Decimal)) + End If + + For Each r In summary - dt.Rows.Add( - r.Tarifnummer, - r.Eigenmasse, - r.Rohmasse, - r.Rechnungspreis, - r.VersendungsLand, - r.Verfahren, - r.VorangegangenesVerfahren - ) + + If cbxKosten.Checked Then + ' ========================================================= + ' Berechnung pro Zeile + ' ========================================================= + + Dim benchmark As Object = Nothing + Dim emission As Object = Nothing + Dim faktor As Object = Nothing + Dim weight = r.Eigenmasse + Dim year = If(txtBis._value <> "", CDate(txtBis._value).Year, Now.Year) + + Dim cost As String = "0" + If IsNumeric(txtVERA_ZertPreis._value) Then + cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM_ByCertificatePrice( + cn_code:=Convert.ToString(r.Tarifnummer), + weight / 1000, + country_code:=Convert.ToString(r.Ursprungsland), + CDbl(txtVERA_ZertPreis._value), + year, + cost, + emission, + benchmark, + faktor + ) + Else + cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM( + cn_code:=Convert.ToString(r.Tarifnummer), + weight / 1000, + country_code:=Convert.ToString(r.Ursprungsland), + Nothing, + year, + Nothing, + cost, + emission, + benchmark, + faktor + ) + End If + + 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( + r.Tarifnummer, + r.Eigenmasse, + r.Rechnungspreis, + r.Ursprungsland, + r.Verfahren, + r.VorangegangenesVerfahren, + Def_benchmark, + Def_Emission, + faktor, + EstimatedCost + ) + + Else + dt.Rows.Add( + r.Tarifnummer, + r.Eigenmasse, + r.Rechnungspreis, + r.Ursprungsland, + r.Verfahren, + r.VorangegangenesVerfahren + ) + End If + ' MsgBox(r.Tarifnummer) Next @@ -2309,7 +2396,9 @@ Public Class usrCntlCBAM ' MsgBox(dt.Rows.Count) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,, , , , False, EORI & "_Summenbericht_" & txtVon._value & "-" & txtBis._value) + Dim range = If(cbxKosten.Checked, {"C:C", "J:J"}, {"C:C"}) + + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,, , , , False, EORI & "_Summenbericht_" & txtVon._value & "-" & txtBis._value,, True) btnCBAM_DS_VERAG_Summe.Tag = path btnCBAM_DS_VERAG_Summe.Enabled = True btnCBAM_DS_VERAG_Copy.Enabled = True @@ -2343,9 +2432,10 @@ Public Class usrCntlCBAM .Anmeldedatum = If(za.za_ReleaseDate, za.za_DeclarationDate), .BezugsNr = za.za_LRN, .VertretungsVerhaeltnis = za.za_RepresentationCode, - .Tarifnummer = LeftStr(it.zaItem_HSCode, 8) & "%", + .Tarifnummer = LeftStr(it.zaItem_HSCode, 8), .Eigenmasse = it.zaItem_NetMass, .Rohmasse = it.zaItem_GrossMass, + .Ursprungsland = it.zaItem_OriginCountry, .VersendungsLand = za.za_CountryDispatch, .BestimmungsLand = za.za_CountryDestination, .Rechnungspreis = If(it.zaItem_InvoiceValueEUR, it.zaItem_StatisticalValueEUR), @@ -2369,6 +2459,7 @@ Public Class usrCntlCBAM dt.Columns.Add("Tarifnummer") dt.Columns.Add("Eigenmasse", GetType(Decimal)) dt.Columns.Add("Rohmasse", GetType(Decimal)) + dt.Columns.Add("Ursprungsland") dt.Columns.Add("VersendungsLand") dt.Columns.Add("BestimmungsLand") dt.Columns.Add("Rechnungspreis", GetType(Decimal)) @@ -2380,31 +2471,117 @@ Public Class usrCntlCBAM dt.Columns.Add("Rechnungsnummer") dt.Columns.Add("Rechnungsdatum", GetType(Date)) + If cbxKosten.Checked Then + dt.Columns.Add("Def_benchmark", GetType(Decimal)) + dt.Columns.Add("Def_Emission", GetType(Decimal)) + dt.Columns.Add("Faktor", GetType(Decimal)) + dt.Columns.Add("EstimatedCost", GetType(Decimal)) + End If + For Each r In details - dt.Rows.Add( - r.MRN, - r.PositionsNummer, - If(r.Anmeldedatum, DBNull.Value), - r.BezugsNr, - r.VertretungsVerhaeltnis, - r.Tarifnummer, - If(r.Eigenmasse, 0D), - If(r.Rohmasse, 0D), - r.VersendungsLand, - r.BestimmungsLand, - If(r.Rechnungspreis, 0D), - r.Rechnungswaehrung, - r.EmpfaengerEORI, - r.Empfaenger, - r.AbsenderEORI, - r.Absender, - r.Rechnungsnummer, - If(r.Rechnungsdatum Is Nothing, DBNull.Value, r.Rechnungsdatum) - ) + If cbxKosten.Checked Then + + ' ========================================================= + ' Berechnung pro Zeile + ' ========================================================= + + Dim benchmark As Object = Nothing + Dim emission As Object = Nothing + Dim faktor As Object = Nothing + Dim weight = r.Eigenmasse + Dim year = If(txtBis._value <> "", CDate(txtBis._value).Year, Now.Year) + + Dim cost As String = "0" + If IsNumeric(txtVERA_ZertPreis._value) Then + cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM_ByCertificatePrice( + cn_code:=Convert.ToString(r.Tarifnummer), + weight / 1000, + country_code:=Convert.ToString(r.Ursprungsland), + CDbl(txtVERA_ZertPreis._value), + year, + cost, + emission, + benchmark, + faktor + ) + Else + cATEZ_Greenpulse_CBAM_CostCalculation.calcCBAM( + cn_code:=Convert.ToString(r.Tarifnummer), + weight / 1000, + country_code:=Convert.ToString(r.Ursprungsland), + Nothing, + year, + Nothing, + cost, + emission, + benchmark, + faktor + ) + End If + + 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( + r.MRN, + r.PositionsNummer, + If(r.Anmeldedatum, DBNull.Value), + r.BezugsNr, + r.VertretungsVerhaeltnis, + r.Tarifnummer, + If(r.Eigenmasse, 0D), + If(r.Rohmasse, 0D), + r.Ursprungsland, + r.VersendungsLand, + r.BestimmungsLand, + If(r.Rechnungspreis, 0D), + r.Rechnungswaehrung, + r.EmpfaengerEORI, + r.Empfaenger, + r.AbsenderEORI, + r.Absender, + r.Rechnungsnummer, + If(r.Rechnungsdatum Is Nothing, DBNull.Value, r.Rechnungsdatum), + Def_benchmark, + Def_Emission, + faktor, + EstimatedCost + ) + Else + dt.Rows.Add( + r.MRN, + r.PositionsNummer, + If(r.Anmeldedatum, DBNull.Value), + r.BezugsNr, + r.VertretungsVerhaeltnis, + r.Tarifnummer, + If(r.Eigenmasse, 0D), + If(r.Rohmasse, 0D), + r.Ursprungsland, + r.VersendungsLand, + r.BestimmungsLand, + If(r.Rechnungspreis, 0D), + r.Rechnungswaehrung, + r.EmpfaengerEORI, + r.Empfaenger, + r.AbsenderEORI, + r.Absender, + r.Rechnungsnummer, + If(r.Rechnungsdatum Is Nothing, DBNull.Value, r.Rechnungsdatum) + ) + End If + Next + + + If dt.Rows.Count > 0 Then - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, , , , , False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) + Dim range = If(cbxKosten.Checked, {"L:L", "V:V"}, {"L:L"}) + + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, range, , , , False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value,, True) btnCBAM_DS_VERAG_Detail.Tag = path btnCBAM_DS_VERAG_Detail.Enabled = True @@ -2826,6 +3003,5 @@ Public Class usrCntlCBAM Where(Function(x) Not String.IsNullOrWhiteSpace(x.za_LRN)))) End Sub - End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_CBAM_CostCalculation.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_CBAM_CostCalculation.vb index 57958d02..f89038cd 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_CBAM_CostCalculation.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_CBAM_CostCalculation.vb @@ -146,7 +146,7 @@ Public Class cATEZ_Greenpulse_CBAM_CostCalculation ' ------------------------------------------------------------------------ ' calcCBAM – mit automatischem Fallback auf CN-Code Defaults ' ------------------------------------------------------------------------ - Public Shared Function calcCBAM(cn_code As String, weight As Object, country_code As String, Optional ByRef see_total As Object = Nothing, Optional year As Object = Nothing, Optional ByRef benchmark_value As Object = Nothing, Optional ByRef CBAM_COST As Decimal = -1, Optional ByRef CBAM_EMISSION As Decimal = -1) As String + Public Shared Function calcCBAM(cn_code As String, weight As Object, country_code As String, Optional ByRef see_total As Object = Nothing, Optional year As Object = Nothing, Optional ByRef benchmark_value As Object = Nothing, Optional ByRef CBAM_COST As Decimal = -1, Optional ByRef CBAM_EMISSION As Decimal = -1, Optional ByRef CBAM_BENCHMARK As Decimal = -1, Optional ByRef CBAM_FAKTOR As Decimal = -1) As String ' ------------------------------------------------------------ ' Basis-Validierung @@ -281,6 +281,8 @@ Public Class cATEZ_Greenpulse_CBAM_CostCalculation s &= $"CBAM Kosten: {d.cost:N2} {d.currency}" & vbCrLf CBAM_COST = d.cost CBAM_EMISSION = see_total + CBAM_BENCHMARK = benchmark_value + CBAM_FAKTOR = d.phase_factor Return s End Function diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb index 4ffa805e..c040795c 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb +++ b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb @@ -224,8 +224,9 @@ Public Class cVERAG_CustomsDeclarations ' ------------------------------------------------------------ ' 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") + ' ------------------------------------------------------------ ' SQL: ZA-IDs ermitteln @@ -263,6 +264,7 @@ Public Class cVERAG_CustomsDeclarations If CustomsSystem <> "" Then sqlstr &= " AND z.za_System = @sys " End If + Using conn = SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sqlstr, conn) @@ -306,7 +308,7 @@ Public Class cVERAG_CustomsDeclarations ' ------------------------------------------------ If loadAll Then CD.Parties = cVERAG_CustomsDeclarations_Parties.LOAD_BY_ZAID(CD.za_Id) - CD.Items = cVERAG_CustomsDeclarations_Item.LOAD_BY_ZAID(CD.za_Id) + CD.Items = cVERAG_CustomsDeclarations_Item.LOAD_BY_ZAID(CD.za_Id, cbamWhereSnd) CD.Duties = cVERAG_CustomsDeclarations_Duty.LOAD_BY_ZAID(CD.za_Id) CD.Documents = cVERAG_CustomsDeclarations_Document.LOAD_HEAD_BY_ZAID(CD.za_Id) End If @@ -988,7 +990,7 @@ Public Class cVERAG_CustomsDeclarations_Item Next End Sub - Public Shared Function LOAD_BY_ZAID(zaId As Integer) As List(Of cVERAG_CustomsDeclarations_Item) + Public Shared Function LOAD_BY_ZAID(zaId As Integer, Optional where As String = "") As List(Of cVERAG_CustomsDeclarations_Item) Dim result As New List(Of cVERAG_CustomsDeclarations_Item) @@ -996,8 +998,7 @@ Public Class cVERAG_CustomsDeclarations_Item Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand( - "SELECT * FROM tblVERAG_CustomsDeclarations_Items WHERE zaItem_zaId=@zaId", - conn) + "SELECT * FROM tblVERAG_CustomsDeclarations_Items WHERE zaItem_zaId=@zaId " & where, conn) cmd.Parameters.AddWithValue("@zaId", zaId)