From e93748277bc7a101c9dba5104081fa5b2da0720a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 18 Mar 2026 13:53:44 +0100 Subject: [PATCH] gesamtsicherheiten --- Aviso/My Project/AssemblyInfo.vb | 4 +- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 48 ++- Aviso/frmGesamtsicherheitenMenuNEU.vb | 23 +- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 293 ++++++++++-------- Aviso/frmGesamtsicherheitenNEU.resx | 90 +++--- Aviso/frmGesamtsicherheitenNEU.vb | 183 +++++++---- Aviso/usrCntlSND_ATBGestellung.vb | 73 ++--- 7 files changed, 416 insertions(+), 298 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 2cdda1e..b58c535 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index a79f827..118cc7f 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -35,6 +35,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -69,7 +70,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblReferenzwert = New System.Windows.Forms.Label() Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.cbxAUTO = New System.Windows.Forms.CheckBox() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -80,7 +81,7 @@ Partial Class frmGesamtsicherheitenMenuNEU ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 114) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 92) ' 'ExportCSVToolStripMenuItem ' @@ -135,18 +136,25 @@ Partial Class frmGesamtsicherheitenMenuNEU 'AusgangEingangToolStripMenuItem ' Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem" - Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang" ' 'SicherheitsbetragToolStripMenuItem ' Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem" - Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag" ' + 'MehrfacheATBNrToolStripMenuItem + ' + Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem" + Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(178, 22) + Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr" + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel1.Controls.Add(Me.cbxAUTO) Me.Panel1.Controls.Add(Me.PictureBox5) Me.Panel1.Controls.Add(Me.btnOpenOver85Days) Me.Panel1.Controls.Add(Me.txtDatBis) @@ -181,7 +189,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(658, 288) + Me.Panel1.Size = New System.Drawing.Size(706, 288) Me.Panel1.TabIndex = 0 ' 'PictureBox5 @@ -567,7 +575,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnNeu.FlatAppearance.BorderSize = 0 Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnNeu.ForeColor = System.Drawing.Color.Black - Me.btnNeu.Location = New System.Drawing.Point(571, 253) + Me.btnNeu.Location = New System.Drawing.Point(619, 253) Me.btnNeu.Name = "btnNeu" Me.btnNeu.Size = New System.Drawing.Size(75, 23) Me.btnNeu.TabIndex = 34 @@ -580,7 +588,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblSaldo.AutoSize = True Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblSaldo.ForeColor = System.Drawing.Color.Red - Me.lblSaldo.Location = New System.Drawing.Point(450, 11) + Me.lblSaldo.Location = New System.Drawing.Point(447, 10) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(82, 24) Me.lblSaldo.TabIndex = 1 @@ -592,7 +600,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblZollsatz.AutoSize = True Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew - Me.lblZollsatz.Location = New System.Drawing.Point(451, 116) + Me.lblZollsatz.Location = New System.Drawing.Point(448, 115) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(63, 16) Me.lblZollsatz.TabIndex = 9 @@ -604,7 +612,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblReferenzwert.AutoSize = True Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew - Me.lblReferenzwert.Location = New System.Drawing.Point(451, 89) + Me.lblReferenzwert.Location = New System.Drawing.Point(448, 88) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(95, 16) Me.lblReferenzwert.TabIndex = 6 @@ -618,7 +626,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnExcel.FlatAppearance.BorderSize = 0 Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnExcel.ForeColor = System.Drawing.Color.Black - Me.btnExcel.Location = New System.Drawing.Point(249, 688) + Me.btnExcel.Location = New System.Drawing.Point(297, 688) Me.btnExcel.Name = "btnExcel" Me.btnExcel.Size = New System.Drawing.Size(105, 23) Me.btnExcel.TabIndex = 35 @@ -637,20 +645,27 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.Location = New System.Drawing.Point(-3, 288) Me.dgvListe.Name = "dgvListe" Me.dgvListe.ReadOnly = True - Me.dgvListe.Size = New System.Drawing.Size(658, 394) + Me.dgvListe.Size = New System.Drawing.Size(706, 394) Me.dgvListe.TabIndex = 1 ' - 'MehrfacheATBNrToolStripMenuItem + 'cbxAUTO ' - Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem" - Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr" + Me.cbxAUTO.AutoSize = True + Me.cbxAUTO.Checked = True + Me.cbxAUTO.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxAUTO.ForeColor = System.Drawing.SystemColors.ButtonHighlight + Me.cbxAUTO.Location = New System.Drawing.Point(36, 233) + Me.cbxAUTO.Name = "cbxAUTO" + Me.cbxAUTO.Size = New System.Drawing.Size(56, 17) + Me.cbxAUTO.TabIndex = 133 + Me.cbxAUTO.Text = "AUTO" + Me.cbxAUTO.UseVisualStyleBackColor = True ' 'frmGesamtsicherheitenMenuNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(658, 721) + Me.ClientSize = New System.Drawing.Size(706, 721) Me.Controls.Add(Me.btnExcel) Me.Controls.Add(Me.dgvListe) Me.Controls.Add(Me.Panel1) @@ -715,4 +730,5 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem + Friend WithEvents cbxAUTO As CheckBox End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index ee4c95a..b012385 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -75,6 +75,7 @@ Public Class frmGesamtsicherheitenMenuNEU ) <> 0 " If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = " & cbxStandort._value.ToString If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'" + If cbxAUTO.Checked Then sqladdon &= " AND CAST(gs_dakoyimport AS INT) = 1" 'Dim sqlstring As String = ' " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId, @@ -127,12 +128,14 @@ Public Class frmGesamtsicherheitenMenuNEU ) SELECT gs.gs_gsnr, + MAX(CAST(gs_dakoyimport AS INT)) AS gs_DAKOSYAUTO, MIN(gs.gs_standort) AS gs_standort, MIN(gs.gs_warenort) AS gs_warenort, MIN(gs.gs_filialenNr) AS gs_filialenNr, MIN(gs.gs_abfertigungsNr) AS gs_abfertigungsNr, MIN(gs.gs_avisoId) AS gs_avisoId, MAX(gs.gs_LKWKZ) AS gs_LKWKZ, + MIN(gs.gs_datum) AS gs_datum, ( COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + @@ -166,7 +169,7 @@ Public Class frmGesamtsicherheitenMenuNEU .RowHeadersWidth = 6 .Columns("gs_standort").Visible = False .Columns("gs_gsnr").HeaderText = "#" - .Columns("gs_gsnr").Width = 36 + .Columns("gs_gsnr").Width = 45 .Columns("gs_filialenNr").HeaderText = "Filiale" .Columns("gs_filialenNr").Width = 43 .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr." @@ -181,6 +184,21 @@ Public Class frmGesamtsicherheitenMenuNEU .Columns("gs_avisoId").Width = 96 .Columns("gs_avisoId").HeaderText = "LKW-ID" .Columns("gs_LKWKZ").HeaderText = "LKW-KZ" + .Columns("gs_DAKOSYAUTO").HeaderText = "AUTO" + + .Columns("gs_DAKOSYAUTO").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + + If TypeOf .Columns("gs_DAKOSYAUTO") Is DataGridViewCheckBoxColumn = False Then + Dim colIndex As Integer = dgvListe.Columns("gs_DAKOSYAUTO").Index + .Columns.Remove("gs_DAKOSYAUTO") + Dim chkCol As New DataGridViewCheckBoxColumn() + chkCol.Name = "gs_DAKOSYAUTO" + chkCol.HeaderText = "AUTO" + chkCol.Width = 40 + chkCol.DataPropertyName = "gs_DAKOSYAUTO" + .Columns.Insert(colIndex, chkCol) + End If + End With @@ -233,7 +251,8 @@ Public Class frmGesamtsicherheitenMenuNEU .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value .avisoID = dgvListe.CurrentRow.Cells("gs_avisoId").Value .dataTable = Me.dataTable - .firmaId = Me.firmaId + .DAKOSY_AUTO = dgvListe.CurrentRow.Cells("gs_DAKOSYAUTO").Value + End With AddHandler frm.FormClosing, Function() diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index fcade82..77666b2 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -22,16 +22,16 @@ Partial Class frmGesamtsicherheitenNEU 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU)) 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU)) - Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip(Me.components) + 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() + Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip() Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MRNNRÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel2 = New System.Windows.Forms.Panel() Me.pnlChangeATCNr = New System.Windows.Forms.Panel() Me.txtSicherheitsbetragContext = New System.Windows.Forms.TextBox() @@ -55,7 +55,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label18 = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() Me.Label16 = New System.Windows.Forms.Label() - Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip() Me.ATCMRNNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlSummeGes = New System.Windows.Forms.Panel() Me.Label28 = New System.Windows.Forms.Label() @@ -89,18 +89,20 @@ Partial Class frmGesamtsicherheitenNEU Me.txtGestellInfo = New System.Windows.Forms.TextBox() Me.lblId = New System.Windows.Forms.Label() Me.cbxZollsatzueberschreiben = New System.Windows.Forms.CheckBox() - Me.btnNext = New System.Windows.Forms.Button() Me.lbloffenerSaldo = New System.Windows.Forms.Label() - Me.btnPrev = New System.Windows.Forms.Button() Me.Label20 = New System.Windows.Forms.Label() Me.txtPosNr = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.cbxHeader = New System.Windows.Forms.CheckBox() + Me.btnDAKOSY_AUTO = New System.Windows.Forms.Button() Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox() Me.btnRundungsdifAusgl = New System.Windows.Forms.Button() Me.btnNew = New System.Windows.Forms.Button() Me.cbx_offene = New System.Windows.Forms.CheckBox() Me.txtSuche = New System.Windows.Forms.TextBox() Me.Label21 = New System.Windows.Forms.Label() + Me.btnPrev = New System.Windows.Forms.Button() + Me.btnNext = New System.Windows.Forms.Button() Me.Label15 = New System.Windows.Forms.Label() Me.txtAnzahlPos = New System.Windows.Forms.TextBox() Me.Label14 = New System.Windows.Forms.Label() @@ -131,8 +133,8 @@ Partial Class frmGesamtsicherheitenNEU Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -147,7 +149,6 @@ Partial Class frmGesamtsicherheitenNEU Me.btnUpdateSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStripGesSicherh.SuspendLayout() Me.Panel2.SuspendLayout() Me.pnlChangeATCNr.SuspendLayout() @@ -180,6 +181,12 @@ Partial Class frmGesamtsicherheitenNEU Me.MRNNRÄndernToolStripMenuItem.Size = New System.Drawing.Size(200, 22) Me.MRNNRÄndernToolStripMenuItem.Text = "MRN-NR ändern" ' + 'LöschenToolStripMenuItem + ' + Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem" + Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(200, 22) + Me.LöschenToolStripMenuItem.Text = "löschen" + ' 'Panel2 ' Me.Panel2.Controls.Add(Me.pnlChangeATCNr) @@ -191,7 +198,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 287) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1684, 489) + Me.Panel2.Size = New System.Drawing.Size(1774, 489) Me.Panel2.TabIndex = 1 ' 'pnlChangeATCNr @@ -466,7 +473,7 @@ Partial Class frmGesamtsicherheitenNEU Me.pnlSummeGes.Dock = System.Windows.Forms.DockStyle.Bottom Me.pnlSummeGes.Location = New System.Drawing.Point(0, 457) Me.pnlSummeGes.Name = "pnlSummeGes" - Me.pnlSummeGes.Size = New System.Drawing.Size(1684, 32) + Me.pnlSummeGes.Size = New System.Drawing.Size(1774, 32) Me.pnlSummeGes.TabIndex = 3 ' 'Label28 @@ -551,7 +558,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblGestellungNr.AutoSize = True Me.lblGestellungNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblGestellungNr.ForeColor = System.Drawing.Color.Honeydew - Me.lblGestellungNr.Location = New System.Drawing.Point(312, 7) + Me.lblGestellungNr.Location = New System.Drawing.Point(402, 7) Me.lblGestellungNr.Name = "lblGestellungNr" Me.lblGestellungNr.Size = New System.Drawing.Size(177, 24) Me.lblGestellungNr.TabIndex = 1 @@ -559,8 +566,9 @@ Partial Class frmGesamtsicherheitenNEU ' 'txtPosTime ' + Me.txtPosTime.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPosTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPosTime.Location = New System.Drawing.Point(1282, 200) + Me.txtPosTime.Location = New System.Drawing.Point(1411, 200) Me.txtPosTime.Margin = New System.Windows.Forms.Padding(0) Me.txtPosTime.Name = "txtPosTime" Me.txtPosTime.Size = New System.Drawing.Size(55, 24) @@ -577,9 +585,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'txtPosSicherheitsbetrag ' + Me.txtPosSicherheitsbetrag.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPosSicherheitsbetrag.Enabled = False Me.txtPosSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1443, 200) + Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1572, 200) Me.txtPosSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0) Me.txtPosSicherheitsbetrag.Name = "txtPosSicherheitsbetrag" Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(104, 24) @@ -587,8 +596,9 @@ Partial Class frmGesamtsicherheitenNEU ' 'txtPosWarenwert ' + Me.txtPosWarenwert.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPosWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPosWarenwert.Location = New System.Drawing.Point(1340, 200) + Me.txtPosWarenwert.Location = New System.Drawing.Point(1469, 200) Me.txtPosWarenwert.Margin = New System.Windows.Forms.Padding(0) Me.txtPosWarenwert.Name = "txtPosWarenwert" Me.txtPosWarenwert.Size = New System.Drawing.Size(100, 24) @@ -596,9 +606,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'txtPositionenCRN ' + Me.txtPositionenCRN.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPositionenCRN.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper Me.txtPositionenCRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPositionenCRN.Location = New System.Drawing.Point(964, 200) + Me.txtPositionenCRN.Location = New System.Drawing.Point(1093, 200) Me.txtPositionenCRN.Margin = New System.Windows.Forms.Padding(0) Me.txtPositionenCRN.Name = "txtPositionenCRN" Me.txtPositionenCRN.Size = New System.Drawing.Size(203, 24) @@ -639,7 +650,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblZollsatz.AutoSize = True Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew - Me.lblZollsatz.Location = New System.Drawing.Point(1252, 137) + Me.lblZollsatz.Location = New System.Drawing.Point(1471, 137) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 7 @@ -651,7 +662,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblReferenzwert.AutoSize = True Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew - Me.lblReferenzwert.Location = New System.Drawing.Point(1252, 121) + Me.lblReferenzwert.Location = New System.Drawing.Point(1342, 121) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 6 @@ -663,7 +674,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblSaldo.AutoSize = True Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew - Me.lblSaldo.Location = New System.Drawing.Point(1439, 105) + Me.lblSaldo.Location = New System.Drawing.Point(1529, 105) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(147, 24) Me.lblSaldo.TabIndex = 5 @@ -732,7 +743,7 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Location = New System.Drawing.Point(0, 0) Me.panOben.Margin = New System.Windows.Forms.Padding(0) Me.panOben.Name = "panOben" - Me.panOben.Size = New System.Drawing.Size(1684, 287) + Me.panOben.Size = New System.Drawing.Size(1774, 287) Me.panOben.TabIndex = 0 ' 'Label31 @@ -787,10 +798,11 @@ Partial Class frmGesamtsicherheitenNEU ' 'dtpPosDat ' + Me.dtpPosDat.Anchor = System.Windows.Forms.AnchorStyles.Right Me.dtpPosDat.CustomFormat = "''" Me.dtpPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dtpPosDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpPosDat.Location = New System.Drawing.Point(1171, 200) + Me.dtpPosDat.Location = New System.Drawing.Point(1300, 200) Me.dtpPosDat.Margin = New System.Windows.Forms.Padding(0) Me.dtpPosDat.Name = "dtpPosDat" Me.dtpPosDat.RightToLeft = System.Windows.Forms.RightToLeft.No @@ -803,7 +815,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lbloffenerWarenwert.AutoSize = True Me.lbloffenerWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lbloffenerWarenwert.ForeColor = System.Drawing.Color.Red - Me.lbloffenerWarenwert.Location = New System.Drawing.Point(393, 109) + Me.lbloffenerWarenwert.Location = New System.Drawing.Point(483, 109) Me.lbloffenerWarenwert.Name = "lbloffenerWarenwert" Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24) Me.lbloffenerWarenwert.TabIndex = 51 @@ -827,7 +839,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblId.AutoSize = True Me.lblId.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblId.ForeColor = System.Drawing.Color.Honeydew - Me.lblId.Location = New System.Drawing.Point(1529, 7) + Me.lblId.Location = New System.Drawing.Point(1619, 7) Me.lblId.Name = "lblId" Me.lblId.Size = New System.Drawing.Size(29, 24) Me.lblId.TabIndex = 0 @@ -835,59 +847,34 @@ Partial Class frmGesamtsicherheitenNEU ' 'cbxZollsatzueberschreiben ' + Me.cbxZollsatzueberschreiben.Anchor = System.Windows.Forms.AnchorStyles.Right Me.cbxZollsatzueberschreiben.AutoSize = True Me.cbxZollsatzueberschreiben.ForeColor = System.Drawing.Color.White - Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(974, 154) + Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(1103, 154) Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben" Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17) Me.cbxZollsatzueberschreiben.TabIndex = 9 Me.cbxZollsatzueberschreiben.Text = "Zollsatz überschreiben" Me.cbxZollsatzueberschreiben.UseVisualStyleBackColor = True ' - 'btnNext - ' - Me.btnNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnNext.BackColor = System.Drawing.Color.White - Me.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnNext.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnNext.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnNext.Location = New System.Drawing.Point(1628, 37) - Me.btnNext.Name = "btnNext" - Me.btnNext.Size = New System.Drawing.Size(50, 25) - Me.btnNext.TabIndex = 8 - Me.btnNext.Text = ">>" - Me.btnNext.UseVisualStyleBackColor = False - ' 'lbloffenerSaldo ' Me.lbloffenerSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right Me.lbloffenerSaldo.AutoSize = True Me.lbloffenerSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lbloffenerSaldo.ForeColor = System.Drawing.Color.Red - Me.lbloffenerSaldo.Location = New System.Drawing.Point(393, 137) + Me.lbloffenerSaldo.Location = New System.Drawing.Point(483, 137) Me.lbloffenerSaldo.Name = "lbloffenerSaldo" Me.lbloffenerSaldo.Size = New System.Drawing.Size(253, 24) Me.lbloffenerSaldo.TabIndex = 4 Me.lbloffenerSaldo.Text = "offener Sicherheitswert: €" ' - 'btnPrev - ' - Me.btnPrev.BackColor = System.Drawing.Color.White - Me.btnPrev.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPrev.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnPrev.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnPrev.Location = New System.Drawing.Point(9, 40) - Me.btnPrev.Name = "btnPrev" - Me.btnPrev.Size = New System.Drawing.Size(50, 22) - Me.btnPrev.TabIndex = 3 - Me.btnPrev.Text = "<<" - Me.btnPrev.UseVisualStyleBackColor = False - ' 'Label20 ' + Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label20.AutoSize = True Me.Label20.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label20.Location = New System.Drawing.Point(1176, 233) + Me.Label20.Location = New System.Drawing.Point(1305, 233) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(25, 13) Me.Label20.TabIndex = 42 @@ -895,9 +882,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'txtPosNr ' + Me.txtPosNr.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPosNr.Enabled = False Me.txtPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPosNr.Location = New System.Drawing.Point(1179, 246) + Me.txtPosNr.Location = New System.Drawing.Point(1308, 246) Me.txtPosNr.Margin = New System.Windows.Forms.Padding(0) Me.txtPosNr.Name = "txtPosNr" Me.txtPosNr.Size = New System.Drawing.Size(37, 24) @@ -908,6 +896,8 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.Panel1.Controls.Add(Me.cbxHeader) + Me.Panel1.Controls.Add(Me.btnDAKOSY_AUTO) Me.Panel1.Controls.Add(Me.cbxRundPosanzeigen) Me.Panel1.Controls.Add(Me.btnRundungsdifAusgl) Me.Panel1.Controls.Add(Me.btnNew) @@ -918,9 +908,28 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Controls.Add(Me.btnNext) Me.Panel1.Location = New System.Drawing.Point(3, 34) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1681, 65) + Me.Panel1.Size = New System.Drawing.Size(1771, 65) Me.Panel1.TabIndex = 2 ' + 'cbxHeader + ' + Me.cbxHeader.AutoSize = True + Me.cbxHeader.Location = New System.Drawing.Point(135, 2) + Me.cbxHeader.Name = "cbxHeader" + Me.cbxHeader.Size = New System.Drawing.Size(103, 17) + Me.cbxHeader.TabIndex = 54 + Me.cbxHeader.Text = "DAKOSY HEAD" + Me.cbxHeader.UseVisualStyleBackColor = True + ' + 'btnDAKOSY_AUTO + ' + Me.btnDAKOSY_AUTO.Location = New System.Drawing.Point(1325, 4) + Me.btnDAKOSY_AUTO.Name = "btnDAKOSY_AUTO" + Me.btnDAKOSY_AUTO.Size = New System.Drawing.Size(122, 42) + Me.btnDAKOSY_AUTO.TabIndex = 53 + Me.btnDAKOSY_AUTO.Text = "DAKOSY AUTO" + Me.btnDAKOSY_AUTO.UseVisualStyleBackColor = True + ' 'cbxRundPosanzeigen ' Me.cbxRundPosanzeigen.AutoSize = True @@ -962,7 +971,7 @@ Partial Class frmGesamtsicherheitenNEU 'txtSuche ' Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSuche.Location = New System.Drawing.Point(255, 3) + Me.txtSuche.Location = New System.Drawing.Point(323, 3) Me.txtSuche.Margin = New System.Windows.Forms.Padding(0) Me.txtSuche.Name = "txtSuche" Me.txtSuche.Size = New System.Drawing.Size(243, 24) @@ -972,12 +981,39 @@ Partial Class frmGesamtsicherheitenNEU ' Me.Label21.AutoSize = True Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(205, 3) + Me.Label21.Location = New System.Drawing.Point(273, 3) Me.Label21.Name = "Label21" Me.Label21.Size = New System.Drawing.Size(47, 13) Me.Label21.TabIndex = 1 Me.Label21.Text = "Suche:" ' + 'btnPrev + ' + Me.btnPrev.BackColor = System.Drawing.Color.White + Me.btnPrev.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPrev.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnPrev.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnPrev.Location = New System.Drawing.Point(9, 40) + Me.btnPrev.Name = "btnPrev" + Me.btnPrev.Size = New System.Drawing.Size(50, 22) + Me.btnPrev.TabIndex = 3 + Me.btnPrev.Text = "<<" + Me.btnPrev.UseVisualStyleBackColor = False + ' + 'btnNext + ' + Me.btnNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnNext.BackColor = System.Drawing.Color.White + Me.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNext.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnNext.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNext.Location = New System.Drawing.Point(1718, 37) + Me.btnNext.Name = "btnNext" + Me.btnNext.Size = New System.Drawing.Size(50, 25) + Me.btnNext.TabIndex = 8 + Me.btnNext.Text = ">>" + Me.btnNext.UseVisualStyleBackColor = False + ' 'Label15 ' Me.Label15.AutoSize = True @@ -1040,9 +1076,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Label7 ' + Me.Label7.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label7.AutoSize = True Me.Label7.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label7.Location = New System.Drawing.Point(1279, 229) + Me.Label7.Location = New System.Drawing.Point(1408, 229) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(41, 13) Me.Label7.TabIndex = 43 @@ -1050,9 +1087,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Label8 ' + Me.Label8.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label8.AutoSize = True Me.Label8.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label8.Location = New System.Drawing.Point(1341, 187) + Me.Label8.Location = New System.Drawing.Point(1470, 187) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(59, 13) Me.Label8.TabIndex = 22 @@ -1060,9 +1098,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Label9 ' + Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label9.AutoSize = True Me.Label9.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label9.Location = New System.Drawing.Point(1444, 187) + Me.Label9.Location = New System.Drawing.Point(1573, 187) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(89, 13) Me.Label9.TabIndex = 23 @@ -1070,9 +1109,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Label10 ' + Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label10.AutoSize = True Me.Label10.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label10.Location = New System.Drawing.Point(1280, 187) + Me.Label10.Location = New System.Drawing.Point(1409, 187) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(40, 13) Me.Label10.TabIndex = 21 @@ -1080,9 +1120,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Label11 ' + Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label11.AutoSize = True Me.Label11.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label11.Location = New System.Drawing.Point(1171, 187) + Me.Label11.Location = New System.Drawing.Point(1300, 187) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(38, 13) Me.Label11.TabIndex = 20 @@ -1090,9 +1131,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Label12 ' + Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label12.AutoSize = True Me.Label12.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.Label12.Location = New System.Drawing.Point(1023, 187) + Me.Label12.Location = New System.Drawing.Point(1152, 187) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(77, 13) Me.Label12.TabIndex = 19 @@ -1160,8 +1202,9 @@ Partial Class frmGesamtsicherheitenNEU ' 'txtPosFreitext ' + Me.txtPosFreitext.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPosFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPosFreitext.Location = New System.Drawing.Point(1282, 242) + Me.txtPosFreitext.Location = New System.Drawing.Point(1411, 242) Me.txtPosFreitext.Margin = New System.Windows.Forms.Padding(0) Me.txtPosFreitext.Name = "txtPosFreitext" Me.txtPosFreitext.Size = New System.Drawing.Size(264, 24) @@ -1350,45 +1393,6 @@ Partial Class frmGesamtsicherheitenNEU Me.dgvGesamtsicherheit.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvGesamtsicherheit.AllowUserToAddRows = False Me.dgvGesamtsicherheit.AllowUserToDeleteRows = False - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - 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.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 - Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStripGesSicherh - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle6 - Me.dgvGesamtsicherheit.Dock = System.Windows.Forms.DockStyle.Left - Me.dgvGesamtsicherheit.Location = New System.Drawing.Point(0, 0) - Me.dgvGesamtsicherheit.Name = "dgvGesamtsicherheit" - Me.dgvGesamtsicherheit.ReadOnly = True - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(922, 457) - Me.dgvGesamtsicherheit.TabIndex = 0 - ' - 'dgvSicherheitsPos - ' - Me.dgvSicherheitsPos.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvSicherheitsPos.AllowUserToAddRows = False - Me.dgvSicherheitsPos.AllowUserToDeleteRows = False DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1396,9 +1400,9 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvSicherheitsPos.ContextMenuStrip = Me.ContextMenuStripPosSicherheiten + Me.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStripGesSicherh DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1406,13 +1410,52 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle2 + Me.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle2 + Me.dgvGesamtsicherheit.Dock = System.Windows.Forms.DockStyle.Left + Me.dgvGesamtsicherheit.Location = New System.Drawing.Point(0, 0) + Me.dgvGesamtsicherheit.Name = "dgvGesamtsicherheit" + Me.dgvGesamtsicherheit.ReadOnly = True + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(998, 457) + Me.dgvGesamtsicherheit.TabIndex = 0 + ' + 'dgvSicherheitsPos + ' + Me.dgvSicherheitsPos.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvSicherheitsPos.AllowUserToAddRows = False + Me.dgvSicherheitsPos.AllowUserToDeleteRows = False + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvSicherheitsPos.ContextMenuStrip = Me.ContextMenuStripPosSicherheiten + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvSicherheitsPos.Dock = System.Windows.Forms.DockStyle.Right - Me.dgvSicherheitsPos.Location = New System.Drawing.Point(928, 0) + Me.dgvSicherheitsPos.Location = New System.Drawing.Point(1004, 0) Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos" Me.dgvSicherheitsPos.ReadOnly = True Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSicherheitsPos.Size = New System.Drawing.Size(756, 457) + Me.dgvSicherheitsPos.Size = New System.Drawing.Size(770, 457) Me.dgvSicherheitsPos.TabIndex = 1 ' 'txtPosSicherheitsbGes @@ -1551,9 +1594,10 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosDat._value = "" Me.txtPosDat._Waehrung = False Me.txtPosDat._WaehrungZeichen = True + Me.txtPosDat.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtPosDat.ForeColor = System.Drawing.Color.Black - Me.txtPosDat.Location = New System.Drawing.Point(1169, 200) + Me.txtPosDat.Location = New System.Drawing.Point(1298, 200) Me.txtPosDat.MaxLength = 10 Me.txtPosDat.MaxLineLength = -1 Me.txtPosDat.MaxLines_Warning = "" @@ -1592,9 +1636,10 @@ Partial Class frmGesamtsicherheitenNEU Me.txtZollsatzueberschreiben._value = "" Me.txtZollsatzueberschreiben._Waehrung = False Me.txtZollsatzueberschreiben._WaehrungZeichen = True + Me.txtZollsatzueberschreiben.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtZollsatzueberschreiben.Enabled = False Me.txtZollsatzueberschreiben.ForeColor = System.Drawing.Color.Black - Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(1112, 152) + Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(1241, 152) Me.txtZollsatzueberschreiben.MaxLineLength = -1 Me.txtZollsatzueberschreiben.MaxLines_Warning = "" Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing @@ -1605,13 +1650,14 @@ Partial Class frmGesamtsicherheitenNEU 'btnDeletePos ' Me.btnDeletePos.allowBorder = False + Me.btnDeletePos.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnDeletePos.BackColor = System.Drawing.Color.White Me.btnDeletePos.BackgroundImage = CType(resources.GetObject("btnDeletePos.BackgroundImage"), System.Drawing.Image) Me.btnDeletePos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.btnDeletePos.FlatAppearance.BorderSize = 0 Me.btnDeletePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDeletePos.ForeColor = System.Drawing.Color.Black - Me.btnDeletePos.Location = New System.Drawing.Point(1561, 160) + Me.btnDeletePos.Location = New System.Drawing.Point(1690, 160) Me.btnDeletePos.Name = "btnDeletePos" Me.btnDeletePos.Size = New System.Drawing.Size(24, 24) Me.btnDeletePos.TabIndex = 24 @@ -1637,13 +1683,14 @@ Partial Class frmGesamtsicherheitenNEU 'btnUpdatePos ' Me.btnUpdatePos.allowBorder = False + Me.btnUpdatePos.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnUpdatePos.BackColor = System.Drawing.Color.White Me.btnUpdatePos.BackgroundImage = CType(resources.GetObject("btnUpdatePos.BackgroundImage"), System.Drawing.Image) Me.btnUpdatePos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.btnUpdatePos.FlatAppearance.BorderSize = 0 Me.btnUpdatePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnUpdatePos.ForeColor = System.Drawing.Color.Black - Me.btnUpdatePos.Location = New System.Drawing.Point(1561, 241) + Me.btnUpdatePos.Location = New System.Drawing.Point(1690, 241) Me.btnUpdatePos.Name = "btnUpdatePos" Me.btnUpdatePos.Size = New System.Drawing.Size(24, 24) Me.btnUpdatePos.TabIndex = 49 @@ -1669,13 +1716,14 @@ Partial Class frmGesamtsicherheitenNEU 'btnAddPos ' Me.btnAddPos.allowBorder = False + Me.btnAddPos.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnAddPos.BackColor = System.Drawing.Color.White Me.btnAddPos.BackgroundImage = CType(resources.GetObject("btnAddPos.BackgroundImage"), System.Drawing.Image) Me.btnAddPos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.btnAddPos.FlatAppearance.BorderSize = 0 Me.btnAddPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAddPos.ForeColor = System.Drawing.Color.Black - Me.btnAddPos.Location = New System.Drawing.Point(1561, 199) + Me.btnAddPos.Location = New System.Drawing.Point(1690, 199) Me.btnAddPos.Name = "btnAddPos" Me.btnAddPos.Size = New System.Drawing.Size(24, 24) Me.btnAddPos.TabIndex = 39 @@ -1696,21 +1744,14 @@ Partial Class frmGesamtsicherheitenNEU Me.btnAddSicherheit.TabIndex = 36 Me.btnAddSicherheit.UseVisualStyleBackColor = False ' - 'LöschenToolStripMenuItem - ' - Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem" - Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(200, 22) - Me.LöschenToolStripMenuItem.Text = "löschen" - ' 'frmGesamtsicherheitenNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1684, 776) + Me.ClientSize = New System.Drawing.Size(1774, 776) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.panOben) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MaximumSize = New System.Drawing.Size(1700, 815) Me.MinimumSize = New System.Drawing.Size(1438, 815) Me.Name = "frmGesamtsicherheitenNEU" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -1855,4 +1896,6 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents txtSPosNr As TextBox Friend WithEvents Label31 As Label Friend WithEvents LöschenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btnDAKOSY_AUTO As Button + Friend WithEvents cbxHeader As CheckBox End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.resx b/Aviso/frmGesamtsicherheitenNEU.resx index 0fbc19e..208d609 100644 --- a/Aviso/frmGesamtsicherheitenNEU.resx +++ b/Aviso/frmGesamtsicherheitenNEU.resx @@ -120,10 +120,52 @@ 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g + RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4 + HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e + 4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q + VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI + bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG + 8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4 + 77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII + TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g + RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4 + HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e + 4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q + VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI + bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG + 8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4 + 77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII + TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g + RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4 + HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e + 4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q + VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI + bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG + 8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4 + 77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII + TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC + + 268, 15 - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -199,7 +241,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow @@ -256,7 +298,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAYBJREFUOE9jYKAAyLnI + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow @@ -280,48 +322,6 @@ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO zULyAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g - RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4 - HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e - 4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q - VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI - bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG - 8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4 - 77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII - TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g - RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4 - HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e - 4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q - VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI - bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG - 8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4 - 77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII - TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g - RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4 - HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e - 4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q - VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI - bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG - 8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4 - 77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII - TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index e627229..2325ee4 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -1,5 +1,4 @@ -Imports GrapeCity.Enterprise.Data.Expressions.Tools -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class frmGesamtsicherheitenNEU @@ -52,6 +51,8 @@ Public Class frmGesamtsicherheitenNEU Public warenortPrefix As String = "" + Public DAKOSY_AUTO As Boolean = False + Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -127,6 +128,9 @@ Public Class frmGesamtsicherheitenNEU changeLabel() + btnDAKOSY_AUTO.Enabled = Not DAKOSY_AUTO + + Me.Text = "Gesamtsicherheit " & Standort frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos) @@ -144,9 +148,10 @@ Public Class frmGesamtsicherheitenNEU If withFilterParam = True Then If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')" If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0" + If Not cbxHeader.Checked Then sqlSearchSting &= "AND gs_posNr <> 0 " End If - Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" + Dim SQLStringSicherheit As String = "select [gs_gsId],[gs_dakoyimport] ,[gs_gsnr], [gs_ATBNr],[gs_posNr],[gs_MRNNr], [gs_posSubNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " ,[gs_EH_Anzahl], [gs_gewicht] , [gs_freitext], [gs_DK_laufnr] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,) dgvGesamtsicherheit.LOAD() @@ -157,6 +162,13 @@ Public Class frmGesamtsicherheitenNEU .RowHeadersWidth = 10 .Columns("gs_gsId").Visible = False .Columns("gs_gsnr").Visible = False + .Columns("gs_dakoyimport").Visible = False + If Not cbxHeader.Checked Then + .Columns("gs_DK_laufnr").Visible = False + Else + .Columns("gs_DK_laufnr").Visible = True + End If + .Columns("gs_warenwert").DefaultCellStyle.Format = "c" .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c" .Columns("gs_saldo").DefaultCellStyle.Format = "c" @@ -196,6 +208,17 @@ Public Class frmGesamtsicherheitenNEU .Columns("gs_datum").HeaderText = "Datum" .Columns("gs_warenwert").Width = 85 .Columns("gs_warenwert").HeaderText = "Warenwert" + .Columns("gs_EH_Anzahl").HeaderText = "Anz." + .Columns("gs_EH_Anzahl").Width = 50 + .Columns("gs_EH_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + + .Columns("gs_gewicht").HeaderText = "Gewicht" + .Columns("gs_gewicht").Width = 50 + .Columns("gs_gewicht").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + + .Columns("gs_DK_laufnr").HeaderText = "DK_ID." + .Columns("gs_DK_laufnr").Width = 40 + .Columns("gs_saldo").Width = 100 .Columns("gs_saldo").HeaderText = "Saldo" .Columns("gs_sicherheitsbetrag").Width = 85 @@ -217,6 +240,12 @@ Public Class frmGesamtsicherheitenNEU Me.dgvGesamtsicherheit.Rows(i).DefaultCellStyle.BackColor = Color.White End If + If dgvGesamtsicherheit.Rows(i).Cells("gs_dakoyimport").Value Then + btnDAKOSY_AUTO.Enabled = False + Else + btnDAKOSY_AUTO.Enabled = True + End If + Next @@ -426,7 +455,7 @@ Public Class frmGesamtsicherheitenNEU Next Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', gs_art, - [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" & + [gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" & IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am', gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") & "from [tblGesamtsicherheit] left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId @@ -437,7 +466,7 @@ Public Class frmGesamtsicherheitenNEU Dim SQLStringSicherheit_new As String = " select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', - [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" & + [gsp_MRNNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" & IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am', gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") & "From tblGesamtsicherheit Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 @@ -527,12 +556,13 @@ Public Class frmGesamtsicherheitenNEU sqlSearch &= "And gsp_gsid In (Select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" If txtSuche.Text <> "" Then sqlSearch &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')" If cbxRundPosanzeigen.Checked = False Then sqlSearch &= "AND ISNULL(gsp_isPosRundungsdiff,0) = 0" + If Not cbxHeader.Checked Then sqlSearch &= " AND gs_posNr <> 0 " sqlSearch &= ")" End If Dim SQLStringCRN As String = - "select [gsp_gspPosId],[gsp_ATCNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag], [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art] + "select [gsp_gspPosId],[gsp_ATCNr],[gsp_MRNNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag], [gsp_EH_Anzahl], [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art] "From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where [gsp_gsnr] = '" & gsNr & "'" & sqlSearch & " order by [gs_ATBNr], [gs_posNr]" dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,) @@ -545,38 +575,35 @@ Public Class frmGesamtsicherheitenNEU .Columns("gsp_gspPosId").HeaderText = "Pos#" .Columns("gsp_gsId").Visible = False .Columns("gsp_gsnr").Visible = False + .Columns("gsp_ATCNr").Visible = False .Columns("gsp_warenwert").DefaultCellStyle.Format = "c" .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c" Select Case currentGesSichRef.brgakto_gs_ATR Case True If Standort = "Verag GmbH" Then - .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN" + .Columns("gsp_MRNNr").HeaderText = "ATC. / MRN" ElseIf Standort = "VERAG AG" Then - .Columns("gsp_ATCNr").HeaderText = "T1 CRN" + .Columns("gsp_MRNNr").HeaderText = "T1 CRN" Else - .Columns("gsp_ATCNr").HeaderText = "EZA / T1 CRN" - End If - - Case Else - If Standort = "Verag GmbH" Then - .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN" - ElseIf Standort = "VERAG AG" Then - .Columns("gsp_ATCNr").HeaderText = "T1 CRN" - Else - .Columns("gsp_ATCNr").HeaderText = "EZA / T1 CRN" + .Columns("gsp_MRNNr").HeaderText = "EZA / T1 CRN" End If End Select - .Columns("gsp_ATCNr").Width = 140 + .Columns("gsp_MRNNr").Width = 140 .Columns("gsp_datum").Width = 100 .Columns("gsp_datum").HeaderText = "Datum" .Columns("gsp_warenwert").Width = 100 .Columns("gsp_warenwert").HeaderText = "Warenwert" .Columns("gsp_sicherheitsbetrag").Width = 85 .Columns("gsp_sicherheitsbetrag").HeaderText = "S-Betrag" + .Columns("gsp_EH_Anzahl").HeaderText = "Anz." + .Columns("gsp_EH_Anzahl").Width = 50 + .Columns("gsp_EH_Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns("gsp_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("gsp_freitext").HeaderText = "Freitext" + End With Dim changeColor = True @@ -954,7 +981,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text) .gsp_erstellungsdatum = DateTime.Now .gsp_ust = currentSicherheit.gs_ust - .gsp_ATCNr = txtPositionenCRN.Text + .gsp_MRNNr = txtPositionenCRN.Text .gsp_avisoId = Me.avisoID .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With @@ -980,7 +1007,7 @@ Public Class frmGesamtsicherheitenNEU Sub AfterButton() 'currentGesSichRef.CalcSaldo() lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N") - LoadDGVSicherheiten() + LoadDGVSicherheiten(True) EmptyTXT() End Sub @@ -1191,13 +1218,13 @@ Public Class frmGesamtsicherheitenNEU .gsp_freitext = txtPosFreitext.Text .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text) .gsp_warenwert = Double.Parse(txtPosWarenwert.Text) - .gsp_ATCNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing) + .gsp_MRNNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing) If txtPosDat.Text <> "" AndAlso txtPosTime.Text <> "" Then currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text) Else currentSPos.gsp_datum = Nothing - If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then + If .gsp_MRNNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!") Exit Sub End If @@ -1224,7 +1251,7 @@ Public Class frmGesamtsicherheitenNEU txtPosFreitext.Text = sPos.gsp_freitext txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag txtPosWarenwert.Text = sPos.gsp_warenwert - txtPositionenCRN.Text = CStr(sPos.gsp_ATCNr) + txtPositionenCRN.Text = CStr(sPos.gsp_MRNNr) Try If sPos.gsp_datum IsNot Nothing Then @@ -1653,7 +1680,7 @@ Public Class frmGesamtsicherheitenNEU End If - LoadDGVSicherheiten() + LoadDGVSicherheiten(True) End Sub Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnNext.Click @@ -1673,7 +1700,7 @@ Public Class frmGesamtsicherheitenNEU Me.gessicherheitID = Me.nextGessicherheitID End If - LoadDGVSicherheiten() + LoadDGVSicherheiten(True) End Sub Private Sub initPrevNextButtons() @@ -1722,48 +1749,57 @@ Public Class frmGesamtsicherheitenNEU End Sub Private Sub calcGesamtsummen() - txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String) - - txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String) - - Dim countSicherheitsbetrag As Double = 0 - Dim countWarenwert As Double = 0 - - For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1 - countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value) - countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value) + Try - Next + txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String) - txtSicherheitsbGes._value = countSicherheitsbetrag.ToString - txtWarenwertGes._value = countWarenwert.ToString + txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String) - Dim countSicherheitsbetragPos As Double = 0 - Dim countWarenwertPos As Double = 0 + Dim countSicherheitsbetrag As Double = 0 + Dim countWarenwert As Double = 0 - For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1 - - countSicherheitsbetragPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_sicherheitsbetrag").Value) - countWarenwertPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_warenwert").Value) - - Next - - txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString - txtPosWarenwertGes._value = countWarenwertPos.ToString - - lbloffenerWarenwert.Text = "offener Warenwert: €" - lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2) - - If (Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) < 0.1 AndAlso Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) <> 0) Then - btnRundungsdifAusgl.Enabled = True - rundungsdiff = Math.Round(countSicherheitsbetrag - countSicherheitsbetragPos, 2) - Else - btnRundungsdifAusgl.Enabled = False - End If + For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1 + countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value) + countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value) + + + Next + + txtSicherheitsbGes._value = countSicherheitsbetrag.ToString + txtWarenwertGes._value = countWarenwert.ToString + + Dim countSicherheitsbetragPos As Double = 0 + Dim countWarenwertPos As Double = 0 + + For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1 + + countSicherheitsbetragPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_sicherheitsbetrag").Value) + countWarenwertPos += CDbl(dgvSicherheitsPos.Rows(i).Cells("gsp_warenwert").Value) + + Next + + txtPosSicherheitsbGes._value = countSicherheitsbetragPos.ToString + txtPosWarenwertGes._value = countWarenwertPos.ToString + + lbloffenerWarenwert.Text = "offener Warenwert: €" + lbloffenerWarenwert.Text &= Math.Round(countWarenwert, 2) - Math.Round(countWarenwertPos, 2) + + If (Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) < 0.1 AndAlso Math.Abs(countSicherheitsbetrag - countSicherheitsbetragPos) <> 0) Then + btnRundungsdifAusgl.Enabled = True + rundungsdiff = Math.Round(countSicherheitsbetrag - countSicherheitsbetragPos, 2) + Else + btnRundungsdifAusgl.Enabled = False + End If + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub Private Sub rearangePosNr(gsNr As Integer, ATBNr As String, posNr As Integer) @@ -1862,7 +1898,7 @@ Public Class frmGesamtsicherheitenNEU Dim mutlitpleATCNr As Boolean = False Dim Warenwert As Double - ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_ATCNr").Value.ToString + ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_MRNNr").Value.ToString tempDatum = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("dd.MM.yyyy"), "") TempUhrzeit = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("HH:mm"), "") Warenwert = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value IsNot DBNull.Value, CDbl(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value), "") @@ -1871,7 +1907,7 @@ Public Class frmGesamtsicherheitenNEU If dgvSicherheitsPos.SelectedRows.Count > 0 Then For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows - If row.Cells("gsp_ATCNr").Value.ToString <> ATCNr Then + If row.Cells("gsp_MRNNr").Value.ToString <> ATCNr Then mutlitpleATCNr = True End If Next @@ -2008,7 +2044,7 @@ Public Class frmGesamtsicherheitenNEU End If End If - SicherhPos.gsp_ATCNr = txtATCaendern.Text + SicherhPos.gsp_MRNNr = txtATCaendern.Text SicherhPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtDatumaendern.Text, txtUhrzeitaendern.Text) SicherhPos.SAVE() Next @@ -2171,7 +2207,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_datum = DateTime.Now .gsp_erstellungsdatum = DateTime.Now .gsp_ust = currentSicherheit.gs_ust - .gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID + .gsp_MRNNr = "Korrekt. Rundungsdiff. " & gessicherheitID .gsp_isPosRundungsdiff = True .gsp_avisoId = Me.avisoID .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME @@ -2320,5 +2356,24 @@ Public Class frmGesamtsicherheitenNEU End If + End Sub + + Private Sub btnDAKOSY_AUTO_Click(sender As Object, e As EventArgs) Handles btnDAKOSY_AUTO.Click + If Me.gessicherheitID > 0 Then + Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_dakoyimport] = 1 WHERE [gs_gsNr] = " & Me.gessicherheitID + If SQL.doSQL(sqlstring, "AVISO") Then btnDAKOSY_AUTO.Enabled = False + End If + + End Sub + + Private Sub cbxHeader_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHeader.CheckedChanged + + LoadDGVSicherheiten(True) + + End Sub + + + Private Sub insertMRNNr() + End Sub End Class diff --git a/Aviso/usrCntlSND_ATBGestellung.vb b/Aviso/usrCntlSND_ATBGestellung.vb index de1a199..46e1739 100644 --- a/Aviso/usrCntlSND_ATBGestellung.vb +++ b/Aviso/usrCntlSND_ATBGestellung.vb @@ -14,6 +14,7 @@ Public Class usrCntlSND_ATBGestellung Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing Dim gsnr_global As Integer = -1 + Dim gsnr_proLKW_global As Integer = -1 Sub New(AVISO, SND) @@ -39,6 +40,11 @@ Public Class usrCntlSND_ATBGestellung SND = f.SENDUNG_LIST(f.CURRENT_INDEX) If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub + + If Not IsNumeric(SND.tblSnd_Warenwert) OrElse CInt(SND.tblSnd_Warenwert) < 0 Then MsgBox("Warenwert angeben!") : Exit Sub + + If (SND.tblSnd_WarenwertWaehrung) Is Nothing Then MsgBox("Währungseinheit angeben!") : Exit Sub + If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub If SND.tblSnd_T1_Frist IsNot Nothing AndAlso IsDate(SND.tblSnd_T1_Frist) Then @@ -103,7 +109,7 @@ Public Class usrCntlSND_ATBGestellung If MsgBox("Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert: " & SND.tblSnd_Warenwert & " (Sicherheitsbetrag: " & sicherheitsbertrag & ") übersteigt den vorhandenen Sicherheitssaldo von: " & saldo & vbNewLine & "Trotzdem fortfahren", vbYesNoCancel) <> vbYes Then Exit Sub End If - Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"), GesSichRef, Standort) + Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy"), GesSichRef, Standort, gsnr_proLKW_global) frMZA.Show() @@ -112,11 +118,11 @@ Public Class usrCntlSND_ATBGestellung initGesamtsicherheiten() ' initdgvZollAnmeldungen() End Sub - Else + Else MsgBox("Fehler beim Speichern. Ankunftsanzeige abgebrochen.") - End If - Me.Cursor = Cursors.Default - End Sub + End If + Me.Cursor = Cursors.Default + End Sub Private Sub btnGesSicherheit_Click(sender As Object, e As EventArgs) Handles btnGesSicherheit.Click @@ -139,7 +145,7 @@ Public Class usrCntlSND_ATBGestellung 'falls nicht gefunden, 2 Schritt -> Gestellung nach AVISO ID, oder Aberftigungsnr and FilialNr If gsnr = 0 Then - Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc" + Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) order by gs_datum desc" dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True) If dt.Rows.Count > 0 Then gsnr = dt.Rows(0).Item("gs_gsNr") @@ -275,12 +281,21 @@ Public Class usrCntlSND_ATBGestellung Private Sub initGesamtsicherheiten() Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim gsnr As Integer = 0 + Dim gsnr_proLKW As Integer = 0 Dim sqlWhere = "" Dim dt As New DataTable If SND.tblSnd_ATB_T1 IsNot Nothing Then txtATBT1.Text = SND.tblSnd_ATB_T1.ToString + If gsnr_proLKW = 0 Then + Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc" + dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True) + If dt.Rows.Count > 0 Then + gsnr_proLKW = dt.Rows(0).Item("gs_gsNr") + End If + End If + '1.Schritt -> Gestellung nach aktuellster ATB-NR If txtATBT1.Text <> "" Then Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where [gs_ATBNr] = '" & txtATBT1.Text & "' order by gs_datum desc" @@ -292,7 +307,7 @@ Public Class usrCntlSND_ATBGestellung 'falls nicht gefunden, 2 Schritt -> Gestellung nach AVISO ID, oder Aberftigungsnr and FilialNr If gsnr = 0 Then - Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or gs_avisoId = '" & SND.tblSnd_AvisoID & "' order by gs_datum desc" + Dim SQLString As String = "Select top (1) gs_gsNr from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) order by gs_datum desc" dt = SQL.loadDgvBySql(SQLString, "AVISO", 100, True) If dt.Rows.Count > 0 Then gsnr = dt.Rows(0).Item("gs_gsNr") @@ -300,15 +315,18 @@ Public Class usrCntlSND_ATBGestellung End If gsnr_global = gsnr + gsnr_proLKW_global = gsnr_proLKW - If gsnr_global > 0 Then - + If gsnr_global > 0 Then 'es gibt btnGesSicherheit.Enabled = True - Button1.Enabled = False Else btnGesSicherheit.Enabled = False - Button1.Enabled = True + End If + If gsnr_proLKW_global > 0 AndAlso gsnr_global < 1 OrElse gsnr_proLKW_global < 1 Then + Button1.Enabled = True + Else + Button1.Enabled = False End If End Sub @@ -322,37 +340,4 @@ Public Class usrCntlSND_ATBGestellung Process.Start(webAddress) End Sub - - 'Public Sub setValues() - ' txtATBT1.Text = If(NCTS_GA.nga_name, "") - ' txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "") - ' txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "") - ' txtT1VerzollungsadresseOrt.Text = If(NCTS_GA.nga_ort, "") - ' sbT1VerzollungsadresseLand.SET_VALUE(If(NCTS_GA.nga_land, "")) - - ' txtT1VerzollungsadresseAnspr.Text = If(NCTS_GA.nga_Ansprechpartner, "") - ' txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "") - ' txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "") - ' txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, "")) - - - ' lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-") - ' picDel.Visible = (NCTS_GA.nga_id > 0) - 'End Sub - - - 'Public Sub getValues() - ' NCTS_GA.nga_name = txtATBT1.Text - ' NCTS_GA.nga_strasse = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseStrasse.Text) - ' NCTS_GA.nga_plz = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadressePlz.Text) - ' NCTS_GA.nga_ort = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseOrt.Text) - ' NCTS_GA.nga_land = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(sbT1VerzollungsadresseLand._value) - - ' NCTS_GA.nga_Ansprechpartner = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseAnspr.Text) - ' NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text) - ' NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text) - ' NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value) - 'End Sub - - End Class