From 32ded84b4d822849c53f810c6303d9eed5ff8ced Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 28 Oct 2022 08:05:38 +0200 Subject: [PATCH 1/3] feature_gesamtsicherheiten --- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 183 ++++--- Aviso/frmGesamtsicherheitenMenuNEU.vb | 114 +++- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 127 ++++- Aviso/frmGesamtsicherheitenNEU.vb | 496 +++++++++++++----- Aviso/frmHauptfenster.vb | 2 +- 5 files changed, 677 insertions(+), 245 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 8e8b12a..39b72f3 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -53,7 +53,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label3 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtSuchbegriff = New System.Windows.Forms.TextBox() Me.chkOffen = New System.Windows.Forms.CheckBox() Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -62,6 +62,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblReferenzwert = New System.Windows.Forms.Label() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -77,12 +78,13 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.Location = New System.Drawing.Point(0, 313) Me.dgvListe.Name = "dgvListe" Me.dgvListe.ReadOnly = True - Me.dgvListe.Size = New System.Drawing.Size(502, 408) + Me.dgvListe.Size = New System.Drawing.Size(576, 408) Me.dgvListe.TabIndex = 1 ' '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.btnOpenOver85Days) Me.Panel1.Controls.Add(Me.txtDatBis) Me.Panel1.Controls.Add(Me.Label26) Me.Panel1.Controls.Add(Me.btnBisTag) @@ -110,7 +112,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Panel1.Controls.Add(Me.Label3) Me.Panel1.Controls.Add(Me.Label2) Me.Panel1.Controls.Add(Me.Label1) - Me.Panel1.Controls.Add(Me.FlatButton1) + Me.Panel1.Controls.Add(Me.btnResetFilter) Me.Panel1.Controls.Add(Me.txtSuchbegriff) Me.Panel1.Controls.Add(Me.chkOffen) Me.Panel1.Controls.Add(Me.btnNeu) @@ -120,7 +122,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(502, 313) + Me.Panel1.Size = New System.Drawing.Size(576, 313) Me.Panel1.TabIndex = 0 ' 'txtDatBis @@ -140,24 +142,24 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtDatBis.Enabled = False Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtDatBis.ForeColor = System.Drawing.Color.Black - Me.txtDatBis.Location = New System.Drawing.Point(51, 170) + Me.txtDatBis.Location = New System.Drawing.Point(62, 170) Me.txtDatBis.MaxLength = 10 Me.txtDatBis.MaxLineLength = -1 Me.txtDatBis.MaxLines_Warning = "" Me.txtDatBis.MaxLines_Warning_Label = Nothing Me.txtDatBis.Name = "txtDatBis" Me.txtDatBis.Size = New System.Drawing.Size(63, 20) - Me.txtDatBis.TabIndex = 52 + Me.txtDatBis.TabIndex = 21 ' 'Label26 ' Me.Label26.AutoSize = True Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label26.ForeColor = System.Drawing.Color.White - Me.Label26.Location = New System.Drawing.Point(22, 120) + Me.Label26.Location = New System.Drawing.Point(33, 120) Me.Label26.Name = "Label26" Me.Label26.Size = New System.Drawing.Size(43, 13) - Me.Label26.TabIndex = 51 + Me.Label26.TabIndex = 10 Me.Label26.Text = "Datum" ' 'btnBisTag @@ -167,11 +169,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnBisTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnBisTag.ForeColor = System.Drawing.Color.Black Me.btnBisTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisTag.Location = New System.Drawing.Point(282, 115) + Me.btnBisTag.Location = New System.Drawing.Point(311, 120) Me.btnBisTag.Margin = New System.Windows.Forms.Padding(0) Me.btnBisTag.Name = "btnBisTag" Me.btnBisTag.Size = New System.Drawing.Size(34, 23) - Me.btnBisTag.TabIndex = 43 + Me.btnBisTag.TabIndex = 13 Me.btnBisTag.Text = ">>" Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnBisTag.UseVisualStyleBackColor = False @@ -183,11 +185,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnVonTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnVonTag.ForeColor = System.Drawing.Color.Black Me.btnVonTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonTag.Location = New System.Drawing.Point(163, 115) + Me.btnVonTag.Location = New System.Drawing.Point(192, 120) Me.btnVonTag.Margin = New System.Windows.Forms.Padding(0) Me.btnVonTag.Name = "btnVonTag" Me.btnVonTag.Size = New System.Drawing.Size(34, 23) - Me.btnVonTag.TabIndex = 41 + Me.btnVonTag.TabIndex = 11 Me.btnVonTag.Text = "<<" Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonTag.UseVisualStyleBackColor = False @@ -199,11 +201,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnTag.ForeColor = System.Drawing.Color.Black Me.btnTag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTag.Location = New System.Drawing.Point(196, 115) + Me.btnTag.Location = New System.Drawing.Point(225, 120) Me.btnTag.Margin = New System.Windows.Forms.Padding(0) Me.btnTag.Name = "btnTag" Me.btnTag.Size = New System.Drawing.Size(87, 23) - Me.btnTag.TabIndex = 42 + Me.btnTag.TabIndex = 12 Me.btnTag.Text = "Heute" Me.btnTag.UseVisualStyleBackColor = False ' @@ -223,23 +225,23 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtDatVon._WaehrungZeichen = True Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtDatVon.ForeColor = System.Drawing.Color.Black - Me.txtDatVon.Location = New System.Drawing.Point(51, 146) + Me.txtDatVon.Location = New System.Drawing.Point(62, 146) Me.txtDatVon.MaxLength = 10 Me.txtDatVon.MaxLineLength = -1 Me.txtDatVon.MaxLines_Warning = "" Me.txtDatVon.MaxLines_Warning_Label = Nothing Me.txtDatVon.Name = "txtDatVon" Me.txtDatVon.Size = New System.Drawing.Size(63, 20) - Me.txtDatVon.TabIndex = 37 + Me.txtDatVon.TabIndex = 16 ' 'Label24 ' Me.Label24.AutoSize = True Me.Label24.ForeColor = System.Drawing.Color.White - Me.Label24.Location = New System.Drawing.Point(22, 173) + Me.Label24.Location = New System.Drawing.Point(33, 173) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(23, 13) - Me.Label24.TabIndex = 40 + Me.Label24.TabIndex = 20 Me.Label24.Text = "bis:" ' 'btnJahr @@ -249,11 +251,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnJahr.ForeColor = System.Drawing.Color.Black Me.btnJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnJahr.Location = New System.Drawing.Point(196, 167) + Me.btnJahr.Location = New System.Drawing.Point(225, 172) Me.btnJahr.Margin = New System.Windows.Forms.Padding(0) Me.btnJahr.Name = "btnJahr" Me.btnJahr.Size = New System.Drawing.Size(87, 23) - Me.btnJahr.TabIndex = 49 + Me.btnJahr.TabIndex = 24 Me.btnJahr.Text = "2016" Me.btnJahr.UseVisualStyleBackColor = False ' @@ -264,11 +266,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnBisJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnBisJahr.ForeColor = System.Drawing.Color.Black Me.btnBisJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisJahr.Location = New System.Drawing.Point(282, 167) + Me.btnBisJahr.Location = New System.Drawing.Point(311, 172) Me.btnBisJahr.Margin = New System.Windows.Forms.Padding(0) Me.btnBisJahr.Name = "btnBisJahr" Me.btnBisJahr.Size = New System.Drawing.Size(34, 23) - Me.btnBisJahr.TabIndex = 50 + Me.btnBisJahr.TabIndex = 25 Me.btnBisJahr.Text = ">>" Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnBisJahr.UseVisualStyleBackColor = False @@ -280,11 +282,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnVonJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnVonJahr.ForeColor = System.Drawing.Color.Black Me.btnVonJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonJahr.Location = New System.Drawing.Point(163, 167) + Me.btnVonJahr.Location = New System.Drawing.Point(192, 172) Me.btnVonJahr.Margin = New System.Windows.Forms.Padding(0) Me.btnVonJahr.Name = "btnVonJahr" Me.btnVonJahr.Size = New System.Drawing.Size(34, 23) - Me.btnVonJahr.TabIndex = 48 + Me.btnVonJahr.TabIndex = 23 Me.btnVonJahr.Text = "<<" Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonJahr.UseVisualStyleBackColor = False @@ -296,11 +298,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnMonat.ForeColor = System.Drawing.Color.Black Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMonat.Location = New System.Drawing.Point(196, 141) + Me.btnMonat.Location = New System.Drawing.Point(225, 146) Me.btnMonat.Margin = New System.Windows.Forms.Padding(0) Me.btnMonat.Name = "btnMonat" Me.btnMonat.Size = New System.Drawing.Size(87, 23) - Me.btnMonat.TabIndex = 46 + Me.btnMonat.TabIndex = 18 Me.btnMonat.Text = "September" Me.btnMonat.UseVisualStyleBackColor = False ' @@ -311,11 +313,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnBisMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnBisMonat.ForeColor = System.Drawing.Color.Black Me.btnBisMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisMonat.Location = New System.Drawing.Point(282, 141) + Me.btnBisMonat.Location = New System.Drawing.Point(311, 146) Me.btnBisMonat.Margin = New System.Windows.Forms.Padding(0) Me.btnBisMonat.Name = "btnBisMonat" Me.btnBisMonat.Size = New System.Drawing.Size(34, 23) - Me.btnBisMonat.TabIndex = 47 + Me.btnBisMonat.TabIndex = 19 Me.btnBisMonat.Text = ">>" Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnBisMonat.UseVisualStyleBackColor = False @@ -327,11 +329,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnVonMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.btnVonMonat.ForeColor = System.Drawing.Color.Black Me.btnVonMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonMonat.Location = New System.Drawing.Point(163, 141) + Me.btnVonMonat.Location = New System.Drawing.Point(192, 146) Me.btnVonMonat.Margin = New System.Windows.Forms.Padding(0) Me.btnVonMonat.Name = "btnVonMonat" Me.btnVonMonat.Size = New System.Drawing.Size(34, 23) - Me.btnVonMonat.TabIndex = 45 + Me.btnVonMonat.TabIndex = 17 Me.btnVonMonat.Text = "<<" Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonMonat.UseVisualStyleBackColor = False @@ -340,33 +342,33 @@ Partial Class frmGesamtsicherheitenMenuNEU ' Me.DateTimePicker2.CustomFormat = "''" Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker2.Location = New System.Drawing.Point(51, 170) + Me.DateTimePicker2.Location = New System.Drawing.Point(62, 170) Me.DateTimePicker2.Margin = New System.Windows.Forms.Padding(0) Me.DateTimePicker2.Name = "DateTimePicker2" Me.DateTimePicker2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.DateTimePicker2.Size = New System.Drawing.Size(92, 20) - Me.DateTimePicker2.TabIndex = 39 + Me.DateTimePicker2.TabIndex = 22 ' 'Label25 ' Me.Label25.AutoSize = True Me.Label25.ForeColor = System.Drawing.Color.White - Me.Label25.Location = New System.Drawing.Point(22, 149) + Me.Label25.Location = New System.Drawing.Point(33, 149) Me.Label25.Name = "Label25" Me.Label25.Size = New System.Drawing.Size(28, 13) - Me.Label25.TabIndex = 44 + Me.Label25.TabIndex = 14 Me.Label25.Text = "von:" ' 'DateTimePicker1 ' Me.DateTimePicker1.CustomFormat = "''" Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker1.Location = New System.Drawing.Point(51, 145) + Me.DateTimePicker1.Location = New System.Drawing.Point(62, 145) Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0) Me.DateTimePicker1.Name = "DateTimePicker1" Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20) - Me.DateTimePicker1.TabIndex = 38 + Me.DateTimePicker1.TabIndex = 15 ' 'cbxWarenort ' @@ -375,10 +377,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.cbxWarenort._value = "" Me.cbxWarenort.Anchor = System.Windows.Forms.AnchorStyles.Right Me.cbxWarenort.FormattingEnabled = True - Me.cbxWarenort.Location = New System.Drawing.Point(112, 67) + Me.cbxWarenort.Location = New System.Drawing.Point(132, 69) Me.cbxWarenort.Name = "cbxWarenort" Me.cbxWarenort.Size = New System.Drawing.Size(81, 21) - Me.cbxWarenort.TabIndex = 17 + Me.cbxWarenort.TabIndex = 8 ' 'Label4 ' @@ -386,10 +388,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label4.ForeColor = System.Drawing.Color.Honeydew - Me.Label4.Location = New System.Drawing.Point(112, 49) + Me.Label4.Location = New System.Drawing.Point(132, 51) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(60, 15) - Me.Label4.TabIndex = 16 + Me.Label4.TabIndex = 5 Me.Label4.Text = "Warenort:" ' 'cbxStandort @@ -399,10 +401,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.cbxStandort._value = "" Me.cbxStandort.Anchor = System.Windows.Forms.AnchorStyles.Right Me.cbxStandort.FormattingEnabled = True - Me.cbxStandort.Location = New System.Drawing.Point(12, 67) + Me.cbxStandort.Location = New System.Drawing.Point(32, 69) Me.cbxStandort.Name = "cbxStandort" Me.cbxStandort.Size = New System.Drawing.Size(81, 21) - Me.cbxStandort.TabIndex = 15 + Me.cbxStandort.TabIndex = 7 ' 'lblFiliale ' @@ -410,10 +412,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblFiliale.AutoSize = True Me.lblFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.lblFiliale.ForeColor = System.Drawing.Color.Honeydew - Me.lblFiliale.Location = New System.Drawing.Point(12, 49) + Me.lblFiliale.Location = New System.Drawing.Point(32, 51) Me.lblFiliale.Name = "lblFiliale" Me.lblFiliale.Size = New System.Drawing.Size(43, 15) - Me.lblFiliale.TabIndex = 14 + Me.lblFiliale.TabIndex = 4 Me.lblFiliale.Text = "Filiale:" ' 'FlatButton2 @@ -424,10 +426,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.FlatButton2.FlatAppearance.BorderSize = 0 Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Location = New System.Drawing.Point(395, 281) + Me.FlatButton2.Location = New System.Drawing.Point(483, 193) Me.FlatButton2.Name = "FlatButton2" Me.FlatButton2.Size = New System.Drawing.Size(81, 20) - Me.FlatButton2.TabIndex = 10 + Me.FlatButton2.TabIndex = 34 Me.FlatButton2.Text = "jedes Datum" Me.FlatButton2.UseVisualStyleBackColor = False Me.FlatButton2.Visible = False @@ -440,10 +442,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnSucheStarten.FlatAppearance.BorderSize = 0 Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black - Me.btnSucheStarten.Location = New System.Drawing.Point(28, 269) + Me.btnSucheStarten.Location = New System.Drawing.Point(32, 281) Me.btnSucheStarten.Name = "btnSucheStarten" Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) - Me.btnSucheStarten.TabIndex = 11 + Me.btnSucheStarten.TabIndex = 32 Me.btnSucheStarten.Text = "Suche starten" Me.btnSucheStarten.UseVisualStyleBackColor = False ' @@ -463,13 +465,13 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtbis._WaehrungZeichen = True Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtbis.ForeColor = System.Drawing.Color.Black - Me.txtbis.Location = New System.Drawing.Point(395, 257) + Me.txtbis.Location = New System.Drawing.Point(483, 169) Me.txtbis.MaxLineLength = -1 Me.txtbis.MaxLines_Warning = "" Me.txtbis.MaxLines_Warning_Label = Nothing Me.txtbis.Name = "txtbis" Me.txtbis.Size = New System.Drawing.Size(81, 20) - Me.txtbis.TabIndex = 8 + Me.txtbis.TabIndex = 31 Me.txtbis.Visible = False ' 'txtVon @@ -488,13 +490,13 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtVon._WaehrungZeichen = True Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(295, 257) + Me.txtVon.Location = New System.Drawing.Point(480, 126) Me.txtVon.MaxLineLength = -1 Me.txtVon.MaxLines_Warning = "" Me.txtVon.MaxLines_Warning_Label = Nothing Me.txtVon.Name = "txtVon" Me.txtVon.Size = New System.Drawing.Size(81, 20) - Me.txtVon.TabIndex = 7 + Me.txtVon.TabIndex = 30 Me.txtVon.Visible = False ' 'Label3 @@ -503,10 +505,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label3.ForeColor = System.Drawing.Color.Honeydew - Me.Label3.Location = New System.Drawing.Point(392, 238) + Me.Label3.Location = New System.Drawing.Point(480, 150) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(24, 15) - Me.Label3.TabIndex = 5 + Me.Label3.TabIndex = 29 Me.Label3.Text = "Bis" Me.Label3.Visible = False ' @@ -516,10 +518,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label2.ForeColor = System.Drawing.Color.Honeydew - Me.Label2.Location = New System.Drawing.Point(295, 238) + Me.Label2.Location = New System.Drawing.Point(480, 107) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(28, 15) - Me.Label2.TabIndex = 4 + Me.Label2.TabIndex = 28 Me.Label2.Text = "Von" Me.Label2.Visible = False ' @@ -529,34 +531,34 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label1.ForeColor = System.Drawing.Color.Honeydew - Me.Label1.Location = New System.Drawing.Point(12, 8) + Me.Label1.Location = New System.Drawing.Point(32, 10) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(45, 15) Me.Label1.TabIndex = 0 Me.Label1.Text = "Suche:" ' - 'FlatButton1 + 'btnResetFilter ' - Me.FlatButton1.allowBorder = False - Me.FlatButton1.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.FlatButton1.BackColor = System.Drawing.Color.White - Me.FlatButton1.FlatAppearance.BorderSize = 0 - Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton1.ForeColor = System.Drawing.Color.Black - Me.FlatButton1.Image = Global.AVISO.My.Resources.Resources.refresh - Me.FlatButton1.Location = New System.Drawing.Point(233, 24) - Me.FlatButton1.Name = "FlatButton1" - Me.FlatButton1.Size = New System.Drawing.Size(32, 33) - Me.FlatButton1.TabIndex = 2 - Me.FlatButton1.UseVisualStyleBackColor = False + Me.btnResetFilter.allowBorder = False + Me.btnResetFilter.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.btnResetFilter.BackColor = System.Drawing.Color.White + Me.btnResetFilter.FlatAppearance.BorderSize = 0 + Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnResetFilter.ForeColor = System.Drawing.Color.Black + Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh + Me.btnResetFilter.Location = New System.Drawing.Point(249, 24) + Me.btnResetFilter.Name = "btnResetFilter" + Me.btnResetFilter.Size = New System.Drawing.Size(32, 33) + Me.btnResetFilter.TabIndex = 3 + Me.btnResetFilter.UseVisualStyleBackColor = False ' 'txtSuchbegriff ' Me.txtSuchbegriff.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.txtSuchbegriff.Location = New System.Drawing.Point(12, 26) + Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28) Me.txtSuchbegriff.Name = "txtSuchbegriff" Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20) - Me.txtSuchbegriff.TabIndex = 1 + Me.txtSuchbegriff.TabIndex = 2 ' 'chkOffen ' @@ -565,10 +567,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.chkOffen.Checked = True Me.chkOffen.CheckState = System.Windows.Forms.CheckState.Checked Me.chkOffen.ForeColor = System.Drawing.SystemColors.ButtonHighlight - Me.chkOffen.Location = New System.Drawing.Point(28, 221) + Me.chkOffen.Location = New System.Drawing.Point(35, 210) Me.chkOffen.Name = "chkOffen" Me.chkOffen.Size = New System.Drawing.Size(120, 17) - Me.chkOffen.TabIndex = 12 + Me.chkOffen.TabIndex = 26 Me.chkOffen.Text = "nur offene anzeigen" Me.chkOffen.UseVisualStyleBackColor = True ' @@ -580,10 +582,10 @@ 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(163, 269) + Me.btnNeu.Location = New System.Drawing.Point(492, 278) Me.btnNeu.Name = "btnNeu" Me.btnNeu.Size = New System.Drawing.Size(75, 23) - Me.btnNeu.TabIndex = 13 + Me.btnNeu.TabIndex = 33 Me.btnNeu.Text = "Neu" Me.btnNeu.UseVisualStyleBackColor = False ' @@ -593,10 +595,10 @@ 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.Honeydew - Me.lblSaldo.Location = New System.Drawing.Point(294, 23) + Me.lblSaldo.Location = New System.Drawing.Point(368, 23) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(147, 24) - Me.lblSaldo.TabIndex = 3 + Me.lblSaldo.TabIndex = 1 Me.lblSaldo.Text = "Saldo: €80.000" ' 'lblZollsatz @@ -605,7 +607,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(295, 85) + Me.lblZollsatz.Location = New System.Drawing.Point(369, 85) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 9 @@ -617,7 +619,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(295, 58) + Me.lblReferenzwert.Location = New System.Drawing.Point(369, 58) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 6 @@ -635,11 +637,27 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(132, 22) Me.ExportCSVToolStripMenuItem.Text = "Export CSV" ' + 'btnOpenOver85Days + ' + Me.btnOpenOver85Days.allowBorder = False + Me.btnOpenOver85Days.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White + Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 + Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black + Me.btnOpenOver85Days.Location = New System.Drawing.Point(36, 244) + Me.btnOpenOver85Days.Name = "btnOpenOver85Days" + Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) + Me.btnOpenOver85Days.TabIndex = 27 + Me.btnOpenOver85Days.Text = "Über 85 Tage offen" + Me.btnOpenOver85Days.UseVisualStyleBackColor = False + Me.btnOpenOver85Days.Visible = False + ' 'frmGesamtsicherheitenMenuNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(502, 721) + Me.ClientSize = New System.Drawing.Size(576, 721) Me.Controls.Add(Me.dgvListe) Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -664,7 +682,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents chkOffen As CheckBox Friend WithEvents txtSuchbegriff As TextBox - Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnResetFilter As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Label3 As Label Friend WithEvents Label2 As Label Friend WithEvents Label1 As Label @@ -694,4 +712,5 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents DateTimePicker2 As DateTimePicker Friend WithEvents Label25 As Label Friend WithEvents DateTimePicker1 As DateTimePicker + Friend WithEvents btnOpenOver85Days As VERAG_PROG_ALLGEMEIN.FlatButton End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 661d9b9..184acd6 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -1,29 +1,38 @@ Imports System.Reflection +Imports SDL Public Class frmGesamtsicherheitenMenuNEU Public SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz - Dim dt As DataTable + Public dt As DataTable Public Property Standort As String = "" + + Private Sub frmGesamtsicherheitenNEU_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load cbxStandort.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) cbxWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True) Me.Text = "Gesamtsicherheiten " & Standort frmHauptfenster.EnableDoubleBuffered(dgvListe) GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort) - 'GesSichRef.LOAD("standort", Standort) lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N") - 'txtDatVon._ShortDateOnly = True - 'txtDatBis._ShortDateOnly = True - txtDatVon.Text = Now.ToShortDateString 'CDate("01." & Now.ToString("MM.yyyy")).AddMonths(-1).ToShortDateString + txtDatVon.Text = Now.ToShortDateString txtDatBis.Text = Now.ToShortDateString btnMonat.Text = MONAT.ToString("MMMM") btnJahr.Text = JAHR.Year + If GesSichRef.gsr_ATR = True Then + Dim anzahlOffenerGSUeber85Tage As Integer = checkOpenATBs() + If anzahlOffenerGSUeber85Tage > 0 Then + btnOpenOver85Days.Visible = True + End If + End If + + + 'txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy") 'txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") @@ -33,17 +42,24 @@ Public Class frmGesamtsicherheitenMenuNEU Public Function LoadDGV() Dim sqladdon As String = "" - If chkOffen.Checked Then sqladdon &= " AND gs_Sicherheitssaldo != '0,00 €'" + If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'" If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'" If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'" 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, - max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(SUM( - Case - when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) - when gs_art = 'Close' then gs_sicherheitsbetrag - End) , 'C', 'de-DE')As gs_SicherheitsSaldo + max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT( + (Select SUM( Case + when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + when gs_art = 'Close' then gs_sicherheitsbetrag + End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr + ) + + + (Select SUM( Case + when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) + when gsp_art = 'Close' then gsp_sicherheitsbetrag + End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr + ) , 'C', 'de-DE') as gs_SicherheitsSaldo From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where gs_freitext like '%" & txtSuchbegriff.Text & "%' OR @@ -70,13 +86,37 @@ Public Class frmGesamtsicherheitenMenuNEU .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr." .Columns("gs_abfertigungsNr").Width = 107 .Columns("gs_datum").Width = 112 - .Columns("gs_SicherheitsSaldo").Width = 106 + .Columns("gs_datum").HeaderText = "Datum" + .Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("gs_SicherheitsSaldo").HeaderText = "Sicherheitssaldo" .Columns("gs_Warenort").Width = 96 .Columns("gs_Warenort").HeaderText = "Warenort" + .Columns("gs_LKWKZ").HeaderText = "LKW-KZ" End With + + + If dgvListe.Rows.Count = 0 Then Exit Function + + dt = New DataTable() + dt.Columns.Add("gs_gsnr", GetType(Integer)) + dt.Columns.Add("gs_isOpen", GetType(Boolean)) + + + + For Each row As DataGridViewRow In dgvListe.Rows + If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then + + dt.Rows.Add(row.Cells("gs_gsnr").Value, True) + Else + dt.Rows.Add(row.Cells("gs_gsnr").Value, False) + End If + Next + + For Each row As DataGridViewRow In dgvListe.Rows + If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then row.DefaultCellStyle.BackColor = Color.Red Else @@ -107,6 +147,7 @@ Public Class frmGesamtsicherheitenMenuNEU .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value + .dt = Me.dt End With AddHandler frm.FormClosing, Function() @@ -125,6 +166,7 @@ Public Class frmGesamtsicherheitenMenuNEU .Standort = Me.Standort .datum = Date.Now .Neu = True + .dt = Me.dt End With AddHandler frm.FormClosing, Function() GesSichRef.CalcSaldo() @@ -154,7 +196,7 @@ Public Class frmGesamtsicherheitenMenuNEU End Select End Sub - Private Sub resetSearchfields_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click + Private Sub resetSearchfields_Click(sender As Object, e As EventArgs) Handles btnResetFilter.Click txtSuchbegriff.Text = "" : chkOffen.Checked = True txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy") txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") @@ -332,5 +374,51 @@ Public Class frmGesamtsicherheitenMenuNEU End If End Function + Private Sub btnOpenOver85Days_Click(sender As Object, e As EventArgs) Handles btnOpenOver85Days.Click + resetSearchfields_Click(sender, e) + chkOffen.Checked = True + DateTimePicker1.Value = Now.AddYears(-20) + DateTimePicker2.Value = Now.AddDays(-85) + + btnSucheStarten_Click(sender, e) + + End Sub + + Private Function checkOpenATBs() As Integer + + Dim anzahlOffenerGSUeber85Tage As Integer + + Dim dtNew As New DataTable + + Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, + (Select SUM( Case + when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + when gs_art = 'Close' then gs_sicherheitsbetrag + End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr + ) + + + (Select SUM( Case + when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) + when gsp_art = 'Close' then gsp_sicherheitsbetrag + End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr + ) as Sicherheitssaldo + + From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2 + Where gs_standort = '" & Standort & "' AND Sicherheitssaldo != '0' AND gs_datum < '" & Date.Now().AddDays(-85) & "'" + + dtNew = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True) + + If (dtNew.Rows(0).Item(0) IsNot DBNull.Value) Then + + anzahlOffenerGSUeber85Tage = dtNew.Rows(0).Item(0) + If anzahlOffenerGSUeber85Tage > 0 Then + MsgBox("Es sind " & anzahlOffenerGSUeber85Tage & " ATBs offen, die älter als 85 Tage sind!") + End If + Return anzahlOffenerGSUeber85Tage + End If + + + + End Function End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index dceae8b..41f25d6 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -64,9 +64,15 @@ Partial Class frmGesamtsicherheitenNEU Me.lblReferenzwert = New System.Windows.Forms.Label() Me.lblSaldo = New System.Windows.Forms.Label() Me.panOben = New System.Windows.Forms.Panel() + Me.txtZollsatzueberschreiben = New VERAG_PROG_ALLGEMEIN.MyTextBox() + 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.cbx_offene = New System.Windows.Forms.CheckBox() Me.btnSuche = New System.Windows.Forms.Button() Me.Label23 = New System.Windows.Forms.Label() Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -97,7 +103,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1 = New System.Windows.Forms.Label() Me.txtPosFreitext = New System.Windows.Forms.TextBox() Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox() - Me.lbloffenerSaldo = New System.Windows.Forms.Label() + Me.lblId = New System.Windows.Forms.Label() CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -506,7 +512,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(962, 168) + Me.lblZollsatz.Location = New System.Drawing.Point(724, 139) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 4 @@ -518,7 +524,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(962, 152) + Me.lblReferenzwert.Location = New System.Drawing.Point(724, 123) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 1 @@ -539,7 +545,12 @@ Partial Class frmGesamtsicherheitenNEU 'panOben ' Me.panOben.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.panOben.Controls.Add(Me.lblId) + Me.panOben.Controls.Add(Me.txtZollsatzueberschreiben) + Me.panOben.Controls.Add(Me.cbxZollsatzueberschreiben) + Me.panOben.Controls.Add(Me.btnNext) Me.panOben.Controls.Add(Me.lbloffenerSaldo) + Me.panOben.Controls.Add(Me.btnPrev) Me.panOben.Controls.Add(Me.Label20) Me.panOben.Controls.Add(Me.txtPosNr) Me.panOben.Controls.Add(Me.Panel1) @@ -591,6 +602,79 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Size = New System.Drawing.Size(1384, 290) Me.panOben.TabIndex = 0 ' + 'txtZollsatzueberschreiben + ' + Me.txtZollsatzueberschreiben._DateTimeOnly = False + Me.txtZollsatzueberschreiben._numbersOnly = True + Me.txtZollsatzueberschreiben._numbersOnlyKommastellen = "" + Me.txtZollsatzueberschreiben._numbersOnlyTrennzeichen = True + Me.txtZollsatzueberschreiben._Prozent = False + Me.txtZollsatzueberschreiben._ShortDateNew = False + Me.txtZollsatzueberschreiben._ShortDateOnly = False + Me.txtZollsatzueberschreiben._TimeOnly = False + Me.txtZollsatzueberschreiben._TimeOnly_Seconds = False + Me.txtZollsatzueberschreiben._value = "" + Me.txtZollsatzueberschreiben._Waehrung = False + Me.txtZollsatzueberschreiben._WaehrungZeichen = True + Me.txtZollsatzueberschreiben.Enabled = False + Me.txtZollsatzueberschreiben.ForeColor = System.Drawing.Color.Black + Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(863, 156) + Me.txtZollsatzueberschreiben.MaxLineLength = -1 + Me.txtZollsatzueberschreiben.MaxLines_Warning = "" + Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing + Me.txtZollsatzueberschreiben.Name = "txtZollsatzueberschreiben" + Me.txtZollsatzueberschreiben.Size = New System.Drawing.Size(30, 20) + Me.txtZollsatzueberschreiben.TabIndex = 45 + ' + 'cbxZollsatzueberschreiben + ' + Me.cbxZollsatzueberschreiben.AutoSize = True + Me.cbxZollsatzueberschreiben.ForeColor = System.Drawing.Color.White + Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(725, 158) + Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben" + Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17) + Me.cbxZollsatzueberschreiben.TabIndex = 37 + Me.cbxZollsatzueberschreiben.Text = "Zollsatz überschreiben" + Me.cbxZollsatzueberschreiben.UseVisualStyleBackColor = True + ' + 'btnNext + ' + 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(1309, 111) + Me.btnNext.Name = "btnNext" + Me.btnNext.Size = New System.Drawing.Size(75, 47) + Me.btnNext.TabIndex = 37 + 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(238, 108) + Me.lbloffenerSaldo.Name = "lbloffenerSaldo" + Me.lbloffenerSaldo.Size = New System.Drawing.Size(146, 24) + Me.lbloffenerSaldo.TabIndex = 44 + Me.lbloffenerSaldo.Text = "offener Saldo: " + ' + '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(12, 108) + Me.btnPrev.Name = "btnPrev" + Me.btnPrev.Size = New System.Drawing.Size(75, 47) + Me.btnPrev.TabIndex = 36 + Me.btnPrev.Text = "<<" + Me.btnPrev.UseVisualStyleBackColor = False + ' 'Label20 ' Me.Label20.AutoSize = True @@ -614,6 +698,7 @@ Partial Class frmGesamtsicherheitenNEU 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.Panel1.Controls.Add(Me.cbx_offene) Me.Panel1.Controls.Add(Me.btnSuche) Me.Panel1.Controls.Add(Me.Label23) Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort) @@ -626,6 +711,16 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Size = New System.Drawing.Size(1384, 61) Me.Panel1.TabIndex = 10 ' + 'cbx_offene + ' + Me.cbx_offene.AutoSize = True + Me.cbx_offene.Location = New System.Drawing.Point(12, 19) + Me.cbx_offene.Name = "cbx_offene" + Me.cbx_offene.Size = New System.Drawing.Size(120, 17) + Me.cbx_offene.TabIndex = 36 + Me.cbx_offene.Text = "nur offene anzeigen" + Me.cbx_offene.UseVisualStyleBackColor = True + ' 'btnSuche ' Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -957,17 +1052,17 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitFreitext.Size = New System.Drawing.Size(256, 24) Me.txtSicherheitFreitext.TabIndex = 40 ' - 'lbloffenerSaldo + 'lblId ' - 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(238, 108) - Me.lbloffenerSaldo.Name = "lbloffenerSaldo" - Me.lbloffenerSaldo.Size = New System.Drawing.Size(146, 24) - Me.lbloffenerSaldo.TabIndex = 44 - Me.lbloffenerSaldo.Text = "offener Saldo: " + Me.lblId.Anchor = System.Windows.Forms.AnchorStyles.Right + 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(1229, 9) + Me.lblId.Name = "lblId" + Me.lblId.Size = New System.Drawing.Size(29, 24) + Me.lblId.TabIndex = 46 + Me.lblId.Text = "ID" ' 'frmGesamtsicherheitenNEU ' @@ -1065,4 +1160,10 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents Label20 As Label Friend WithEvents txtPosNr As TextBox Friend WithEvents lbloffenerSaldo As Label + Friend WithEvents btnNext As Button + Friend WithEvents btnPrev As Button + Friend WithEvents cbx_offene As CheckBox + Friend WithEvents txtZollsatzueberschreiben As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents cbxZollsatzueberschreiben As CheckBox + Friend WithEvents lblId As Label End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 2ab3568..9038add 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -13,6 +13,8 @@ Public Class frmGesamtsicherheitenNEU Property currentSPos As cGesamtsicherheitsPositionen Property currentGesSichRef As cGesamtsicherheitsReferenz Public Property gessicherheitID As Integer + Public Property prevGessicherheitID As Integer = 0 + Public Property nextGessicherheitID As Integer = 0 Public Property datum As DateTime = Nothing Property Standort As String = "" @@ -36,8 +38,12 @@ Public Class frmGesamtsicherheitenNEU Dim indexGspPosId As Integer + Dim isOpen As Boolean = False + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Public dt As New DataTable + Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -59,13 +65,17 @@ Public Class frmGesamtsicherheitenNEU cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True) If datum = Nothing Then datum = Date.Now + nextGessicherheitID = -1 + prevGessicherheitID = -1 Else LoadDGVSicherheiten() End If LoadStandort() cboSicherheitATR.Enabled = currentGesSichRef.gsr_ATR - Zollsatz = currentGesSichRef.gsr_zollsatz + + cbx_offene.Checked = True + initPrevNextButtons() Me.Text = "Gesamtsicherheit " & Standort @@ -74,26 +84,22 @@ Public Class frmGesamtsicherheitenNEU - Public Sub LoadDGVSicherheiten() + Public Sub LoadDGVSicherheiten(Optional withFilterParam As Boolean = False) lblSaldo.Text = "Saldo: € " & currentGesSichRef.gsr_Saldo.ToString() lblGestellungNr.Text = "" Dim sqladd1 As String = "" If currentGesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust" If currentGesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]" - If txt_Suche.Text <> "" Or cbx_Suche_Warenort._value <> "" Then Dim sqlSearchSting As String = "" + Dim sqlSearchSting As String = "" + If withFilterParam = True Then + If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')" + If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort.Text & "%'" + End If + 'Dim addtosqlstring As String = "" - Dim addtosqlstring As String = "" - 'Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & - ' sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] - ' where gs_standort = '" & Standort & "'And gs_datum > '" & Date.Parse(txtDatVon.Text) & "' And gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'" & - ' "AND (gs_abfertigungsNr Like '%" & txt_Suche.Text & "%' OR" & - ' " gs_ATBNr like '%" & txt_Suche.Text & "%' OR" & - ' " gs_LKWKZ like '%" & txt_Suche.Text & "%' OR" & - ' " gs_warenort like '%" & cbx_Suche_Warenort.Text & "%') order by [gs_datum]" - - Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "' order by [gs_datum]" + Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & "order by [gs_gsId]" dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,) dgvGesamtsicherheit.LOAD() @@ -111,11 +117,11 @@ Public Class frmGesamtsicherheitenNEU Select Case currentGesSichRef.gsr_ATR Case True .Columns("gs_ATBNr").HeaderText = "ATB" - .Columns("gs_atr").HeaderText = "ATR" + .Columns("gs_atr").HeaderText = "MRN" .Columns("gs_atr").Width = 33 .Columns("gs_ust").Width = 69 Case Else - .Columns("gs_ATBNr").HeaderText = "CRN" + .Columns("gs_ATBNr").HeaderText = "ATB" End Select .Columns("gs_ATBNr").Width = 146 @@ -128,15 +134,6 @@ Public Class frmGesamtsicherheitenNEU .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill End With - - 'For Each row As DataGridViewRow In dgvGesamtsicherheit.Rows - ' If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then - ' row.DefaultCellStyle.BackColor = Color.Red - ' Else - ' row.DefaultCellStyle.BackColor = Color.Green - ' End If - 'Next - End If @@ -145,24 +142,36 @@ Public Class frmGesamtsicherheitenNEU Private Sub dgvGesamtsicherheit_SelectionChanged(sender As Object, e As EventArgs) Handles dgvGesamtsicherheit.SelectionChanged If dgvGesamtsicherheit.SelectedRows.Count > 0 Then - indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsId").Value) + indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsNr").Value) currentSicherheit = New cSicherheiten(indexGsId) - - LoadDGVSicherheitsPos(indexGsId) + LoadDGVSicherheitsPos(indexGsId, True) loadTitle() setSaldo() If dgvGesamtsicherheit.Enabled = False Then Exit Sub + Else + LoadDGVSicherheitsPos(-1, True) + End If End Sub - Public Sub LoadDGVSicherheitsPos(gsId As Integer) + Public Sub LoadDGVSicherheitsPos(gsNr As Integer, Optional withFilterParam As Boolean = False) - If gsId = 0 Then Exit Sub + 'If gsNr = "" Then Exit Sub - Dim SQLStringCRN As String = "select [gsp_gspPosId] ,[gsp_gsId],[gsp_warenwert],[gsp_sicherheitsbetrag],[gsp_freitext],[gsp_art] ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_ATCNr] ,[gsp_MRNNr],[gsp_erstellungsdatum] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gsId & "' order by [gsp_gspPosId]" + Dim sqlSearchSting As String = "" + + If withFilterParam = True Then + sqlSearchSting &= "AND gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" + If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')" + If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= " AND gs_warenort like '%" & cbx_Suche_Warenort.Text & "%'" + sqlSearchSting &= ")" + End If + + + Dim SQLStringCRN As String = "select [gsp_gspPosId] ,[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],[gsp_freitext],[gsp_art] ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_ATCNr] ,[gsp_MRNNr],[gsp_erstellungsdatum] from [tblGesamtsicherheitsPositionen] where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gsp_gsId]" dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,) dgvSicherheitsPos.LOAD() @@ -188,6 +197,7 @@ Public Class frmGesamtsicherheitenNEU End With End If + btnAddPos.Visible = True End Sub @@ -206,7 +216,7 @@ Public Class frmGesamtsicherheitenNEU 'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'" lblGestellungNr.Text = "" - + lblId.Text = "" Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsId] = '" & indexGsId & "'" @@ -224,6 +234,7 @@ Public Class frmGesamtsicherheitenNEU If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " " If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " " If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " " + If gessicherheitID <> 0 Then lblId.Text &= "GS-Nr: " & gessicherheitID 'currentSicherheit.gs_gsNr @@ -232,9 +243,13 @@ Public Class frmGesamtsicherheitenNEU Public Sub LoadStandort() + Zollsatz = currentGesSichRef.gsr_zollsatz + txtZollsatzueberschreiben.Text = Zollsatz + cbxZollsatzueberschreiben.Checked = False lblReferenzwert.Text = "Referenzwert: €" & currentGesSichRef.gsr_referenzwert.ToString() lblZollsatz.Text = "Zollsatz: " & currentGesSichRef.gsr_zollsatz & "%" ZollsatzMulti = currentGesSichRef.gsr_zollsatz / 100 + End Sub Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtSicherheitWarenwert.TextChanged, txtPosWarenwert.TextChanged @@ -250,7 +265,7 @@ Public Class frmGesamtsicherheitenNEU End Try End Sub - Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress + Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress, txtZollsatzueberschreiben.KeyPress Select Case Asc(e.KeyChar) Case 48 To 57, 8, 44 ' Zahlen, Backspace und , zulassen @@ -299,55 +314,82 @@ Public Class frmGesamtsicherheitenNEU End Sub Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click + + Dim attachPosNrToExistingATB As Boolean = False + Try + If (txtAnzahlPos.Text = "") Then + txtAnzahlPos.Focus() + Exit Sub + End If Dim limit As Integer = Integer.Parse(setNullToZero(txtAnzahlPos.Text)) - Dim OPEN As New cSicherheiten() - - With OPEN - .gs_gsNr = AddNewGesamtSichNr() - .gs_ATBNr = txtSicherheitATBNr.Text - .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text)) - .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text) - .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") - .gs_standort = Me.Standort - .gs_art = "OPEN" - .gs_gsNr = Me.gessicherheitID - .gs_erstellungsdatum = Me.datum - .gs_freitext = Me.txtSicherheitFreitext.Text - .gs_saldo = currentGesSichRef.gsr_Saldo - .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) - setEnviromentDataToObject(OPEN, Me) - End With - - 'If Neu = True AndAlso count <= 1 Then OPENWithMultiplePosNr.gs_gsNr = AddNewGesamtSichNr() - - 'Select Case checkIfExist(OPENWithMultiplePosNr.gs_ATBNr, gessicherheitID) - ' Case "Neu" - ' OPENWithMultiplePosNr.SAVE() - ' Case Else - ' If (count > 1) Then - ' OPENWithMultiplePosNr.SAVE() - ' Else - ' MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPENWithMultiplePosNr.gs_ATBNr, gessicherheitID) & "eingetragen") : OPENWithMultiplePosNr.SAVE() - ' End If - - 'End Select - - indexGsId = OPEN.SAVEOBJECT() - For count As Integer = 1 To limit - 'If (count > 1) Then txtMRNWarenwert.Text = 0 + attachPosNrToExistingATB = False + Dim warenwert As Double + Dim sicherheitsbetrag As Double + If count > 1 Then + warenwert = 0 + sicherheitsbetrag = 0 + Else + warenwert = Double.Parse(txtSicherheitWarenwert.Text) + sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) + End If - Dim OPENPos As New cGesamtsicherheitsPositionen(indexGsId, count) + Dim OPEN As New cSicherheiten() + + With OPEN + .gs_gsNr = gessicherheitID + .gs_ATBNr = txtSicherheitATBNr.Text + .gs_posNr = count + .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text) + .gs_warenwert = warenwert + .gs_sicherheitsbetrag = sicherheitsbetrag + .gs_standort = Me.Standort + .gs_art = "OPEN" + .gs_erstellungsdatum = Me.datum + .gs_freitext = Me.txtSicherheitFreitext.Text + .gs_saldo = currentGesSichRef.gsr_Saldo + .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) + .gs_zollsatz = Me.Zollsatz + setEnviromentDataToObject(OPEN, Me) + End With + + + + + If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr() + + Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID) + + Case "Neu" + + indexGsId = OPEN.SAVEOBJECT() + + Case Else + With OPEN + .gs_posNr = getLatestPosNr(gessicherheitID, txtSicherheitATBNr.Text) + 1 + End With + attachPosNrToExistingATB = True + indexGsId = OPEN.SAVEOBJECT() + If count = 1 Then MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") ': indexGsId = OPEN.SAVEOBJECT() + + End Select + + Dim OPENPos As cGesamtsicherheitsPositionen + + If attachPosNrToExistingATB Then + OPENPos = New cGesamtsicherheitsPositionen(indexGsId, OPEN.gs_posNr) + Else + OPENPos = New cGesamtsicherheitsPositionen(indexGsId, count) + End If With OPENPos - '.gsp_gsId = - '.gsp_gspPosId = count + + .gsp_gsNr = OPEN.gs_gsNr .gsp_warenwert = 0 .gsp_sicherheitsbetrag = 0 .gsp_freitext = "" @@ -359,32 +401,20 @@ Public Class frmGesamtsicherheitenNEU .gsp_ust = "" .gsp_ATCNr = "" .gsp_MRNNr = "" + .gsp_gsNr = OPEN.gs_gsNr End With + + OPENPos.SAVE() - If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr() - Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID) - Case "Neu" - OPEN.SAVE() - Case Else - If (count >= 1) Then - OPEN.SAVE() - OPENPos.SAVE() - Else - MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE() - End If - - End Select Next - AfterButton() - Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -394,11 +424,11 @@ Public Class frmGesamtsicherheitenNEU If dgvGesamtsicherheit.SelectedRows.Count = 0 Then - MsgBox("Bitte Sicherheit markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll") + MsgBox("Bitte eine Gestellung markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll") Exit Sub End If - If (checkWarenwert() = False) Then + If (checkSicherheitsbetrag() = False) Then MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!") txtPosWarenwert.Focus() Exit Sub @@ -406,15 +436,38 @@ Public Class frmGesamtsicherheitenNEU Try + Dim OPEN As New cSicherheiten() + + With OPEN + .gs_gsNr = gessicherheitID + .gs_ATBNr = "" + .gs_posNr = Me.getLatestPosNr(currentSicherheit.gs_gsNr, currentSicherheit.gs_ATBNr) + 1 + .gs_datum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text) + .gs_warenwert = 0 + .gs_sicherheitsbetrag = 0 + .gs_standort = Me.Standort + .gs_art = "OPEN" + .gs_erstellungsdatum = Me.datum + .gs_freitext = Me.txtSicherheitFreitext.Text + .gs_saldo = currentGesSichRef.gsr_Saldo + .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) + .gs_zollsatz = Me.Zollsatz + setEnviromentDataToObject(OPEN, Me) + End With + + Dim gs_gsId = OPEN.SAVEOBJECT() + Dim SicherheitsPos As New cGesamtsicherheitsPositionen() With SicherheitsPos - .gsp_gsId = currentSicherheit.gs_gsId - .gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsId) + 1 + .gsp_gsId = gs_gsId + '.gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsNr, ) + 1 + .gsp_gspPosId = OPEN.gs_posNr .gsp_warenwert = Double.Parse(txtPosWarenwert.Text) .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text) .gsp_freitext = txtPosFreitext.Text .gsp_filialenNr = currentSicherheit.gs_filialenNr - .gsp_art = "OPEN" + .gsp_art = "CLOSE" + .gsp_gsNr = gessicherheitID .gsp_abfertigungsNr = currentSicherheit.gs_abfertigungsnr .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text) .gsp_ust = currentSicherheit.gs_ust @@ -422,19 +475,8 @@ Public Class frmGesamtsicherheitenNEU .gsp_MRNNr = txtPositionenCRN.Text End With - - SicherheitsPos.SAVE() - 'If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr() - - 'Select Case checkIfExist(Close.gs_ATBNr, gessicherheitID) - ' Case "Neu" - ' Close.SAVE() - ' Case Else - ' MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(Close.gs_ATBNr, gessicherheitID) & "eingetragen") : Exit Sub - 'End Select - AfterButton() Catch ex As Exception MsgBox(ex.Message) @@ -520,7 +562,7 @@ Public Class frmGesamtsicherheitenNEU End Try Try - Me.warenortID = checkNothingValue(cbx_Suche_Warenort.SelectedItem, "String") + Me.warenortID = checkNothingValue(cboWarenort.SelectedItem, "String") Catch Me.warenortID = "-" @@ -529,13 +571,14 @@ Public Class frmGesamtsicherheitenNEU Me.Abfertigungsnummer = txtAbfertNum.Text Me.LKWKZ = txtLKWID.Text - If setNullToZero(Me.gessicherheitID) >= 0 Then + If setNullToZero(Me.gessicherheitID) > 0 Then Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "', [gs_LKWKZ] = '" & Me.LKWKZ & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' " SQL.doSQL(sqlstring, "AVISO") + btnAddPos.Visible = True LoadDGVSicherheiten() End If loadTitle() - + btnAddPos.Visible = False panOben.Enabled = True : panOben.Enabled = True panOverlay.Visible = False End Sub @@ -559,9 +602,9 @@ Public Class frmGesamtsicherheitenNEU End Function - Private Sub dgvGesamtsicherheit_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheit.CellContentClick + Private Sub dgvGesamtsicherheit_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheit.CellDoubleClick - Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value) + Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value, dgvGesamtsicherheit.CurrentRow.Cells("gs_posNr").Value) txtSicherheitATBNr.Text = Sicherh.gs_ATBNr txtAnzahlPos.Text = Sicherh.gs_posNr @@ -572,6 +615,7 @@ Public Class frmGesamtsicherheitenNEU txtSicherheitTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm") currentSicherheit = Sicherh + txtAnzahlPos.Enabled = False btnAddSicherheit.Visible = False btnUpdateSicherheit.Visible = True @@ -581,10 +625,10 @@ Public Class frmGesamtsicherheitenNEU Private Sub btnUpdateSicherheit_Click(sender As Object, e As EventArgs) Handles btnUpdateSicherheit.Click With currentSicherheit .gs_ATBNr = txtSicherheitATBNr.Text - .gs_posNr = Double.Parse(setNullToZero(txtAnzahlPos.Text)) + .gs_posNr = Integer.Parse(setNullToZero(txtAnzahlPos.Text)) .gs_datum = DateTimeString2DateTimeKonvertinator(txtSicherheitDate.Text, txtSicherheitTime.Text) - .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") + .gs_warenwert = Double.Parse(txtSicherheitWarenwert.Text) + .gs_sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) .gs_standort = Me.Standort .gs_art = "OPEN" .gs_gsNr = Me.gessicherheitID @@ -593,8 +637,9 @@ Public Class frmGesamtsicherheitenNEU '.saldo = currentGesSichRef.Saldo .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) End With - checkWarenwert() + checkSicherheitsbetrag() currentSicherheit.SAVE() + txtAnzahlPos.Enabled = True btnUpdateSicherheit.Visible = False btnAddSicherheit.Visible = True btnDeleteSicherheit.Visible = False @@ -611,7 +656,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ATCNr = txtPositionenCRN.Text End With - checkWarenwert() + checkSicherheitsbetrag() currentSPos.SAVE() btnAddPos.Visible = True btnUpdatePos.Visible = False @@ -619,9 +664,9 @@ Public Class frmGesamtsicherheitenNEU AfterButton() End Sub - Private Sub dgvGesamtsicherheitPositionen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick + Private Sub dgvGesamtsicherheitPositionen_CellCellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick - Dim sPos As New cGesamtsicherheitsPositionen(indexGsId, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value) + Dim sPos As New cGesamtsicherheitsPositionen(dgvSicherheitsPos.CurrentRow.Cells("gsp_gsId").Value, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value) txtPosNr.Text = sPos.gsp_gspPosId txtPosFreitext.Text = sPos.gsp_freitext @@ -631,6 +676,7 @@ Public Class frmGesamtsicherheitenNEU txtPosDate.Text = sPos.gsp_erstellungsdatum.ToString("dd.MM.yyyy") txtPosTime.Text = sPos.gsp_erstellungsdatum.ToString("HH:mm") + currentSPos = sPos btnDeletePos.Visible = True @@ -644,6 +690,7 @@ Public Class frmGesamtsicherheitenNEU btnUpdateSicherheit.Visible = False btnAddSicherheit.Visible = True btnDeleteSicherheit.Visible = False + txtAnzahlPos.Enabled = True AfterButton() Catch ex As Exception MsgBox(ex.Message) @@ -666,8 +713,8 @@ Public Class frmGesamtsicherheitenNEU panOverlay.Visible = True cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer) - cbx_Suche_Warenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True) - cbx_Suche_Warenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID) + cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True) + cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID) txtAbfertNum.Text = Me.Abfertigungsnummer txtLKWID.Text = Me.LKWKZ panOben.Enabled = False @@ -684,6 +731,7 @@ Public Class frmGesamtsicherheitenNEU MsgBox("Bitte Warenort angeben!") isFilled = False + End If Return isFilled @@ -699,10 +747,10 @@ Public Class frmGesamtsicherheitenNEU End Sub - - Private Function getLatestPosNr(gs_gsId As Integer) As Integer + Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer Dim posNr As Integer = 0 - Dim sqlq As String = "select MAX([gsp_gspPosId]) as MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsId = " & gs_gsId + 'Dim sqlq As String = "select MAX([gsp_gspPosId]) as MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsnr = " & gs_gsnr + Dim sqlq As String = "select MAX([gs_posNr]) as MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " AND gs_ATBNR = '" & gs_ATBNr & "'" Dim dt As New DataTable dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) @@ -716,11 +764,9 @@ Public Class frmGesamtsicherheitenNEU End Function - - Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click Try - If Me.Visible Then LoadDGVSicherheiten() + If Me.Visible Then LoadDGVSicherheiten(True) Catch ex As Exception MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.") End Try @@ -749,36 +795,64 @@ Public Class frmGesamtsicherheitenNEU txt_Suche.Clear() End Sub - Private Function checkWarenwert() As Boolean + Private Function checkSicherheitsbetrag() As Boolean Dim ok As Boolean = True - Dim offenerWarenwert As Double + Dim offenerSicherheitsbetrag As Double + Dim offenerSicherheitsbetragPos As Double + Try - offenerWarenwert = calcOffenenWarenwert() + offenerSicherheitsbetrag = calcOffenerSicherheitsbetrag() - If (offenerWarenwert < Double.Parse(txtPosWarenwert.Text)) Then - ok = False - End If + If (offenerSicherheitsbetrag < 0) Then Return False + + If (offenerSicherheitsbetrag < offenerSicherheitsbetragPos) Then Return False Catch ex As Exception MsgBox(ex.Message) End Try - Return ok End Function + Private Function calcSicherheitsbetragPos() As Double + + Dim sicherheitsbetragSumPositionen As Double + If currentSicherheit Is Nothing Then Exit Function + sicherheitsbetragSumPositionen = CDbl(SQL.DLookup("SUM(gsp_sicherheitsbetrag)", "[tblGesamtsicherheitsPositionen]", "gsp_gsnr ='" & currentSicherheit.gs_gsNr & "'", "AVISO")) + + If currentSPos IsNot Nothing Then + sicherheitsbetragSumPositionen = sicherheitsbetragSumPositionen + Double.Parse(setNullToZero(txtPosWarenwert.Text)) + End If + + Return sicherheitsbetragSumPositionen + + End Function - Private Function calcOffenenWarenwert() As Double + Private Function calcSicherheitsbetragGestelle() As Double + + Dim sicherheitsbetragSumGestelle As Double + If currentSicherheit Is Nothing Then Exit Function + sicherheitsbetragSumGestelle = CDbl(SQL.DLookup("SUM(gs_sicherheitsbetrag)", "[tblGesamtsicherheit]", "gs_gsnr ='" & currentSicherheit.gs_gsNr & "'", "AVISO")) + + Return sicherheitsbetragSumGestelle + + End Function + + + + Private Function calcOffenerSicherheitsbetrag() As Double Dim diff As Double = -10000 - If currentSicherheit Is Nothing Then Exit Function + Try - Dim warenwertSumPositionen = CDbl(SQL.DLookup("SUM(gsp_warenwert)", "[tblGesamtsicherheitsPositionen]", "gsp_gsId ='" & currentSicherheit.gs_gsId & "'", "AVISO")) - diff = Double.Parse(currentSicherheit.gs_warenwert) - Double.Parse(warenwertSumPositionen) + Dim sicherheitsbetragSumPositionen = calcSicherheitsbetragPos() + Dim sicherheitsbetragSumGestelle = calcSicherheitsbetragGestelle() + + diff = Double.Parse(sicherheitsbetragSumGestelle) - Double.Parse(sicherheitsbetragSumPositionen) Catch ex As Exception MsgBox(ex.Message) End Try @@ -789,11 +863,14 @@ Public Class frmGesamtsicherheitenNEU Private Sub setSaldo() - lbloffenerSaldo.Text = "offener Saldo: " - If Me.calcOffenenWarenwert > 0 Then - lbloffenerSaldo.Text &= Me.calcOffenenWarenwert() + lbloffenerSaldo.Text = "offener S-Saldo: " + Dim offernerSB As Double = Me.calcOffenerSicherheitsbetrag() + If offernerSB > 0 Then + lbloffenerSaldo.Text &= Me.calcOffenerSicherheitsbetrag().ToString + isOpen = True Else lbloffenerSaldo.Text &= "0" + isOpen = False End If End Sub @@ -801,9 +878,156 @@ Public Class frmGesamtsicherheitenNEU End Sub + Private Function setPrevAndNextGesIDAllOpen() + + Dim isInList As Boolean = False + + Dim onlyOpenDT As DataTable + + onlyOpenDT = dt.Select("gs_isOpen = True").CopyToDataTable + + + For i As Integer = 0 To onlyOpenDT.Rows.Count - 1 + If onlyOpenDT.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then + isInList = True + If i = 0 Then + prevGessicherheitID = -1 ' no prev Sicherheit + Else + prevGessicherheitID = onlyOpenDT.Rows(i - 1).Item("gs_gsnr") + End If + If i = onlyOpenDT.Rows.Count - 1 Then + nextGessicherheitID = -1 ' no next Sicherheit + Else + nextGessicherheitID = onlyOpenDT.Rows(i + 1).Item("gs_gsnr") + End If + + End If + + Next + + If isInList = False AndAlso onlyOpenDT.Rows.Count - 1 <> 0 Then + + For i As Integer = 0 To dt.Rows.Count - 1 + If dt.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then + + If i = 0 Then + prevGessicherheitID = -1 ' no prev Sicherheit + Else + + For j As Integer = i To 0 + If dt.Rows(j).Item("gs_isOpen") Then + prevGessicherheitID = dt.Rows(j).Item("gs_gsnr") + Exit For + End If + Next + End If + + + If i = dt.Rows.Count - 1 Then + nextGessicherheitID = -1 ' ' no next Sicherheit + Else + For k As Integer = i To dt.Rows.Count - 1 + If dt.Rows(k).Item("gs_isOpen") Then + nextGessicherheitID = dt.Rows(k).Item("gs_gsnr") + Exit For + End If + Next + + End If + + + End If + + Next + End If + + End Function + + Private Function setPrevAndNextGesAll() + + For i As Integer = 0 To dt.Rows.Count - 1 + If dt.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then + + prevGessicherheitID = i - 1 + nextGessicherheitID = i + 1 + + If i = 0 Then prevGessicherheitID = -1 ' no prev Sicherheit + If i = dt.Rows.Count - 1 Then nextGessicherheitID = -1 ' ' no next Sicherheit + Return i + End If + + Next + + End Function + + + Private Sub btnPrev_Click(sender As Object, e As EventArgs) Handles btnPrev.Click + + If (cbx_offene.Checked) Then + setPrevAndNextGesIDAllOpen() + Else + setPrevAndNextGesAll() + End If + + If Me.prevGessicherheitID = -1 Then + initPrevNextButtons() + Exit Sub + End If + Me.gessicherheitID = Me.prevGessicherheitID + + LoadDGVSicherheiten() + End Sub + + Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnNext.Click + + If (cbx_offene.Checked) Then + setPrevAndNextGesIDAllOpen() + Else + setPrevAndNextGesAll() + End If + If Me.nextGessicherheitID = -1 Then + initPrevNextButtons() + Exit Sub + End If + Me.gessicherheitID = Me.nextGessicherheitID + LoadDGVSicherheiten() + End Sub + + Private Sub initPrevNextButtons() + If nextGessicherheitID = -1 Then + btnNext.Enabled = False + Else + btnNext.Enabled = True + End If + + + If prevGessicherheitID = -1 Then + btnPrev.Enabled = False + Else + btnPrev.Enabled = True + End If + + End Sub + + Private Sub cbxZollsatzueberschreiben_CheckedChanged(sender As Object, e As EventArgs) Handles cbxZollsatzueberschreiben.CheckedChanged + + If cbxZollsatzueberschreiben.Checked Then + txtZollsatzueberschreiben.Enabled = True + Else + txtZollsatzueberschreiben.Enabled = False + txtZollsatzueberschreiben.Text = currentGesSichRef.gsr_zollsatz.ToString + End If + + End Sub + + Private Sub txtZollsatzueberschreiben_TextChanged(sender As Object, e As EventArgs) Handles txtZollsatzueberschreiben.TextChanged + lblZollsatz.Text = "Zollsatz: " & txtZollsatzueberschreiben.Text & "%" + + ZollsatzMulti = CDbl(setNullToZero(txtZollsatzueberschreiben.Text)) / 100 + End Sub End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index c29683e..ee4d842 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4177,7 +4177,7 @@ Public Class frmHauptfenster Private Sub DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Click Dim frm As New frmGesamtsicherheitenMenuNEU - frm.Standort = "VERAG AG" + frm.Standort = "VERAG GmbH" frm.Show() End Sub End Class From 0fdf25d07e0506600161523091c87396567fdf34 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 28 Oct 2022 12:01:16 +0200 Subject: [PATCH 2/3] Feature_Gesamtsicherheiten --- Aviso/My Project/AssemblyInfo.vb | 4 +- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 123 +++-- Aviso/frmGesamtsicherheitenMenuNEU.vb | 10 +- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 424 ++++++++++++++---- Aviso/frmGesamtsicherheitenNEU.vb | 129 ++++-- Aviso/frmHauptfenster.Designer.vb | 10 +- Aviso/frmHauptfenster.vb | 13 +- 7 files changed, 501 insertions(+), 212 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 016910b..d57488d 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 39b72f3..78d6d01 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -26,6 +26,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenMenuNEU)) Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() + Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label26 = New System.Windows.Forms.Label() Me.btnBisTag = New System.Windows.Forms.Button() @@ -62,7 +63,6 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblReferenzwert = New System.Windows.Forms.Label() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -73,12 +73,13 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvListe.AllowUserToAddRows = False Me.dgvListe.AllowUserToDeleteRows = False + Me.dgvListe.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvListe.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvListe.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvListe.Location = New System.Drawing.Point(0, 313) + Me.dgvListe.Location = New System.Drawing.Point(-3, 307) Me.dgvListe.Name = "dgvListe" Me.dgvListe.ReadOnly = True - Me.dgvListe.Size = New System.Drawing.Size(576, 408) + Me.dgvListe.Size = New System.Drawing.Size(606, 408) Me.dgvListe.TabIndex = 1 ' 'Panel1 @@ -122,9 +123,24 @@ 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(576, 313) + Me.Panel1.Size = New System.Drawing.Size(606, 313) Me.Panel1.TabIndex = 0 ' + 'btnOpenOver85Days + ' + Me.btnOpenOver85Days.allowBorder = False + Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White + Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 + Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black + Me.btnOpenOver85Days.Location = New System.Drawing.Point(36, 244) + Me.btnOpenOver85Days.Name = "btnOpenOver85Days" + Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) + Me.btnOpenOver85Days.TabIndex = 32 + Me.btnOpenOver85Days.Text = "Über 85 Tage offen" + Me.btnOpenOver85Days.UseVisualStyleBackColor = False + Me.btnOpenOver85Days.Visible = False + ' 'txtDatBis ' Me.txtDatBis._DateTimeOnly = False @@ -149,7 +165,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtDatBis.MaxLines_Warning_Label = Nothing Me.txtDatBis.Name = "txtDatBis" Me.txtDatBis.Size = New System.Drawing.Size(63, 20) - Me.txtDatBis.TabIndex = 21 + Me.txtDatBis.TabIndex = 25 ' 'Label26 ' @@ -159,7 +175,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label26.Location = New System.Drawing.Point(33, 120) Me.Label26.Name = "Label26" Me.Label26.Size = New System.Drawing.Size(43, 13) - Me.Label26.TabIndex = 10 + Me.Label26.TabIndex = 11 Me.Label26.Text = "Datum" ' 'btnBisTag @@ -173,7 +189,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnBisTag.Margin = New System.Windows.Forms.Padding(0) Me.btnBisTag.Name = "btnBisTag" Me.btnBisTag.Size = New System.Drawing.Size(34, 23) - Me.btnBisTag.TabIndex = 13 + Me.btnBisTag.TabIndex = 14 Me.btnBisTag.Text = ">>" Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnBisTag.UseVisualStyleBackColor = False @@ -189,7 +205,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnVonTag.Margin = New System.Windows.Forms.Padding(0) Me.btnVonTag.Name = "btnVonTag" Me.btnVonTag.Size = New System.Drawing.Size(34, 23) - Me.btnVonTag.TabIndex = 11 + Me.btnVonTag.TabIndex = 12 Me.btnVonTag.Text = "<<" Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonTag.UseVisualStyleBackColor = False @@ -205,7 +221,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnTag.Margin = New System.Windows.Forms.Padding(0) Me.btnTag.Name = "btnTag" Me.btnTag.Size = New System.Drawing.Size(87, 23) - Me.btnTag.TabIndex = 12 + Me.btnTag.TabIndex = 13 Me.btnTag.Text = "Heute" Me.btnTag.UseVisualStyleBackColor = False ' @@ -232,7 +248,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtDatVon.MaxLines_Warning_Label = Nothing Me.txtDatVon.Name = "txtDatVon" Me.txtDatVon.Size = New System.Drawing.Size(63, 20) - Me.txtDatVon.TabIndex = 16 + Me.txtDatVon.TabIndex = 18 ' 'Label24 ' @@ -241,7 +257,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label24.Location = New System.Drawing.Point(33, 173) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(23, 13) - Me.Label24.TabIndex = 20 + Me.Label24.TabIndex = 23 Me.Label24.Text = "bis:" ' 'btnJahr @@ -255,7 +271,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnJahr.Margin = New System.Windows.Forms.Padding(0) Me.btnJahr.Name = "btnJahr" Me.btnJahr.Size = New System.Drawing.Size(87, 23) - Me.btnJahr.TabIndex = 24 + Me.btnJahr.TabIndex = 28 Me.btnJahr.Text = "2016" Me.btnJahr.UseVisualStyleBackColor = False ' @@ -270,7 +286,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnBisJahr.Margin = New System.Windows.Forms.Padding(0) Me.btnBisJahr.Name = "btnBisJahr" Me.btnBisJahr.Size = New System.Drawing.Size(34, 23) - Me.btnBisJahr.TabIndex = 25 + Me.btnBisJahr.TabIndex = 29 Me.btnBisJahr.Text = ">>" Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnBisJahr.UseVisualStyleBackColor = False @@ -286,7 +302,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnVonJahr.Margin = New System.Windows.Forms.Padding(0) Me.btnVonJahr.Name = "btnVonJahr" Me.btnVonJahr.Size = New System.Drawing.Size(34, 23) - Me.btnVonJahr.TabIndex = 23 + Me.btnVonJahr.TabIndex = 27 Me.btnVonJahr.Text = "<<" Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonJahr.UseVisualStyleBackColor = False @@ -302,7 +318,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnMonat.Margin = New System.Windows.Forms.Padding(0) Me.btnMonat.Name = "btnMonat" Me.btnMonat.Size = New System.Drawing.Size(87, 23) - Me.btnMonat.TabIndex = 18 + Me.btnMonat.TabIndex = 20 Me.btnMonat.Text = "September" Me.btnMonat.UseVisualStyleBackColor = False ' @@ -317,7 +333,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnBisMonat.Margin = New System.Windows.Forms.Padding(0) Me.btnBisMonat.Name = "btnBisMonat" Me.btnBisMonat.Size = New System.Drawing.Size(34, 23) - Me.btnBisMonat.TabIndex = 19 + Me.btnBisMonat.TabIndex = 21 Me.btnBisMonat.Text = ">>" Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnBisMonat.UseVisualStyleBackColor = False @@ -333,7 +349,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnVonMonat.Margin = New System.Windows.Forms.Padding(0) Me.btnVonMonat.Name = "btnVonMonat" Me.btnVonMonat.Size = New System.Drawing.Size(34, 23) - Me.btnVonMonat.TabIndex = 17 + Me.btnVonMonat.TabIndex = 19 Me.btnVonMonat.Text = "<<" Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonMonat.UseVisualStyleBackColor = False @@ -347,7 +363,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.DateTimePicker2.Name = "DateTimePicker2" Me.DateTimePicker2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.DateTimePicker2.Size = New System.Drawing.Size(92, 20) - Me.DateTimePicker2.TabIndex = 22 + Me.DateTimePicker2.TabIndex = 26 ' 'Label25 ' @@ -356,7 +372,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label25.Location = New System.Drawing.Point(33, 149) Me.Label25.Name = "Label25" Me.Label25.Size = New System.Drawing.Size(28, 13) - Me.Label25.TabIndex = 14 + Me.Label25.TabIndex = 16 Me.Label25.Text = "von:" ' 'DateTimePicker1 @@ -368,14 +384,13 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.DateTimePicker1.Name = "DateTimePicker1" Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20) - Me.DateTimePicker1.TabIndex = 15 + Me.DateTimePicker1.TabIndex = 17 ' 'cbxWarenort ' Me.cbxWarenort._allowedValuesFreiText = Nothing Me.cbxWarenort._allowFreiText = False Me.cbxWarenort._value = "" - Me.cbxWarenort.Anchor = System.Windows.Forms.AnchorStyles.Right Me.cbxWarenort.FormattingEnabled = True Me.cbxWarenort.Location = New System.Drawing.Point(132, 69) Me.cbxWarenort.Name = "cbxWarenort" @@ -384,7 +399,6 @@ Partial Class frmGesamtsicherheitenMenuNEU ' 'Label4 ' - Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label4.ForeColor = System.Drawing.Color.Honeydew @@ -399,7 +413,6 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.cbxStandort._allowedValuesFreiText = Nothing Me.cbxStandort._allowFreiText = False Me.cbxStandort._value = "" - Me.cbxStandort.Anchor = System.Windows.Forms.AnchorStyles.Right Me.cbxStandort.FormattingEnabled = True Me.cbxStandort.Location = New System.Drawing.Point(32, 69) Me.cbxStandort.Name = "cbxStandort" @@ -408,7 +421,6 @@ Partial Class frmGesamtsicherheitenMenuNEU ' 'lblFiliale ' - Me.lblFiliale.Anchor = System.Windows.Forms.AnchorStyles.Right Me.lblFiliale.AutoSize = True Me.lblFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.lblFiliale.ForeColor = System.Drawing.Color.Honeydew @@ -426,10 +438,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.FlatButton2.FlatAppearance.BorderSize = 0 Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Location = New System.Drawing.Point(483, 193) + Me.FlatButton2.Location = New System.Drawing.Point(513, 193) Me.FlatButton2.Name = "FlatButton2" Me.FlatButton2.Size = New System.Drawing.Size(81, 20) - Me.FlatButton2.TabIndex = 34 + Me.FlatButton2.TabIndex = 30 Me.FlatButton2.Text = "jedes Datum" Me.FlatButton2.UseVisualStyleBackColor = False Me.FlatButton2.Visible = False @@ -437,7 +449,6 @@ Partial Class frmGesamtsicherheitenMenuNEU 'btnSucheStarten ' Me.btnSucheStarten.allowBorder = False - Me.btnSucheStarten.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnSucheStarten.BackColor = System.Drawing.Color.White Me.btnSucheStarten.FlatAppearance.BorderSize = 0 Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -445,7 +456,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnSucheStarten.Location = New System.Drawing.Point(32, 281) Me.btnSucheStarten.Name = "btnSucheStarten" Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) - Me.btnSucheStarten.TabIndex = 32 + Me.btnSucheStarten.TabIndex = 33 Me.btnSucheStarten.Text = "Suche starten" Me.btnSucheStarten.UseVisualStyleBackColor = False ' @@ -465,13 +476,14 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtbis._WaehrungZeichen = True Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtbis.ForeColor = System.Drawing.Color.Black - Me.txtbis.Location = New System.Drawing.Point(483, 169) + Me.txtbis.Location = New System.Drawing.Point(513, 169) Me.txtbis.MaxLineLength = -1 Me.txtbis.MaxLines_Warning = "" Me.txtbis.MaxLines_Warning_Label = Nothing Me.txtbis.Name = "txtbis" Me.txtbis.Size = New System.Drawing.Size(81, 20) - Me.txtbis.TabIndex = 31 + Me.txtbis.TabIndex = 24 + Me.txtbis.TabStop = False Me.txtbis.Visible = False ' 'txtVon @@ -490,13 +502,14 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtVon._WaehrungZeichen = True Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(480, 126) + Me.txtVon.Location = New System.Drawing.Point(510, 126) Me.txtVon.MaxLineLength = -1 Me.txtVon.MaxLines_Warning = "" Me.txtVon.MaxLines_Warning_Label = Nothing Me.txtVon.Name = "txtVon" Me.txtVon.Size = New System.Drawing.Size(81, 20) - Me.txtVon.TabIndex = 30 + Me.txtVon.TabIndex = 15 + Me.txtVon.TabStop = False Me.txtVon.Visible = False ' 'Label3 @@ -505,10 +518,10 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label3.ForeColor = System.Drawing.Color.Honeydew - Me.Label3.Location = New System.Drawing.Point(480, 150) + Me.Label3.Location = New System.Drawing.Point(510, 150) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(24, 15) - Me.Label3.TabIndex = 29 + Me.Label3.TabIndex = 22 Me.Label3.Text = "Bis" Me.Label3.Visible = False ' @@ -518,16 +531,15 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label2.ForeColor = System.Drawing.Color.Honeydew - Me.Label2.Location = New System.Drawing.Point(480, 107) + Me.Label2.Location = New System.Drawing.Point(510, 107) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(28, 15) - Me.Label2.TabIndex = 28 + Me.Label2.TabIndex = 10 Me.Label2.Text = "Von" Me.Label2.Visible = False ' 'Label1 ' - Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label1.ForeColor = System.Drawing.Color.Honeydew @@ -540,7 +552,6 @@ Partial Class frmGesamtsicherheitenMenuNEU 'btnResetFilter ' Me.btnResetFilter.allowBorder = False - Me.btnResetFilter.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnResetFilter.BackColor = System.Drawing.Color.White Me.btnResetFilter.FlatAppearance.BorderSize = 0 Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -548,13 +559,12 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh Me.btnResetFilter.Location = New System.Drawing.Point(249, 24) Me.btnResetFilter.Name = "btnResetFilter" - Me.btnResetFilter.Size = New System.Drawing.Size(32, 33) + Me.btnResetFilter.Size = New System.Drawing.Size(62, 33) Me.btnResetFilter.TabIndex = 3 Me.btnResetFilter.UseVisualStyleBackColor = False ' 'txtSuchbegriff ' - Me.txtSuchbegriff.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28) Me.txtSuchbegriff.Name = "txtSuchbegriff" Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20) @@ -562,7 +572,6 @@ Partial Class frmGesamtsicherheitenMenuNEU ' 'chkOffen ' - Me.chkOffen.Anchor = System.Windows.Forms.AnchorStyles.Right Me.chkOffen.AutoSize = True Me.chkOffen.Checked = True Me.chkOffen.CheckState = System.Windows.Forms.CheckState.Checked @@ -570,7 +579,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.chkOffen.Location = New System.Drawing.Point(35, 210) Me.chkOffen.Name = "chkOffen" Me.chkOffen.Size = New System.Drawing.Size(120, 17) - Me.chkOffen.TabIndex = 26 + Me.chkOffen.TabIndex = 31 Me.chkOffen.Text = "nur offene anzeigen" Me.chkOffen.UseVisualStyleBackColor = True ' @@ -582,10 +591,10 @@ 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(492, 278) + Me.btnNeu.Location = New System.Drawing.Point(522, 278) Me.btnNeu.Name = "btnNeu" Me.btnNeu.Size = New System.Drawing.Size(75, 23) - Me.btnNeu.TabIndex = 33 + Me.btnNeu.TabIndex = 34 Me.btnNeu.Text = "Neu" Me.btnNeu.UseVisualStyleBackColor = False ' @@ -595,7 +604,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.Honeydew - Me.lblSaldo.Location = New System.Drawing.Point(368, 23) + Me.lblSaldo.Location = New System.Drawing.Point(398, 23) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(147, 24) Me.lblSaldo.TabIndex = 1 @@ -607,7 +616,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(369, 85) + Me.lblZollsatz.Location = New System.Drawing.Point(399, 85) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 9 @@ -619,7 +628,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(369, 58) + Me.lblReferenzwert.Location = New System.Drawing.Point(399, 58) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 6 @@ -637,27 +646,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(132, 22) Me.ExportCSVToolStripMenuItem.Text = "Export CSV" ' - 'btnOpenOver85Days - ' - Me.btnOpenOver85Days.allowBorder = False - Me.btnOpenOver85Days.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White - Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 - Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black - Me.btnOpenOver85Days.Location = New System.Drawing.Point(36, 244) - Me.btnOpenOver85Days.Name = "btnOpenOver85Days" - Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) - Me.btnOpenOver85Days.TabIndex = 27 - Me.btnOpenOver85Days.Text = "Über 85 Tage offen" - Me.btnOpenOver85Days.UseVisualStyleBackColor = False - Me.btnOpenOver85Days.Visible = False - ' 'frmGesamtsicherheitenMenuNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(576, 721) + Me.ClientSize = New System.Drawing.Size(606, 721) Me.Controls.Add(Me.dgvListe) Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 184acd6..e61d6df 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -105,7 +105,8 @@ Public Class frmGesamtsicherheitenMenuNEU - For Each row As DataGridViewRow In dgvListe.Rows + + For Each row As DataGridViewRow In dgvListe.Rows If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then dt.Rows.Add(row.Cells("gs_gsnr").Value, True) @@ -115,6 +116,13 @@ Public Class frmGesamtsicherheitenMenuNEU Next + 'Debug + 'For i As Integer = 0 To dt.Rows.Count - 1 + ' MsgBox("gs_nr: " & dt.Rows(i).Item("gs_gsnr").ToString & " " & "gs_isOpen: " & dt.Rows(i).Item("gs_isOpen").ToString) + 'Next + + + For Each row As DataGridViewRow In dgvListe.Rows If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index 41f25d6..e68643f 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -33,6 +33,11 @@ Partial Class frmGesamtsicherheitenNEU Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ClosedErzeugenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel2 = New System.Windows.Forms.Panel() + Me.pnlSummeGesPos = New System.Windows.Forms.Panel() + Me.txtPosAnzalPosGes = New System.Windows.Forms.TextBox() + Me.Label29 = New System.Windows.Forms.Label() + Me.Label28 = New System.Windows.Forms.Label() + Me.Label22 = New System.Windows.Forms.Label() Me.panOverlay = New System.Windows.Forms.Panel() Me.cboWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblWarenort = New System.Windows.Forms.Label() @@ -45,6 +50,11 @@ Partial Class frmGesamtsicherheitenNEU Me.Label16 = New System.Windows.Forms.Label() Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.pnlSummeGes = New System.Windows.Forms.Panel() + Me.txtAnzalPosGes = New System.Windows.Forms.TextBox() + Me.Label27 = New System.Windows.Forms.Label() + Me.Label24 = New System.Windows.Forms.Label() + Me.Label25 = New System.Windows.Forms.Label() Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblGestellungNr = New System.Windows.Forms.Label() @@ -52,7 +62,6 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosDate = New System.Windows.Forms.TextBox() Me.txtSicherheitTime = New System.Windows.Forms.TextBox() Me.txtSicherheitDate = New System.Windows.Forms.TextBox() - Me.btnSaveOben = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtPosSicherheitsbetrag = New System.Windows.Forms.TextBox() Me.txtPosWarenwert = New System.Windows.Forms.TextBox() Me.txtPositionenCRN = New System.Windows.Forms.TextBox() @@ -64,6 +73,8 @@ Partial Class frmGesamtsicherheitenNEU Me.lblReferenzwert = New System.Windows.Forms.Label() Me.lblSaldo = New System.Windows.Forms.Label() Me.panOben = New System.Windows.Forms.Panel() + Me.btnSaveDatetime = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.lblId = New System.Windows.Forms.Label() Me.txtZollsatzueberschreiben = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxZollsatzueberschreiben = New System.Windows.Forms.CheckBox() Me.btnNext = New System.Windows.Forms.Button() @@ -103,12 +114,17 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1 = New System.Windows.Forms.Label() Me.txtPosFreitext = New System.Windows.Forms.TextBox() Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox() - Me.lblId = New System.Windows.Forms.Label() + Me.txtWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel2.SuspendLayout() + Me.pnlSummeGesPos.SuspendLayout() Me.panOverlay.SuspendLayout() CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlSummeGes.SuspendLayout() Me.panOben.SuspendLayout() Me.Panel1.SuspendLayout() Me.SuspendLayout() @@ -149,7 +165,7 @@ Partial Class frmGesamtsicherheitenNEU 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(692, 486) + Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(689, 486) Me.dgvGesamtsicherheit.TabIndex = 0 ' 'ContextMenuStrip1 @@ -166,8 +182,10 @@ Partial Class frmGesamtsicherheitenNEU ' 'Panel2 ' + Me.Panel2.Controls.Add(Me.pnlSummeGesPos) Me.Panel2.Controls.Add(Me.panOverlay) Me.Panel2.Controls.Add(Me.dgvSicherheitsPos) + Me.Panel2.Controls.Add(Me.pnlSummeGes) Me.Panel2.Controls.Add(Me.dgvGesamtsicherheit) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 290) @@ -175,6 +193,58 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel2.Size = New System.Drawing.Size(1384, 486) Me.Panel2.TabIndex = 1 ' + 'pnlSummeGesPos + ' + Me.pnlSummeGesPos.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.pnlSummeGesPos.Controls.Add(Me.txtPosSicherheitsbGes) + Me.pnlSummeGesPos.Controls.Add(Me.txtPosWarenwertGes) + Me.pnlSummeGesPos.Controls.Add(Me.txtPosAnzalPosGes) + Me.pnlSummeGesPos.Controls.Add(Me.Label29) + Me.pnlSummeGesPos.Controls.Add(Me.Label28) + Me.pnlSummeGesPos.Controls.Add(Me.Label22) + Me.pnlSummeGesPos.Location = New System.Drawing.Point(692, 451) + Me.pnlSummeGesPos.Name = "pnlSummeGesPos" + Me.pnlSummeGesPos.Size = New System.Drawing.Size(692, 35) + Me.pnlSummeGesPos.TabIndex = 4 + ' + 'txtPosAnzalPosGes + ' + Me.txtPosAnzalPosGes.Location = New System.Drawing.Point(84, 10) + Me.txtPosAnzalPosGes.Name = "txtPosAnzalPosGes" + Me.txtPosAnzalPosGes.ReadOnly = True + Me.txtPosAnzalPosGes.Size = New System.Drawing.Size(53, 20) + Me.txtPosAnzalPosGes.TabIndex = 1 + ' + 'Label29 + ' + Me.Label29.AutoSize = True + Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label29.Location = New System.Drawing.Point(180, 13) + Me.Label29.Name = "Label29" + Me.Label29.Size = New System.Drawing.Size(120, 13) + Me.Label29.TabIndex = 2 + Me.Label29.Text = "Warentwert Summe:" + ' + 'Label28 + ' + Me.Label28.AutoSize = True + Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label28.Location = New System.Drawing.Point(426, 13) + Me.Label28.Name = "Label28" + Me.Label28.Size = New System.Drawing.Size(154, 13) + Me.Label28.TabIndex = 4 + Me.Label28.Text = "Sicherheitsbetrag Summe:" + ' + 'Label22 + ' + Me.Label22.AutoSize = True + Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label22.Location = New System.Drawing.Point(3, 13) + Me.Label22.Name = "Label22" + Me.Label22.Size = New System.Drawing.Size(74, 13) + Me.Label22.TabIndex = 0 + Me.Label22.Text = "Anzahl Pos:" + ' 'panOverlay ' Me.panOverlay.BackColor = System.Drawing.SystemColors.ButtonHighlight @@ -206,7 +276,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cboWarenort.MaxLength = 4 Me.cboWarenort.Name = "cboWarenort" Me.cboWarenort.Size = New System.Drawing.Size(186, 24) - Me.cboWarenort.TabIndex = 9 + Me.cboWarenort.TabIndex = 2 ' 'lblWarenort ' @@ -215,7 +285,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblWarenort.Location = New System.Drawing.Point(125, 68) Me.lblWarenort.Name = "lblWarenort" Me.lblWarenort.Size = New System.Drawing.Size(88, 20) - Me.lblWarenort.TabIndex = 8 + Me.lblWarenort.TabIndex = 1 Me.lblWarenort.Text = "Warenort:" ' 'cboFiliale @@ -230,7 +300,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cboFiliale.MaxLength = 4 Me.cboFiliale.Name = "cboFiliale" Me.cboFiliale.Size = New System.Drawing.Size(186, 24) - Me.cboFiliale.TabIndex = 2 + Me.cboFiliale.TabIndex = 4 ' 'btnSave ' @@ -242,7 +312,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnSave.Location = New System.Drawing.Point(424, 232) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(75, 23) - Me.btnSave.TabIndex = 7 + Me.btnSave.TabIndex = 9 Me.btnSave.Text = "Speichern" Me.btnSave.UseVisualStyleBackColor = False ' @@ -253,7 +323,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtLKWID.Margin = New System.Windows.Forms.Padding(0) Me.txtLKWID.Name = "txtLKWID" Me.txtLKWID.Size = New System.Drawing.Size(186, 24) - Me.txtLKWID.TabIndex = 6 + Me.txtLKWID.TabIndex = 8 ' 'txtAbfertNum ' @@ -262,7 +332,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtAbfertNum.Margin = New System.Windows.Forms.Padding(0) Me.txtAbfertNum.Name = "txtAbfertNum" Me.txtAbfertNum.Size = New System.Drawing.Size(186, 24) - Me.txtAbfertNum.TabIndex = 4 + Me.txtAbfertNum.TabIndex = 6 ' 'Label18 ' @@ -271,7 +341,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label18.Location = New System.Drawing.Point(173, 180) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(76, 20) - Me.Label18.TabIndex = 5 + Me.Label18.TabIndex = 7 Me.Label18.Text = "LKW-ID:" ' 'Label17 @@ -281,7 +351,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label17.Location = New System.Drawing.Point(68, 142) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(181, 20) - Me.Label17.TabIndex = 3 + Me.Label17.TabIndex = 5 Me.Label17.Text = "Abfertigungsnummer:" ' 'Label16 @@ -291,7 +361,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label16.Location = New System.Drawing.Point(126, 107) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(123, 20) - Me.Label16.TabIndex = 1 + Me.Label16.TabIndex = 3 Me.Label16.Text = "Filial-Nummer:" ' 'btnClosePanOverlay @@ -333,13 +403,65 @@ Partial Class frmGesamtsicherheitenNEU 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(692, 0) + Me.dgvSicherheitsPos.Location = New System.Drawing.Point(695, 0) Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos" Me.dgvSicherheitsPos.ReadOnly = True Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSicherheitsPos.Size = New System.Drawing.Size(692, 486) + Me.dgvSicherheitsPos.Size = New System.Drawing.Size(689, 486) Me.dgvSicherheitsPos.TabIndex = 1 ' + 'pnlSummeGes + ' + Me.pnlSummeGes.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.pnlSummeGes.Controls.Add(Me.txtSicherheitsbGes) + Me.pnlSummeGes.Controls.Add(Me.txtWarenwertGes) + Me.pnlSummeGes.Controls.Add(Me.txtAnzalPosGes) + Me.pnlSummeGes.Controls.Add(Me.Label27) + Me.pnlSummeGes.Controls.Add(Me.Label24) + Me.pnlSummeGes.Controls.Add(Me.Label25) + Me.pnlSummeGes.Location = New System.Drawing.Point(0, 451) + Me.pnlSummeGes.Name = "pnlSummeGes" + Me.pnlSummeGes.Size = New System.Drawing.Size(692, 35) + Me.pnlSummeGes.TabIndex = 3 + ' + 'txtAnzalPosGes + ' + Me.txtAnzalPosGes.Location = New System.Drawing.Point(89, 10) + Me.txtAnzalPosGes.Name = "txtAnzalPosGes" + Me.txtAnzalPosGes.ReadOnly = True + Me.txtAnzalPosGes.Size = New System.Drawing.Size(53, 20) + Me.txtAnzalPosGes.TabIndex = 1 + ' + 'Label27 + ' + Me.Label27.AutoSize = True + Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label27.Location = New System.Drawing.Point(406, 13) + Me.Label27.Name = "Label27" + Me.Label27.Size = New System.Drawing.Size(154, 13) + Me.Label27.TabIndex = 4 + Me.Label27.Text = "Sicherheitsbetrag Summe:" + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label24.Location = New System.Drawing.Point(9, 13) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(74, 13) + Me.Label24.TabIndex = 0 + Me.Label24.Text = "Anzahl Pos:" + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label25.Location = New System.Drawing.Point(156, 13) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(120, 13) + Me.Label25.TabIndex = 2 + Me.Label25.Text = "Warentwert Summe:" + ' 'btnAddPos ' Me.btnAddPos.allowBorder = False @@ -352,7 +474,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnAddPos.Location = New System.Drawing.Point(1348, 225) Me.btnAddPos.Name = "btnAddPos" Me.btnAddPos.Size = New System.Drawing.Size(24, 24) - Me.btnAddPos.TabIndex = 31 + Me.btnAddPos.TabIndex = 38 Me.btnAddPos.UseVisualStyleBackColor = False ' 'btnAddSicherheit @@ -367,7 +489,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnAddSicherheit.Location = New System.Drawing.Point(654, 205) Me.btnAddSicherheit.Name = "btnAddSicherheit" Me.btnAddSicherheit.Size = New System.Drawing.Size(24, 24) - Me.btnAddSicherheit.TabIndex = 30 + Me.btnAddSicherheit.TabIndex = 36 Me.btnAddSicherheit.UseVisualStyleBackColor = False ' 'lblGestellungNr @@ -379,7 +501,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblGestellungNr.Location = New System.Drawing.Point(23, 17) Me.lblGestellungNr.Name = "lblGestellungNr" Me.lblGestellungNr.Size = New System.Drawing.Size(171, 24) - Me.lblGestellungNr.TabIndex = 2 + Me.lblGestellungNr.TabIndex = 1 Me.lblGestellungNr.Text = "Gesamtsicherheit" ' 'txtPosTime @@ -389,7 +511,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosTime.Margin = New System.Windows.Forms.Padding(0) Me.txtPosTime.Name = "txtPosTime" Me.txtPosTime.Size = New System.Drawing.Size(55, 24) - Me.txtPosTime.TabIndex = 27 + Me.txtPosTime.TabIndex = 33 ' 'txtPosDate ' @@ -400,7 +522,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosDate.Margin = New System.Windows.Forms.Padding(0) Me.txtPosDate.Name = "txtPosDate" Me.txtPosDate.Size = New System.Drawing.Size(85, 24) - Me.txtPosDate.TabIndex = 26 + Me.txtPosDate.TabIndex = 32 ' 'txtSicherheitTime ' @@ -409,7 +531,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitTime.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitTime.Name = "txtSicherheitTime" Me.txtSicherheitTime.Size = New System.Drawing.Size(55, 24) - Me.txtSicherheitTime.TabIndex = 22 + Me.txtSicherheitTime.TabIndex = 28 ' 'txtSicherheitDate ' @@ -420,21 +542,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitDate.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitDate.Name = "txtSicherheitDate" Me.txtSicherheitDate.Size = New System.Drawing.Size(85, 24) - Me.txtSicherheitDate.TabIndex = 21 - ' - 'btnSaveOben - ' - Me.btnSaveOben.allowBorder = False - Me.btnSaveOben.BackColor = System.Drawing.Color.White - Me.btnSaveOben.FlatAppearance.BorderSize = 0 - Me.btnSaveOben.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSaveOben.ForeColor = System.Drawing.Color.Black - Me.btnSaveOben.Location = New System.Drawing.Point(12, 163) - Me.btnSaveOben.Name = "btnSaveOben" - Me.btnSaveOben.Size = New System.Drawing.Size(75, 23) - Me.btnSaveOben.TabIndex = 0 - Me.btnSaveOben.Text = "Speichern" - Me.btnSaveOben.UseVisualStyleBackColor = False + Me.txtSicherheitDate.TabIndex = 27 ' 'txtPosSicherheitsbetrag ' @@ -444,7 +552,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0) Me.txtPosSicherheitsbetrag.Name = "txtPosSicherheitsbetrag" Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(100, 24) - Me.txtPosSicherheitsbetrag.TabIndex = 29 + Me.txtPosSicherheitsbetrag.TabIndex = 35 ' 'txtPosWarenwert ' @@ -453,7 +561,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosWarenwert.Margin = New System.Windows.Forms.Padding(0) Me.txtPosWarenwert.Name = "txtPosWarenwert" Me.txtPosWarenwert.Size = New System.Drawing.Size(100, 24) - Me.txtPosWarenwert.TabIndex = 28 + Me.txtPosWarenwert.TabIndex = 34 ' 'txtPositionenCRN ' @@ -462,7 +570,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPositionenCRN.Margin = New System.Windows.Forms.Padding(0) Me.txtPositionenCRN.Name = "txtPositionenCRN" Me.txtPositionenCRN.Size = New System.Drawing.Size(205, 24) - Me.txtPositionenCRN.TabIndex = 25 + Me.txtPositionenCRN.TabIndex = 31 ' 'txtSicherheitSicherheitsbetrag ' @@ -472,7 +580,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitSicherheitsbetrag.Name = "txtSicherheitSicherheitsbetrag" Me.txtSicherheitSicherheitsbetrag.Size = New System.Drawing.Size(100, 24) - Me.txtSicherheitSicherheitsbetrag.TabIndex = 24 + Me.txtSicherheitSicherheitsbetrag.TabIndex = 30 ' 'txtSicherheitWarenwert ' @@ -481,7 +589,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitWarenwert.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitWarenwert.Name = "txtSicherheitWarenwert" Me.txtSicherheitWarenwert.Size = New System.Drawing.Size(100, 24) - Me.txtSicherheitWarenwert.TabIndex = 23 + Me.txtSicherheitWarenwert.TabIndex = 29 ' 'txtSicherheitATBNr ' @@ -490,7 +598,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitATBNr.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitATBNr.Name = "txtSicherheitATBNr" Me.txtSicherheitATBNr.Size = New System.Drawing.Size(205, 24) - Me.txtSicherheitATBNr.TabIndex = 19 + Me.txtSicherheitATBNr.TabIndex = 25 ' 'btn_resetSearch ' @@ -503,7 +611,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btn_resetSearch.Location = New System.Drawing.Point(813, 8) Me.btn_resetSearch.Name = "btn_resetSearch" Me.btn_resetSearch.Size = New System.Drawing.Size(32, 33) - Me.btn_resetSearch.TabIndex = 3 + Me.btn_resetSearch.TabIndex = 4 Me.btn_resetSearch.UseVisualStyleBackColor = False ' 'lblZollsatz @@ -515,7 +623,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblZollsatz.Location = New System.Drawing.Point(724, 139) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) - Me.lblZollsatz.TabIndex = 4 + Me.lblZollsatz.TabIndex = 7 Me.lblZollsatz.Text = "Zollsatz: 12%" ' 'lblReferenzwert @@ -527,7 +635,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblReferenzwert.Location = New System.Drawing.Point(724, 123) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) - Me.lblReferenzwert.TabIndex = 1 + Me.lblReferenzwert.TabIndex = 6 Me.lblReferenzwert.Text = "Referenzwert: €80.000" ' 'lblSaldo @@ -545,6 +653,7 @@ Partial Class frmGesamtsicherheitenNEU 'panOben ' Me.panOben.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.panOben.Controls.Add(Me.btnSaveDatetime) Me.panOben.Controls.Add(Me.lblId) Me.panOben.Controls.Add(Me.txtZollsatzueberschreiben) Me.panOben.Controls.Add(Me.cbxZollsatzueberschreiben) @@ -585,7 +694,6 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Controls.Add(Me.txtPosDate) Me.panOben.Controls.Add(Me.txtSicherheitTime) Me.panOben.Controls.Add(Me.txtSicherheitDate) - Me.panOben.Controls.Add(Me.btnSaveOben) Me.panOben.Controls.Add(Me.txtPosSicherheitsbetrag) Me.panOben.Controls.Add(Me.txtPosWarenwert) Me.panOben.Controls.Add(Me.txtPositionenCRN) @@ -602,6 +710,32 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Size = New System.Drawing.Size(1384, 290) Me.panOben.TabIndex = 0 ' + 'btnSaveDatetime + ' + Me.btnSaveDatetime.allowBorder = False + Me.btnSaveDatetime.BackColor = System.Drawing.Color.White + Me.btnSaveDatetime.FlatAppearance.BorderSize = 0 + Me.btnSaveDatetime.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSaveDatetime.ForeColor = System.Drawing.Color.Black + Me.btnSaveDatetime.Location = New System.Drawing.Point(12, 165) + Me.btnSaveDatetime.Name = "btnSaveDatetime" + Me.btnSaveDatetime.Size = New System.Drawing.Size(75, 23) + Me.btnSaveDatetime.TabIndex = 11 + Me.btnSaveDatetime.Text = "speichern" + Me.btnSaveDatetime.UseVisualStyleBackColor = False + ' + 'lblId + ' + Me.lblId.Anchor = System.Windows.Forms.AnchorStyles.Right + 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(1229, 9) + Me.lblId.Name = "lblId" + Me.lblId.Size = New System.Drawing.Size(29, 24) + Me.lblId.TabIndex = 0 + Me.lblId.Text = "ID" + ' 'txtZollsatzueberschreiben ' Me.txtZollsatzueberschreiben._DateTimeOnly = False @@ -624,7 +758,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing Me.txtZollsatzueberschreiben.Name = "txtZollsatzueberschreiben" Me.txtZollsatzueberschreiben.Size = New System.Drawing.Size(30, 20) - Me.txtZollsatzueberschreiben.TabIndex = 45 + Me.txtZollsatzueberschreiben.TabIndex = 10 ' 'cbxZollsatzueberschreiben ' @@ -633,7 +767,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(725, 158) Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben" Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17) - Me.cbxZollsatzueberschreiben.TabIndex = 37 + Me.cbxZollsatzueberschreiben.TabIndex = 9 Me.cbxZollsatzueberschreiben.Text = "Zollsatz überschreiben" Me.cbxZollsatzueberschreiben.UseVisualStyleBackColor = True ' @@ -646,7 +780,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnNext.Location = New System.Drawing.Point(1309, 111) Me.btnNext.Name = "btnNext" Me.btnNext.Size = New System.Drawing.Size(75, 47) - Me.btnNext.TabIndex = 37 + Me.btnNext.TabIndex = 8 Me.btnNext.Text = ">>" Me.btnNext.UseVisualStyleBackColor = False ' @@ -659,7 +793,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lbloffenerSaldo.Location = New System.Drawing.Point(238, 108) Me.lbloffenerSaldo.Name = "lbloffenerSaldo" Me.lbloffenerSaldo.Size = New System.Drawing.Size(146, 24) - Me.lbloffenerSaldo.TabIndex = 44 + Me.lbloffenerSaldo.TabIndex = 4 Me.lbloffenerSaldo.Text = "offener Saldo: " ' 'btnPrev @@ -671,7 +805,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnPrev.Location = New System.Drawing.Point(12, 108) Me.btnPrev.Name = "btnPrev" Me.btnPrev.Size = New System.Drawing.Size(75, 47) - Me.btnPrev.TabIndex = 36 + Me.btnPrev.TabIndex = 3 Me.btnPrev.Text = "<<" Me.btnPrev.UseVisualStyleBackColor = False ' @@ -693,7 +827,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosNr.Margin = New System.Windows.Forms.Padding(0) Me.txtPosNr.Name = "txtPosNr" Me.txtPosNr.Size = New System.Drawing.Size(37, 24) - Me.txtPosNr.TabIndex = 43 + Me.txtPosNr.TabIndex = 47 ' 'Panel1 ' @@ -709,7 +843,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Location = New System.Drawing.Point(0, 44) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1384, 61) - Me.Panel1.TabIndex = 10 + Me.Panel1.TabIndex = 2 ' 'cbx_offene ' @@ -717,7 +851,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cbx_offene.Location = New System.Drawing.Point(12, 19) Me.cbx_offene.Name = "cbx_offene" Me.cbx_offene.Size = New System.Drawing.Size(120, 17) - Me.cbx_offene.TabIndex = 36 + Me.cbx_offene.TabIndex = 3 Me.cbx_offene.Text = "nur offene anzeigen" Me.cbx_offene.UseVisualStyleBackColor = True ' @@ -729,7 +863,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnSuche.Location = New System.Drawing.Point(893, 3) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) - Me.btnSuche.TabIndex = 35 + Me.btnSuche.TabIndex = 7 Me.btnSuche.Text = "Suche starten" Me.btnSuche.UseVisualStyleBackColor = True ' @@ -742,7 +876,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label23.Location = New System.Drawing.Point(207, -13) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(24, 15) - Me.Label23.TabIndex = 13 + Me.Label23.TabIndex = 0 Me.Label23.Text = "Bis" ' 'cbx_Suche_Warenort @@ -757,7 +891,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cbx_Suche_Warenort.MaxLength = 4 Me.cbx_Suche_Warenort.Name = "cbx_Suche_Warenort" Me.cbx_Suche_Warenort.Size = New System.Drawing.Size(95, 24) - Me.cbx_Suche_Warenort.TabIndex = 9 + Me.cbx_Suche_Warenort.TabIndex = 6 ' 'Label19 ' @@ -766,7 +900,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label19.Location = New System.Drawing.Point(657, 3) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(63, 13) - Me.Label19.TabIndex = 8 + Me.Label19.TabIndex = 2 Me.Label19.Text = "Warenort:" ' 'txt_Suche @@ -776,7 +910,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txt_Suche.Margin = New System.Windows.Forms.Padding(0) Me.txt_Suche.Name = "txt_Suche" Me.txt_Suche.Size = New System.Drawing.Size(243, 24) - Me.txt_Suche.TabIndex = 4 + Me.txt_Suche.TabIndex = 5 ' 'Label21 ' @@ -785,7 +919,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label21.Location = New System.Drawing.Point(376, 3) Me.Label21.Name = "Label21" Me.Label21.Size = New System.Drawing.Size(47, 13) - Me.Label21.TabIndex = 3 + Me.Label21.TabIndex = 1 Me.Label21.Text = "Suche:" ' 'btnDeletePos @@ -800,7 +934,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnDeletePos.Location = New System.Drawing.Point(1348, 195) Me.btnDeletePos.Name = "btnDeletePos" Me.btnDeletePos.Size = New System.Drawing.Size(24, 24) - Me.btnDeletePos.TabIndex = 7 + Me.btnDeletePos.TabIndex = 24 Me.btnDeletePos.UseVisualStyleBackColor = False Me.btnDeletePos.Visible = False ' @@ -816,7 +950,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnDeleteSicherheit.Location = New System.Drawing.Point(654, 175) Me.btnDeleteSicherheit.Name = "btnDeleteSicherheit" Me.btnDeleteSicherheit.Size = New System.Drawing.Size(24, 24) - Me.btnDeleteSicherheit.TabIndex = 6 + Me.btnDeleteSicherheit.TabIndex = 12 Me.btnDeleteSicherheit.UseVisualStyleBackColor = False Me.btnDeleteSicherheit.Visible = False ' @@ -832,7 +966,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnUpdatePos.Location = New System.Drawing.Point(1348, 257) Me.btnUpdatePos.Name = "btnUpdatePos" Me.btnUpdatePos.Size = New System.Drawing.Size(24, 24) - Me.btnUpdatePos.TabIndex = 37 + Me.btnUpdatePos.TabIndex = 49 Me.btnUpdatePos.UseVisualStyleBackColor = False Me.btnUpdatePos.Visible = False ' @@ -848,7 +982,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnUpdateSicherheit.Location = New System.Drawing.Point(654, 237) Me.btnUpdateSicherheit.Name = "btnUpdateSicherheit" Me.btnUpdateSicherheit.Size = New System.Drawing.Size(24, 24) - Me.btnUpdateSicherheit.TabIndex = 35 + Me.btnUpdateSicherheit.TabIndex = 41 Me.btnUpdateSicherheit.UseVisualStyleBackColor = False Me.btnUpdateSicherheit.Visible = False ' @@ -859,7 +993,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label15.Location = New System.Drawing.Point(242, 191) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(25, 13) - Me.Label15.TabIndex = 9 + Me.Label15.TabIndex = 14 Me.Label15.Text = "Pos" ' 'txtAnzahlPos @@ -869,7 +1003,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtAnzahlPos.Margin = New System.Windows.Forms.Padding(0) Me.txtAnzahlPos.Name = "txtAnzahlPos" Me.txtAnzahlPos.Size = New System.Drawing.Size(35, 24) - Me.txtAnzahlPos.TabIndex = 20 + Me.txtAnzahlPos.TabIndex = 26 ' 'Label14 ' @@ -879,7 +1013,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label14.Location = New System.Drawing.Point(194, 237) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(59, 13) - Me.Label14.TabIndex = 33 + Me.Label14.TabIndex = 39 Me.Label14.Text = "19% EUST" ' 'txtSicherheitEust @@ -890,7 +1024,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitEust.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitEust.Name = "txtSicherheitEust" Me.txtSicherheitEust.Size = New System.Drawing.Size(100, 24) - Me.txtSicherheitEust.TabIndex = 39 + Me.txtSicherheitEust.TabIndex = 45 ' 'Label13 ' @@ -900,7 +1034,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label13.Location = New System.Drawing.Point(76, 234) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(73, 13) - Me.Label13.TabIndex = 32 + Me.Label13.TabIndex = 37 Me.Label13.Text = "A.TR Ja/Nein" ' 'cboSicherheitATR @@ -912,7 +1046,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cboSicherheitATR.Location = New System.Drawing.Point(74, 250) Me.cboSicherheitATR.Name = "cboSicherheitATR" Me.cboSicherheitATR.Size = New System.Drawing.Size(120, 26) - Me.cboSicherheitATR.TabIndex = 38 + Me.cboSicherheitATR.TabIndex = 44 ' 'Label7 ' @@ -921,7 +1055,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label7.Location = New System.Drawing.Point(1014, 237) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(41, 13) - Me.Label7.TabIndex = 36 + Me.Label7.TabIndex = 43 Me.Label7.Text = "Freitext" ' 'Label8 @@ -931,7 +1065,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label8.Location = New System.Drawing.Point(1075, 191) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(59, 13) - Me.Label8.TabIndex = 17 + Me.Label8.TabIndex = 22 Me.Label8.Text = "Warenwert" ' 'Label9 @@ -941,7 +1075,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label9.Location = New System.Drawing.Point(1169, 191) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(89, 13) - Me.Label9.TabIndex = 18 + Me.Label9.TabIndex = 23 Me.Label9.Text = "Sicherheitsbetrag" ' 'Label10 @@ -951,7 +1085,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label10.Location = New System.Drawing.Point(1003, 191) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(40, 13) - Me.Label10.TabIndex = 16 + Me.Label10.TabIndex = 21 Me.Label10.Text = "Uhrzeit" ' 'Label11 @@ -961,7 +1095,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label11.Location = New System.Drawing.Point(918, 191) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(38, 13) - Me.Label11.TabIndex = 15 + Me.Label11.TabIndex = 20 Me.Label11.Text = "Datum" ' 'Label12 @@ -971,7 +1105,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label12.Location = New System.Drawing.Point(765, 191) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(64, 13) - Me.Label12.TabIndex = 14 + Me.Label12.TabIndex = 19 Me.Label12.Text = "ATC / MRN" ' 'Label6 @@ -981,7 +1115,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label6.Location = New System.Drawing.Point(364, 237) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(41, 13) - Me.Label6.TabIndex = 34 + Me.Label6.TabIndex = 40 Me.Label6.Text = "Freitext" ' 'Label5 @@ -991,7 +1125,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label5.Location = New System.Drawing.Point(426, 191) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(59, 13) - Me.Label5.TabIndex = 12 + Me.Label5.TabIndex = 17 Me.Label5.Text = "Warenwert" ' 'Label4 @@ -1001,7 +1135,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label4.Location = New System.Drawing.Point(520, 191) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(89, 13) - Me.Label4.TabIndex = 13 + Me.Label4.TabIndex = 18 Me.Label4.Text = "Sicherheitsbetrag" ' 'Label3 @@ -1011,7 +1145,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label3.Location = New System.Drawing.Point(365, 191) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(40, 13) - Me.Label3.TabIndex = 11 + Me.Label3.TabIndex = 16 Me.Label3.Text = "Uhrzeit" ' 'Label2 @@ -1021,7 +1155,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label2.Location = New System.Drawing.Point(274, 191) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(38, 13) - Me.Label2.TabIndex = 10 + Me.Label2.TabIndex = 15 Me.Label2.Text = "Datum" ' 'Label1 @@ -1031,7 +1165,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1.Location = New System.Drawing.Point(76, 191) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(70, 13) - Me.Label1.TabIndex = 8 + Me.Label1.TabIndex = 13 Me.Label1.Text = "ATB Nummer" ' 'txtPosFreitext @@ -1041,7 +1175,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosFreitext.Margin = New System.Windows.Forms.Padding(0) Me.txtPosFreitext.Name = "txtPosFreitext" Me.txtPosFreitext.Size = New System.Drawing.Size(255, 24) - Me.txtPosFreitext.TabIndex = 41 + Me.txtPosFreitext.TabIndex = 48 ' 'txtSicherheitFreitext ' @@ -1050,19 +1184,103 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitFreitext.Margin = New System.Windows.Forms.Padding(0) Me.txtSicherheitFreitext.Name = "txtSicherheitFreitext" Me.txtSicherheitFreitext.Size = New System.Drawing.Size(256, 24) - Me.txtSicherheitFreitext.TabIndex = 40 + Me.txtSicherheitFreitext.TabIndex = 46 ' - 'lblId + 'txtWarenwertGes ' - Me.lblId.Anchor = System.Windows.Forms.AnchorStyles.Right - 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(1229, 9) - Me.lblId.Name = "lblId" - Me.lblId.Size = New System.Drawing.Size(29, 24) - Me.lblId.TabIndex = 46 - Me.lblId.Text = "ID" + Me.txtWarenwertGes._DateTimeOnly = False + Me.txtWarenwertGes._numbersOnly = False + Me.txtWarenwertGes._numbersOnlyKommastellen = "" + Me.txtWarenwertGes._numbersOnlyTrennzeichen = False + Me.txtWarenwertGes._Prozent = False + Me.txtWarenwertGes._ShortDateNew = False + Me.txtWarenwertGes._ShortDateOnly = False + Me.txtWarenwertGes._TimeOnly = False + Me.txtWarenwertGes._TimeOnly_Seconds = False + Me.txtWarenwertGes._value = "" + Me.txtWarenwertGes._Waehrung = True + Me.txtWarenwertGes._WaehrungZeichen = True + Me.txtWarenwertGes.ForeColor = System.Drawing.Color.Black + Me.txtWarenwertGes.Location = New System.Drawing.Point(277, 10) + Me.txtWarenwertGes.MaxLineLength = -1 + Me.txtWarenwertGes.MaxLines_Warning = "" + Me.txtWarenwertGes.MaxLines_Warning_Label = Nothing + Me.txtWarenwertGes.Name = "txtWarenwertGes" + Me.txtWarenwertGes.ReadOnly = True + Me.txtWarenwertGes.Size = New System.Drawing.Size(100, 20) + Me.txtWarenwertGes.TabIndex = 3 + ' + 'txtSicherheitsbGes + ' + Me.txtSicherheitsbGes._DateTimeOnly = False + Me.txtSicherheitsbGes._numbersOnly = False + Me.txtSicherheitsbGes._numbersOnlyKommastellen = "" + Me.txtSicherheitsbGes._numbersOnlyTrennzeichen = False + Me.txtSicherheitsbGes._Prozent = False + Me.txtSicherheitsbGes._ShortDateNew = False + Me.txtSicherheitsbGes._ShortDateOnly = False + Me.txtSicherheitsbGes._TimeOnly = False + Me.txtSicherheitsbGes._TimeOnly_Seconds = False + Me.txtSicherheitsbGes._value = "" + Me.txtSicherheitsbGes._Waehrung = True + Me.txtSicherheitsbGes._WaehrungZeichen = True + Me.txtSicherheitsbGes.ForeColor = System.Drawing.Color.Black + Me.txtSicherheitsbGes.Location = New System.Drawing.Point(565, 10) + Me.txtSicherheitsbGes.MaxLineLength = -1 + Me.txtSicherheitsbGes.MaxLines_Warning = "" + Me.txtSicherheitsbGes.MaxLines_Warning_Label = Nothing + Me.txtSicherheitsbGes.Name = "txtSicherheitsbGes" + Me.txtSicherheitsbGes.ReadOnly = True + Me.txtSicherheitsbGes.Size = New System.Drawing.Size(100, 20) + Me.txtSicherheitsbGes.TabIndex = 5 + ' + 'txtPosWarenwertGes + ' + Me.txtPosWarenwertGes._DateTimeOnly = False + Me.txtPosWarenwertGes._numbersOnly = False + Me.txtPosWarenwertGes._numbersOnlyKommastellen = "" + Me.txtPosWarenwertGes._numbersOnlyTrennzeichen = False + Me.txtPosWarenwertGes._Prozent = False + Me.txtPosWarenwertGes._ShortDateNew = False + Me.txtPosWarenwertGes._ShortDateOnly = False + Me.txtPosWarenwertGes._TimeOnly = False + Me.txtPosWarenwertGes._TimeOnly_Seconds = False + Me.txtPosWarenwertGes._value = "" + Me.txtPosWarenwertGes._Waehrung = True + Me.txtPosWarenwertGes._WaehrungZeichen = True + Me.txtPosWarenwertGes.ForeColor = System.Drawing.Color.Black + Me.txtPosWarenwertGes.Location = New System.Drawing.Point(306, 10) + Me.txtPosWarenwertGes.MaxLineLength = -1 + Me.txtPosWarenwertGes.MaxLines_Warning = "" + Me.txtPosWarenwertGes.MaxLines_Warning_Label = Nothing + Me.txtPosWarenwertGes.Name = "txtPosWarenwertGes" + Me.txtPosWarenwertGes.ReadOnly = True + Me.txtPosWarenwertGes.Size = New System.Drawing.Size(100, 20) + Me.txtPosWarenwertGes.TabIndex = 3 + ' + 'txtPosSicherheitsbGes + ' + Me.txtPosSicherheitsbGes._DateTimeOnly = False + Me.txtPosSicherheitsbGes._numbersOnly = False + Me.txtPosSicherheitsbGes._numbersOnlyKommastellen = "" + Me.txtPosSicherheitsbGes._numbersOnlyTrennzeichen = False + Me.txtPosSicherheitsbGes._Prozent = False + Me.txtPosSicherheitsbGes._ShortDateNew = False + Me.txtPosSicherheitsbGes._ShortDateOnly = False + Me.txtPosSicherheitsbGes._TimeOnly = False + Me.txtPosSicherheitsbGes._TimeOnly_Seconds = False + Me.txtPosSicherheitsbGes._value = "" + Me.txtPosSicherheitsbGes._Waehrung = True + Me.txtPosSicherheitsbGes._WaehrungZeichen = True + Me.txtPosSicherheitsbGes.ForeColor = System.Drawing.Color.Black + Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(589, 10) + Me.txtPosSicherheitsbGes.MaxLineLength = -1 + Me.txtPosSicherheitsbGes.MaxLines_Warning = "" + Me.txtPosSicherheitsbGes.MaxLines_Warning_Label = Nothing + Me.txtPosSicherheitsbGes.Name = "txtPosSicherheitsbGes" + Me.txtPosSicherheitsbGes.ReadOnly = True + Me.txtPosSicherheitsbGes.Size = New System.Drawing.Size(100, 20) + Me.txtPosSicherheitsbGes.TabIndex = 5 ' 'frmGesamtsicherheitenNEU ' @@ -1080,9 +1298,13 @@ Partial Class frmGesamtsicherheitenNEU CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) Me.Panel2.ResumeLayout(False) + Me.pnlSummeGesPos.ResumeLayout(False) + Me.pnlSummeGesPos.PerformLayout() Me.panOverlay.ResumeLayout(False) Me.panOverlay.PerformLayout() CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlSummeGes.ResumeLayout(False) + Me.pnlSummeGes.PerformLayout() Me.panOben.ResumeLayout(False) Me.panOben.PerformLayout() Me.Panel1.ResumeLayout(False) @@ -1101,7 +1323,6 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents txtPosDate As TextBox Friend WithEvents txtSicherheitTime As TextBox Friend WithEvents txtSicherheitDate As TextBox - Friend WithEvents btnSaveOben As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents txtPosSicherheitsbetrag As TextBox Friend WithEvents txtPosWarenwert As TextBox Friend WithEvents txtPositionenCRN As TextBox @@ -1166,4 +1387,19 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents txtZollsatzueberschreiben As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxZollsatzueberschreiben As CheckBox Friend WithEvents lblId As Label + Friend WithEvents btnSaveDatetime As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents pnlSummeGes As Panel + Friend WithEvents Label25 As Label + Friend WithEvents Label22 As Label + Friend WithEvents Label29 As Label + Friend WithEvents Label28 As Label + Friend WithEvents Label27 As Label + Friend WithEvents Label24 As Label + Friend WithEvents txtPosAnzalPosGes As TextBox + Friend WithEvents txtAnzalPosGes As TextBox + Private WithEvents pnlSummeGesPos As Panel + Friend WithEvents txtWarenwertGes As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSicherheitsbGes As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPosWarenwertGes As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPosSicherheitsbGes As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 9038add..e0ffed5 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -1,4 +1,5 @@ Imports System.Reflection +Imports System.Web.UI.WebControls Imports System.Web.UI.WebControls.Expressions Imports DocumentFormat.OpenXml.Bibliography Imports DocumentFormat.OpenXml.Presentation @@ -99,7 +100,7 @@ Public Class frmGesamtsicherheitenNEU 'Dim addtosqlstring As String = "" - Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & "order by [gs_gsId]" + Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & "order by [gs_gsId]" dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,) dgvGesamtsicherheit.LOAD() @@ -108,8 +109,8 @@ Public Class frmGesamtsicherheitenNEU If dgvGesamtsicherheit.Columns.Count > 0 Then With dgvGesamtsicherheit .RowHeadersWidth = 10 - .Columns("gs_gsId").Visible = True - .Columns("gs_gsnr").Visible = True + .Columns("gs_gsId").Visible = False + .Columns("gs_gsnr").Visible = False .Columns("gs_warenwert").DefaultCellStyle.Format = "c" .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c" .Columns("gs_saldo").DefaultCellStyle.Format = "c" @@ -118,24 +119,33 @@ Public Class frmGesamtsicherheitenNEU Case True .Columns("gs_ATBNr").HeaderText = "ATB" .Columns("gs_atr").HeaderText = "MRN" + .Columns("gs_atr").Visible = True .Columns("gs_atr").Width = 33 .Columns("gs_ust").Width = 69 + .Columns("gs_ust").HeaderText = "Ust" Case Else .Columns("gs_ATBNr").HeaderText = "ATB" End Select .Columns("gs_ATBNr").Width = 146 - .Columns("gs_posNr").Width = 20 + .Columns("gs_posNr").Width = 35 + .Columns("gs_posNr").HeaderText = "Pos#" .Columns("gs_datum").Width = 95 + .Columns("gs_datum").HeaderText = "Datum" .Columns("gs_warenwert").Width = 100 + .Columns("gs_warenwert").HeaderText = "Warenwert" .Columns("gs_saldo").Width = 100 + .Columns("gs_saldo").HeaderText = "Saldo" - .Columns("gs_sicherheitsbetrag").Width = 100 + .Columns("gs_sicherheitsbetrag").Width = 85 + .Columns("gs_sicherheitsbetrag").HeaderText = "S-Betrag" .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill End With End If + calcGesamtsummen() + End Sub @@ -178,7 +188,10 @@ Public Class frmGesamtsicherheitenNEU If dgvSicherheitsPos.Columns.Count > 0 Then With dgvSicherheitsPos .RowHeadersWidth = 10 - .Columns("gsp_gsId").Visible = True + .Columns("gsp_gspPosId").Width = 35 + .Columns("gsp_gspPosId").HeaderText = "Pos#" + .Columns("gsp_gsId").Visible = False + .Columns("gsp_gsnr").Visible = False .Columns("gsp_warenwert").DefaultCellStyle.Format = "c" .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c" '.Columns("gs_saldo").DefaultCellStyle.Format = "c" @@ -187,13 +200,17 @@ Public Class frmGesamtsicherheitenNEU Case True .Columns("gsp_ATCNr").HeaderText = "ATC / MRN" Case Else - .Columns("gsp_ATCNr").HeaderText = "CRN" + .Columns("gsp_ATCNr").HeaderText = "CRN / MRN" End Select .Columns("gsp_ATCNr").Width = 120 - .Columns("gsp_erstellungsdatum").Width = 140 + .Columns("gsp_erstellungsdatum").Width = 100 + .Columns("gsp_erstellungsdatum").HeaderText = "Datum" .Columns("gsp_warenwert").Width = 100 - .Columns("gsp_sicherheitsbetrag").Width = 100 - .Columns("gsp_freitext").Width = 220 + .Columns("gsp_warenwert").HeaderText = "Warenwert" + .Columns("gsp_sicherheitsbetrag").Width = 85 + .Columns("gsp_sicherheitsbetrag").HeaderText = "S-Betrag" + .Columns("gsp_freitext").Width = 110 + .Columns("gsp_freitext").HeaderText = "Freitext" End With End If @@ -288,18 +305,6 @@ Public Class frmGesamtsicherheitenNEU End Sub - Private Sub btnSaveOben_Click(sender As Object, e As EventArgs) Handles btnSaveOben.Click - Try - Dim a As Date = Date.ParseExact(txtSicherheitDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - Dim b As Date = Date.ParseExact(txtSicherheitTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo) - - Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute) - MsgBox(ab.ToString) - Catch ex As Exception - MsgBox(ex.Message) - End Try - End Sub - Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDate.GotFocus, txtPosDate.GotFocus, txtSicherheitTime.GotFocus, txtPosTime.GotFocus Select Case sender.name Case "txtSicherheitDate" @@ -865,8 +870,8 @@ Public Class frmGesamtsicherheitenNEU lbloffenerSaldo.Text = "offener S-Saldo: " Dim offernerSB As Double = Me.calcOffenerSicherheitsbetrag() - If offernerSB > 0 Then - lbloffenerSaldo.Text &= Me.calcOffenerSicherheitsbetrag().ToString + If offernerSB <> 0 Then + lbloffenerSaldo.Text &= Math.Round(calcOffenerSicherheitsbetrag(), 2).ToString isOpen = True Else lbloffenerSaldo.Text &= "0" @@ -874,9 +879,6 @@ Public Class frmGesamtsicherheitenNEU End If End Sub - Private Sub rearangePosNr() - - End Sub Private Function setPrevAndNextGesIDAllOpen() @@ -894,13 +896,20 @@ Public Class frmGesamtsicherheitenNEU prevGessicherheitID = -1 ' no prev Sicherheit Else prevGessicherheitID = onlyOpenDT.Rows(i - 1).Item("gs_gsnr") + End If + + 'MsgBox("prevOPENGessicherheitID " & prevGessicherheitID) + If i = onlyOpenDT.Rows.Count - 1 Then nextGessicherheitID = -1 ' no next Sicherheit Else nextGessicherheitID = onlyOpenDT.Rows(i + 1).Item("gs_gsnr") + End If + 'MsgBox("nextOPENGessicherheitID " & nextGessicherheitID) + End If Next @@ -917,6 +926,7 @@ Public Class frmGesamtsicherheitenNEU For j As Integer = i To 0 If dt.Rows(j).Item("gs_isOpen") Then prevGessicherheitID = dt.Rows(j).Item("gs_gsnr") + 'MsgBox("prevGessicherheitID " & prevGessicherheitID) Exit For End If Next @@ -929,6 +939,7 @@ Public Class frmGesamtsicherheitenNEU For k As Integer = i To dt.Rows.Count - 1 If dt.Rows(k).Item("gs_isOpen") Then nextGessicherheitID = dt.Rows(k).Item("gs_gsnr") + 'MsgBox("nextGessicherheitID " & nextGessicherheitID) Exit For End If Next @@ -948,11 +959,16 @@ Public Class frmGesamtsicherheitenNEU For i As Integer = 0 To dt.Rows.Count - 1 If dt.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then - prevGessicherheitID = i - 1 - nextGessicherheitID = i + 1 + prevGessicherheitID = dt.Rows(i).Item("gs_gsnr") - 1 + + nextGessicherheitID = dt.Rows(i).Item("gs_gsnr") + 1 + If i = 0 Then prevGessicherheitID = -1 ' no prev Sicherheit If i = dt.Rows.Count - 1 Then nextGessicherheitID = -1 ' ' no next Sicherheit + + 'MsgBox("prevGessicherheitID " & prevGessicherheitID) + 'MsgBox("nextGessicherheitID " & nextGessicherheitID) Return i End If @@ -999,14 +1015,14 @@ Public Class frmGesamtsicherheitenNEU Private Sub initPrevNextButtons() If nextGessicherheitID = -1 Then - btnNext.Enabled = False + btnNext.Enabled = True Else btnNext.Enabled = True End If If prevGessicherheitID = -1 Then - btnPrev.Enabled = False + btnPrev.Enabled = True Else btnPrev.Enabled = True End If @@ -1026,8 +1042,57 @@ Public Class frmGesamtsicherheitenNEU Private Sub txtZollsatzueberschreiben_TextChanged(sender As Object, e As EventArgs) Handles txtZollsatzueberschreiben.TextChanged lblZollsatz.Text = "Zollsatz: " & txtZollsatzueberschreiben.Text & "%" - + Zollsatz = CDbl(setNullToZero(txtZollsatzueberschreiben.Text)) ZollsatzMulti = CDbl(setNullToZero(txtZollsatzueberschreiben.Text)) / 100 End Sub + + Private Sub btnSaveDatetime_Click(sender As Object, e As EventArgs) Handles btnSaveDatetime.Click + Try + Dim a As Date = Date.ParseExact(txtSicherheitDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) + Dim b As Date = Date.ParseExact(txtSicherheitTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo) + + Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute) + MsgBox(ab.ToString) + Catch ex As Exception + MsgBox(ex.Message) + End Try + 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) + + + 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 + + End Sub + + + + End Class diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 9782cc8..4db325f 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -362,7 +362,6 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem() - Me.DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.Top.SuspendLayout() @@ -802,7 +801,7 @@ Partial Class frmHauptfenster ' 'FunktionenToolStripMenuItem ' - Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem}) + Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20) Me.FunktionenToolStripMenuItem.Text = "Funktionen" @@ -3458,12 +3457,6 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem21.Text = "GELB" ' - 'DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem - ' - Me.DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Name = "DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem" - Me.DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Size = New System.Drawing.Size(383, 22) - Me.DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Text = "DE | Gesamtsicherheit Verag GmbH - NEU" - ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3865,5 +3858,4 @@ Partial Class frmHauptfenster Friend WithEvents ToolStripMenuItem21 As ToolStripMenuItem Friend WithEvents ALLEToolStripMenuItem As ToolStripMenuItem Friend WithEvents RoutenverwaltungToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index ee4d842..0e3457f 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -3992,25 +3992,25 @@ Public Class frmHauptfenster End Sub Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragAGToolStripMenuItem.Click - Dim frm As New frmGesamtsicherheitenMenu + Dim frm As New frmGesamtsicherheitenMenuNEU frm.Standort = "VERAG AG" frm.Show() End Sub Private Sub DEGesamtsicherheitVeragGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHToolStripMenuItem.Click - Dim frm As New frmGesamtsicherheitenMenu + Dim frm As New frmGesamtsicherheitenMenuNEU frm.Standort = "Verag GmbH" frm.Show() End Sub Private Sub ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Click - Dim frm As New frmGesamtsicherheitenMenu + Dim frm As New frmGesamtsicherheitenMenuNEU frm.Standort = "IMEX" frm.Show() End Sub Private Sub ATGesamtsicherheitVeragCSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragCSToolStripMenuItem.Click - Dim frm As New frmGesamtsicherheitenMenu + Dim frm As New frmGesamtsicherheitenMenuNEU frm.Standort = "Verag CS" frm.Show() End Sub @@ -4175,11 +4175,6 @@ Public Class frmHauptfenster meineAviso_anzeigen() End Sub - Private Sub DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Click - Dim frm As New frmGesamtsicherheitenMenuNEU - frm.Standort = "VERAG GmbH" - frm.Show() - End Sub End Class Public Class AvisoStatusFunctions From 6340c9d055f165fb0163e0f4574bdfd751a852e1 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 28 Oct 2022 14:18:26 +0200 Subject: [PATCH 3/3] Gesamtsicherheiten_CSVExport --- Aviso/Aviso.vbproj | 1 + .../frmGesamtsicherheitenMenuNEU.Designer.vb | 21 ++++++++++--------- Aviso/frmGesamtsicherheitenMenuNEU.vb | 4 ++++ Aviso/frmGesamtsicherheitenNEU.vb | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 532619e..132e611 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1126,6 +1126,7 @@ frmGesamtsicherheiten.vb + Designer frmGesamtsicherheitenMenu.vb diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 78d6d01..c7cceb8 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -76,6 +76,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvListe.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvListe.ContextMenuStrip = Me.ContextMenuStrip1 Me.dgvListe.Location = New System.Drawing.Point(-3, 307) Me.dgvListe.Name = "dgvListe" Me.dgvListe.ReadOnly = True @@ -123,7 +124,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(606, 313) + Me.Panel1.Size = New System.Drawing.Size(606, 309) Me.Panel1.TabIndex = 0 ' 'btnOpenOver85Days @@ -438,7 +439,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.FlatButton2.FlatAppearance.BorderSize = 0 Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Location = New System.Drawing.Point(513, 193) + Me.FlatButton2.Location = New System.Drawing.Point(513, 191) Me.FlatButton2.Name = "FlatButton2" Me.FlatButton2.Size = New System.Drawing.Size(81, 20) Me.FlatButton2.TabIndex = 30 @@ -476,7 +477,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtbis._WaehrungZeichen = True Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtbis.ForeColor = System.Drawing.Color.Black - Me.txtbis.Location = New System.Drawing.Point(513, 169) + Me.txtbis.Location = New System.Drawing.Point(513, 167) Me.txtbis.MaxLineLength = -1 Me.txtbis.MaxLines_Warning = "" Me.txtbis.MaxLines_Warning_Label = Nothing @@ -502,7 +503,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.txtVon._WaehrungZeichen = True Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(510, 126) + Me.txtVon.Location = New System.Drawing.Point(510, 124) Me.txtVon.MaxLineLength = -1 Me.txtVon.MaxLines_Warning = "" Me.txtVon.MaxLines_Warning_Label = Nothing @@ -518,7 +519,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label3.ForeColor = System.Drawing.Color.Honeydew - Me.Label3.Location = New System.Drawing.Point(510, 150) + Me.Label3.Location = New System.Drawing.Point(510, 148) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(24, 15) Me.Label3.TabIndex = 22 @@ -531,7 +532,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label2.ForeColor = System.Drawing.Color.Honeydew - Me.Label2.Location = New System.Drawing.Point(510, 107) + Me.Label2.Location = New System.Drawing.Point(510, 105) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(28, 15) Me.Label2.TabIndex = 10 @@ -591,7 +592,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(522, 278) + Me.btnNeu.Location = New System.Drawing.Point(522, 276) Me.btnNeu.Name = "btnNeu" Me.btnNeu.Size = New System.Drawing.Size(75, 23) Me.btnNeu.TabIndex = 34 @@ -604,7 +605,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.Honeydew - Me.lblSaldo.Location = New System.Drawing.Point(398, 23) + Me.lblSaldo.Location = New System.Drawing.Point(398, 21) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(147, 24) Me.lblSaldo.TabIndex = 1 @@ -616,7 +617,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(399, 85) + Me.lblZollsatz.Location = New System.Drawing.Point(399, 83) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 9 @@ -628,7 +629,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(399, 58) + Me.lblReferenzwert.Location = New System.Drawing.Point(399, 56) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 6 diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index e61d6df..225211b 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -254,6 +254,7 @@ Public Class frmGesamtsicherheitenMenuNEU 'in2 = """" & firstin & """" & ";" in2 = firstin & ";" out &= Replace(in2, vbCrLf, "##vbCrLf##") + out = Replace(out, "€", "") Catch ex As Exception out &= "" End Try @@ -429,4 +430,7 @@ Public Class frmGesamtsicherheitenMenuNEU End Function + Private Sub ExportCSVToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ExportCSVToolStripMenuItem.Click + csvexport(dgvListe) + End Sub End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index e0ffed5..3bfae8e 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -380,7 +380,7 @@ Public Class frmGesamtsicherheitenNEU End With attachPosNrToExistingATB = True indexGsId = OPEN.SAVEOBJECT() - If count = 1 Then MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") ': indexGsId = OPEN.SAVEOBJECT() + If count = 1 Then MsgBox("INFO: Dieser Eintrag wurde bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") ': indexGsId = OPEN.SAVEOBJECT() End Select