From a166e48d4a41472dd380626d618261a8fa43297b Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 27 Mar 2026 10:11:33 +0100 Subject: [PATCH] merge --- Aviso/frmSendungsdetailsNEU.Designer.vb | 372 ++++++++++++------------ Aviso/frmSendungsdetailsNEU.resx | 33 --- Aviso/frmSendungsdetailsNEU.vb | 14 +- 3 files changed, 193 insertions(+), 226 deletions(-) diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index a8697f8..ad7a018 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,20 +24,20 @@ Partial Class frmSendungsdetailsNEU Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU)) - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - 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 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 DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -93,6 +93,13 @@ Partial Class frmSendungsdetailsNEU Me.toolModal_Transit = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem32 = New System.Windows.Forms.ToolStripMenuItem() + Me.tbATEZ = New System.Windows.Forms.TabPage() + Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView() + Me.Panel23 = New System.Windows.Forms.Panel() + Me.Label18 = New System.Windows.Forms.Label() + Me.Label17 = New System.Windows.Forms.Label() + Me.btnATEZNewEZA = New System.Windows.Forms.Button() + Me.btnATEZNew = New System.Windows.Forms.Button() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.pnlKundenZolltarif = New System.Windows.Forms.Panel() Me.Label22 = New System.Windows.Forms.Label() @@ -128,11 +135,6 @@ Partial Class frmSendungsdetailsNEU Me.TabPage3 = New System.Windows.Forms.TabPage() Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() Me.gridVermerke = New System.Windows.Forms.DataGridView() - Me.tbATEZ = New System.Windows.Forms.TabPage() - Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView() - Me.Panel23 = New System.Windows.Forms.Panel() - Me.btnATEZNewEZA = New System.Windows.Forms.Button() - Me.btnATEZNew = New System.Windows.Forms.Button() Me.tbDigicust = New System.Windows.Forms.TabPage() Me.dgvDigicust = New System.Windows.Forms.DataGridView() Me.Panel24 = New System.Windows.Forms.Panel() @@ -505,8 +507,6 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Label17 = New System.Windows.Forms.Label() - Me.Label18 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -520,6 +520,9 @@ Partial Class frmSendungsdetailsNEU CType(Me.dgvZollAnmeldungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel17.SuspendLayout() Me.MenuStrip.SuspendLayout() + Me.tbATEZ.SuspendLayout() + CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel23.SuspendLayout() Me.TabPage1.SuspendLayout() Me.pnlKundenZolltarif.SuspendLayout() Me.Panel18.SuspendLayout() @@ -528,9 +531,6 @@ Partial Class frmSendungsdetailsNEU Me.pnlSpedBuchNacherfassung.SuspendLayout() Me.TabPage3.SuspendLayout() CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit() - Me.tbATEZ.SuspendLayout() - CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel23.SuspendLayout() Me.tbDigicust.SuspendLayout() CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel24.SuspendLayout() @@ -1202,6 +1202,121 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem32.Text = " Log" Me.ToolStripMenuItem32.ToolTipText = "Logbuch" ' + 'tbATEZ + ' + Me.tbATEZ.Controls.Add(Me.dgvATEZNCTS) + Me.tbATEZ.Controls.Add(Me.Panel23) + Me.tbATEZ.Location = New System.Drawing.Point(4, 29) + Me.tbATEZ.Name = "tbATEZ" + Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3) + Me.tbATEZ.Size = New System.Drawing.Size(1227, 308) + Me.tbATEZ.TabIndex = 6 + Me.tbATEZ.Text = "ATEZ" + Me.tbATEZ.UseVisualStyleBackColor = True + ' + 'dgvATEZNCTS + ' + Me.dgvATEZNCTS.AllowUserToAddRows = False + Me.dgvATEZNCTS.AllowUserToDeleteRows = False + Me.dgvATEZNCTS.AllowUserToResizeRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + Me.dgvATEZNCTS.ColumnHeadersHeight = 29 + Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvATEZNCTS.Location = New System.Drawing.Point(3, 73) + Me.dgvATEZNCTS.MultiSelect = False + Me.dgvATEZNCTS.Name = "dgvATEZNCTS" + Me.dgvATEZNCTS.ReadOnly = True + Me.dgvATEZNCTS.RowHeadersVisible = False + Me.dgvATEZNCTS.RowHeadersWidth = 51 + Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvATEZNCTS.RowTemplate.Height = 20 + Me.dgvATEZNCTS.RowTemplate.ReadOnly = True + Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvATEZNCTS.ShowCellErrors = False + Me.dgvATEZNCTS.ShowRowErrors = False + Me.dgvATEZNCTS.Size = New System.Drawing.Size(1221, 232) + Me.dgvATEZNCTS.TabIndex = 105 + Me.dgvATEZNCTS.TabStop = False + ' + 'Panel23 + ' + Me.Panel23.BackColor = System.Drawing.Color.White + Me.Panel23.Controls.Add(Me.Label18) + Me.Panel23.Controls.Add(Me.Label17) + Me.Panel23.Controls.Add(Me.btnATEZNewEZA) + Me.Panel23.Controls.Add(Me.btnATEZNew) + Me.Panel23.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel23.Location = New System.Drawing.Point(3, 3) + Me.Panel23.Name = "Panel23" + Me.Panel23.Size = New System.Drawing.Size(1221, 70) + Me.Panel23.TabIndex = 106 + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label18.Location = New System.Drawing.Point(595, 18) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(226, 39) + Me.Label18.TabIndex = 76 + Me.Label18.Text = "Erstellt eine Zollanmeldung anhand der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Unterlagen mit ATEZ TransitAI und übermi" & + "ttelt " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "den Entwurf an DAKOSY als NCTS." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label17.Location = New System.Drawing.Point(170, 18) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(240, 39) + Me.Label17.TabIndex = 75 + Me.Label17.Text = "Erstellt eine Zollanmeldung anhand der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Unterlagen mit ATEZ DeclarantAI und über" & + "mittelt " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "den Entwurf an DAKOSY als EZA." + ' + 'btnATEZNewEZA + ' + Me.btnATEZNewEZA.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnATEZNewEZA.Image = Global.AVISO.My.Resources.Resources.ico_atez_declarantAI + Me.btnATEZNewEZA.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnATEZNewEZA.Location = New System.Drawing.Point(7, 11) + Me.btnATEZNewEZA.Name = "btnATEZNewEZA" + Me.btnATEZNewEZA.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) + Me.btnATEZNewEZA.Size = New System.Drawing.Size(160, 50) + Me.btnATEZNewEZA.TabIndex = 9 + Me.btnATEZNewEZA.Text = "ATEZ-EZA" + Me.btnATEZNewEZA.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnATEZNewEZA.UseVisualStyleBackColor = True + ' + 'btnATEZNew + ' + Me.btnATEZNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnATEZNew.Image = Global.AVISO.My.Resources.Resources.ico_atez_transitAI + Me.btnATEZNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnATEZNew.Location = New System.Drawing.Point(429, 11) + Me.btnATEZNew.Name = "btnATEZNew" + Me.btnATEZNew.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) + Me.btnATEZNew.Size = New System.Drawing.Size(160, 50) + Me.btnATEZNew.TabIndex = 8 + Me.btnATEZNew.Text = "ATEZ-NCTS" + Me.btnATEZNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnATEZNew.UseVisualStyleBackColor = True + Me.btnATEZNew.Visible = False + ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.pnlKundenZolltarif) @@ -1644,18 +1759,18 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 Me.gridVermerke.ColumnHeadersHeight = 29 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill @@ -1666,8 +1781,8 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 51 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle6 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1678,99 +1793,6 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.TabIndex = 0 Me.gridVermerke.TabStop = False ' - 'tbATEZ - ' - Me.tbATEZ.Controls.Add(Me.dgvATEZNCTS) - Me.tbATEZ.Controls.Add(Me.Panel23) - Me.tbATEZ.Location = New System.Drawing.Point(4, 29) - Me.tbATEZ.Name = "tbATEZ" - Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3) - Me.tbATEZ.Size = New System.Drawing.Size(1227, 308) - Me.tbATEZ.TabIndex = 6 - Me.tbATEZ.Text = "ATEZ" - Me.tbATEZ.UseVisualStyleBackColor = True - ' - 'dgvATEZNCTS - ' - Me.dgvATEZNCTS.AllowUserToAddRows = False - Me.dgvATEZNCTS.AllowUserToDeleteRows = False - Me.dgvATEZNCTS.AllowUserToResizeRows = False - DataGridViewCellStyle15.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 - Me.dgvATEZNCTS.ColumnHeadersHeight = 29 - Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvATEZNCTS.Location = New System.Drawing.Point(3, 73) - Me.dgvATEZNCTS.MultiSelect = False - Me.dgvATEZNCTS.Name = "dgvATEZNCTS" - Me.dgvATEZNCTS.ReadOnly = True - Me.dgvATEZNCTS.RowHeadersVisible = False - Me.dgvATEZNCTS.RowHeadersWidth = 51 - Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle17 - Me.dgvATEZNCTS.RowTemplate.Height = 20 - Me.dgvATEZNCTS.RowTemplate.ReadOnly = True - Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvATEZNCTS.ShowCellErrors = False - Me.dgvATEZNCTS.ShowRowErrors = False - Me.dgvATEZNCTS.Size = New System.Drawing.Size(1221, 232) - Me.dgvATEZNCTS.TabIndex = 105 - Me.dgvATEZNCTS.TabStop = False - ' - 'Panel23 - ' - Me.Panel23.BackColor = System.Drawing.Color.White - Me.Panel23.Controls.Add(Me.Label18) - Me.Panel23.Controls.Add(Me.Label17) - Me.Panel23.Controls.Add(Me.btnATEZNewEZA) - Me.Panel23.Controls.Add(Me.btnATEZNew) - Me.Panel23.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel23.Location = New System.Drawing.Point(3, 3) - Me.Panel23.Name = "Panel23" - Me.Panel23.Size = New System.Drawing.Size(1221, 70) - Me.Panel23.TabIndex = 106 - ' - 'btnATEZNewEZA - ' - Me.btnATEZNewEZA.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnATEZNewEZA.Image = Global.AVISO.My.Resources.Resources.ico_atez_declarantAI - Me.btnATEZNewEZA.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnATEZNewEZA.Location = New System.Drawing.Point(7, 11) - Me.btnATEZNewEZA.Name = "btnATEZNewEZA" - Me.btnATEZNewEZA.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.btnATEZNewEZA.Size = New System.Drawing.Size(160, 50) - Me.btnATEZNewEZA.TabIndex = 9 - Me.btnATEZNewEZA.Text = "ATEZ-EZA" - Me.btnATEZNewEZA.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnATEZNewEZA.UseVisualStyleBackColor = True - ' - 'btnATEZNew - ' - Me.btnATEZNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnATEZNew.Image = Global.AVISO.My.Resources.Resources.ico_atez_transitAI - Me.btnATEZNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnATEZNew.Location = New System.Drawing.Point(429, 11) - Me.btnATEZNew.Name = "btnATEZNew" - Me.btnATEZNew.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.btnATEZNew.Size = New System.Drawing.Size(160, 50) - Me.btnATEZNew.TabIndex = 8 - Me.btnATEZNew.Text = "ATEZ-NCTS" - Me.btnATEZNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnATEZNew.UseVisualStyleBackColor = True - Me.btnATEZNew.Visible = False - ' 'tbDigicust ' Me.tbDigicust.Controls.Add(Me.dgvDigicust) @@ -1787,18 +1809,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.AllowUserToAddRows = False Me.dgvDigicust.AllowUserToDeleteRows = False Me.dgvDigicust.AllowUserToResizeRows = False - DataGridViewCellStyle21.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvDigicust.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - 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.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvDigicust.ColumnHeadersHeight = 29 Me.dgvDigicust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvDigicust.Dock = System.Windows.Forms.DockStyle.Fill @@ -1809,8 +1831,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.RowHeadersVisible = False Me.dgvDigicust.RowHeadersWidth = 51 Me.dgvDigicust.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.dgvDigicust.RowTemplate.Height = 20 Me.dgvDigicust.RowTemplate.ReadOnly = True Me.dgvDigicust.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1862,18 +1884,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.AllowUserToAddRows = False Me.dgvMail.AllowUserToDeleteRows = False Me.dgvMail.AllowUserToResizeRows = False - DataGridViewCellStyle24.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.dgvMail.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.dgvMail.ColumnHeadersHeight = 29 Me.dgvMail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvMail.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnSender, Me.clmnRec, Me.clmnSbj, Me.clmnAtt, Me.clmnUIDL}) @@ -1885,8 +1907,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.RowHeadersVisible = False Me.dgvMail.RowHeadersWidth = 51 Me.dgvMail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle12 Me.dgvMail.RowTemplate.Height = 20 Me.dgvMail.RowTemplate.ReadOnly = True Me.dgvMail.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -2754,8 +2776,8 @@ Partial Class frmSendungsdetailsNEU ' 'clmnAbrPreis ' - DataGridViewCellStyle27.Format = "C2" - Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle13.Format = "C2" + Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle13 Me.clmnAbrPreis.HeaderText = "Preis" Me.clmnAbrPreis.MaxInputLength = 15 Me.clmnAbrPreis.MinimumWidth = 6 @@ -3006,8 +3028,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle28.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle14.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.MinimumWidth = 6 @@ -6437,28 +6459,6 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" Me.DataGridViewTextBoxColumn5.ReadOnly = True Me.DataGridViewTextBoxColumn5.Width = 200 - ' - 'Label17 - ' - Me.Label17.AutoSize = True - Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label17.Location = New System.Drawing.Point(170, 18) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(240, 39) - Me.Label17.TabIndex = 75 - Me.Label17.Text = "Erstellt eine Zollanmeldung anhand der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Unterlagen mit ATEZ DeclarantAI und über" & - "mittelt " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "den Entwurf an DAKOSY als EZA." - ' - 'Label18 - ' - Me.Label18.AutoSize = True - Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(595, 18) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(226, 39) - Me.Label18.TabIndex = 76 - Me.Label18.Text = "Erstellt eine Zollanmeldung anhand der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Unterlagen mit ATEZ TransitAI und übermi" & - "ttelt " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "den Entwurf an DAKOSY als NCTS." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) ' 'frmSendungsdetailsNEU ' @@ -6493,6 +6493,10 @@ Partial Class frmSendungsdetailsNEU Me.Panel17.ResumeLayout(False) Me.MenuStrip.ResumeLayout(False) Me.MenuStrip.PerformLayout() + Me.tbATEZ.ResumeLayout(False) + CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel23.ResumeLayout(False) + Me.Panel23.PerformLayout() Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() Me.pnlKundenZolltarif.ResumeLayout(False) @@ -6505,10 +6509,6 @@ Partial Class frmSendungsdetailsNEU Me.pnlSpedBuchNacherfassung.PerformLayout() Me.TabPage3.ResumeLayout(False) CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).EndInit() - Me.tbATEZ.ResumeLayout(False) - CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel23.ResumeLayout(False) - Me.Panel23.PerformLayout() Me.tbDigicust.ResumeLayout(False) CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel24.ResumeLayout(False) diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index c4d1731..33d069f 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -1386,9 +1386,6 @@ nRA+F3D8f7cAkA4zZGm9AAAAAElFTkSuQmCC - - 296, 17 - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V @@ -1527,21 +1524,6 @@ True - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAG9JREFUSEvt @@ -1652,18 +1634,6 @@ True - - True - - - True - - - True - - - True - 404, 17 @@ -1926,9 +1896,6 @@ 174, 17 - - 404, 17 - 596, 17 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index b5c6b2c..1a6d9e3 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5264,12 +5264,12 @@ Public Class frmSendungsdetailsNEU If ABR_ID >= 0 Then Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG(ABR_ID) ABR.sndabr_LeistungsNr = cboAbrLeistungen._value - abr.sndabr_abrArt = "" + ABR.sndabr_abrArt = "" ABR.sndabr_bezeichnung = txtAbrLeistungsBez.Text.Trim ABR.sndabr_beteiligter = cboAbrAn._value.Trim - abr.sndabr_preis = CDbl(txtAbrPreis._value) - abr.sndabr_einzelPreis = CDbl(txtAbrPreis._value) - abr.sndabr_anzahl = 1 + ABR.sndabr_preis = CDbl(txtAbrPreis._value) + ABR.sndabr_einzelPreis = CDbl(txtAbrPreis._value) + ABR.sndabr_anzahl = 1 'SENDUNG_LIST(CURRENT_INDEX).SAVE() btnAddAbr.BackgroundImage = My.Resources.plus Else @@ -5289,7 +5289,7 @@ Public Class frmSendungsdetailsNEU txtVK_Leistung.Text = "" txtVK_Firma.Text = "" txtVK_Preis.Text = "" - initdgvAbrechnung() + initDGVAbrechnung() Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -5305,7 +5305,7 @@ Public Class frmSendungsdetailsNEU Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Find(Function(x) x.sndabr_id = dgvAbrechnung.SelectedRows(0).Cells("clmnAbrID").Value) SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Remove(ABR) SENDUNG_LIST(CURRENT_INDEX).SAVE(False) - initdgvAbrechnung() + initDGVAbrechnung() End If End If End Sub @@ -8067,7 +8067,7 @@ Public Class frmSendungsdetailsNEU If AVISOFUNC.setSendungAbklaerungTR(SendungsId, AvisoId) Then initDataBinding() End If - Me.Cursor = Cursors.Default + Me.Cursor = Cursors.Default End Sub Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click