From 5647343b76da2330bd23d0a75df0fdcaf3ffe02d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 19 Oct 2022 09:46:29 +0200 Subject: [PATCH 1/3] Feature_GesamtsicherheitenNEU --- Aviso/Aviso.vbproj | 2 +- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 275 +++++++++++---------- Aviso/frmGesamtsicherheitenNEU.vb | 191 +++++++------- 4 files changed, 226 insertions(+), 246 deletions(-) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index a5403a2..6691d31 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -101,7 +101,7 @@ false - x64 + x86 bin\Debug\ diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index fdd3692..7d145a6 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/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index 22f9f7d..a86ce1d 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -44,7 +44,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Label17 = New System.Windows.Forms.Label() Me.Label16 = New System.Windows.Forms.Label() Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.dgvGesamtsicherheitCRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvGesamtsicherheitPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.btnAddClose = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAddOpen = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblGestellungNr = New System.Windows.Forms.Label() @@ -59,12 +59,13 @@ Partial Class frmGesamtsicherheitenNEU Me.txtMRNSicherheitsbetrag = New System.Windows.Forms.TextBox() Me.txtMRNWarenwert = New System.Windows.Forms.TextBox() Me.txtMRN = New System.Windows.Forms.TextBox() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btn_resetSearch = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblZollsatz = New System.Windows.Forms.Label() Me.lblReferenzwert = New System.Windows.Forms.Label() Me.lblSaldo = New System.Windows.Forms.Label() Me.panOben = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnSuche = New System.Windows.Forms.Button() Me.Label26 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() @@ -83,12 +84,12 @@ Partial Class frmGesamtsicherheitenNEU Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label23 = New System.Windows.Forms.Label() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label19 = New System.Windows.Forms.Label() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.txtLKW = New System.Windows.Forms.TextBox() + Me.txtAbfNr = New System.Windows.Forms.TextBox() Me.Label20 = New System.Windows.Forms.Label() Me.Label21 = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label() @@ -116,12 +117,11 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1 = New System.Windows.Forms.Label() Me.txtFreitextClose = New System.Windows.Forms.TextBox() Me.txtFreitextOpen = New System.Windows.Forms.TextBox() - Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel2.SuspendLayout() Me.panOverlay.SuspendLayout() - CType(Me.dgvGesamtsicherheitCRN, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvGesamtsicherheitPositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.panOben.SuspendLayout() Me.Panel1.SuspendLayout() Me.SuspendLayout() @@ -180,7 +180,7 @@ Partial Class frmGesamtsicherheitenNEU 'Panel2 ' Me.Panel2.Controls.Add(Me.panOverlay) - Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitCRN) + Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitPositionen) Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitMRN) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 290) @@ -323,11 +323,11 @@ Partial Class frmGesamtsicherheitenNEU Me.btnClosePanOverlay.TabIndex = 0 Me.btnClosePanOverlay.UseVisualStyleBackColor = False ' - 'dgvGesamtsicherheitCRN + 'dgvGesamtsicherheitPositionen ' - Me.dgvGesamtsicherheitCRN.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvGesamtsicherheitCRN.AllowUserToAddRows = False - Me.dgvGesamtsicherheitCRN.AllowUserToDeleteRows = False + Me.dgvGesamtsicherheitPositionen.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvGesamtsicherheitPositionen.AllowUserToAddRows = False + Me.dgvGesamtsicherheitPositionen.AllowUserToDeleteRows = False DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -335,8 +335,8 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvGesamtsicherheitCRN.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 - Me.dgvGesamtsicherheitCRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvGesamtsicherheitPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvGesamtsicherheitPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -344,14 +344,14 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvGesamtsicherheitCRN.DefaultCellStyle = DataGridViewCellStyle5 - Me.dgvGesamtsicherheitCRN.Dock = System.Windows.Forms.DockStyle.Right - Me.dgvGesamtsicherheitCRN.Location = New System.Drawing.Point(692, 0) - Me.dgvGesamtsicherheitCRN.Name = "dgvGesamtsicherheitCRN" - Me.dgvGesamtsicherheitCRN.ReadOnly = True - Me.dgvGesamtsicherheitCRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvGesamtsicherheitCRN.Size = New System.Drawing.Size(692, 486) - Me.dgvGesamtsicherheitCRN.TabIndex = 1 + Me.dgvGesamtsicherheitPositionen.DefaultCellStyle = DataGridViewCellStyle5 + Me.dgvGesamtsicherheitPositionen.Dock = System.Windows.Forms.DockStyle.Right + Me.dgvGesamtsicherheitPositionen.Location = New System.Drawing.Point(692, 0) + Me.dgvGesamtsicherheitPositionen.Name = "dgvGesamtsicherheitPositionen" + Me.dgvGesamtsicherheitPositionen.ReadOnly = True + Me.dgvGesamtsicherheitPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvGesamtsicherheitPositionen.Size = New System.Drawing.Size(692, 486) + Me.dgvGesamtsicherheitPositionen.TabIndex = 1 ' 'btnAddClose ' @@ -362,7 +362,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnAddClose.FlatAppearance.BorderSize = 0 Me.btnAddClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAddClose.ForeColor = System.Drawing.Color.Black - Me.btnAddClose.Location = New System.Drawing.Point(1348, 104) + Me.btnAddClose.Location = New System.Drawing.Point(1348, 225) Me.btnAddClose.Name = "btnAddClose" Me.btnAddClose.Size = New System.Drawing.Size(24, 24) Me.btnAddClose.TabIndex = 31 @@ -503,19 +503,19 @@ Partial Class frmGesamtsicherheitenNEU Me.txtMRN.Size = New System.Drawing.Size(205, 24) Me.txtMRN.TabIndex = 19 ' - 'FlatButton1 + 'btn_resetSearch ' - Me.FlatButton1.allowBorder = False - 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(1340, 15) - Me.FlatButton1.Name = "FlatButton1" - Me.FlatButton1.Size = New System.Drawing.Size(32, 33) - Me.FlatButton1.TabIndex = 3 - Me.FlatButton1.UseVisualStyleBackColor = False + Me.btn_resetSearch.allowBorder = False + Me.btn_resetSearch.BackColor = System.Drawing.Color.White + Me.btn_resetSearch.FlatAppearance.BorderSize = 0 + Me.btn_resetSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_resetSearch.ForeColor = System.Drawing.Color.Black + Me.btn_resetSearch.Image = Global.AVISO.My.Resources.Resources.refresh + Me.btn_resetSearch.Location = New System.Drawing.Point(354, 28) + Me.btn_resetSearch.Name = "btn_resetSearch" + Me.btn_resetSearch.Size = New System.Drawing.Size(32, 33) + Me.btn_resetSearch.TabIndex = 3 + Me.btn_resetSearch.UseVisualStyleBackColor = False ' 'lblZollsatz ' @@ -595,7 +595,6 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Controls.Add(Me.txtMRNSicherheitsbetrag) Me.panOben.Controls.Add(Me.txtMRNWarenwert) Me.panOben.Controls.Add(Me.txtMRN) - Me.panOben.Controls.Add(Me.FlatButton1) Me.panOben.Controls.Add(Me.lblZollsatz) Me.panOben.Controls.Add(Me.lblReferenzwert) Me.panOben.Controls.Add(Me.lblSaldo) @@ -628,27 +627,54 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Controls.Add(Me.DateTimePicker1) Me.Panel1.Controls.Add(Me.btnSucheStarten) Me.Panel1.Controls.Add(Me.Label23) - Me.Panel1.Controls.Add(Me.MyComboBox1) + Me.Panel1.Controls.Add(Me.cbxWarenort) Me.Panel1.Controls.Add(Me.Label19) - Me.Panel1.Controls.Add(Me.MyComboBox2) - Me.Panel1.Controls.Add(Me.FlatButton2) - Me.Panel1.Controls.Add(Me.TextBox1) - Me.Panel1.Controls.Add(Me.TextBox2) + Me.Panel1.Controls.Add(Me.cbxFiliale) + Me.Panel1.Controls.Add(Me.btnNeu) + Me.Panel1.Controls.Add(Me.txtLKW) + Me.Panel1.Controls.Add(Me.txtAbfNr) Me.Panel1.Controls.Add(Me.Label20) Me.Panel1.Controls.Add(Me.Label21) Me.Panel1.Controls.Add(Me.Label22) + Me.Panel1.Controls.Add(Me.btn_resetSearch) Me.Panel1.Location = New System.Drawing.Point(0, 44) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1316, 97) + Me.Panel1.Size = New System.Drawing.Size(1384, 97) Me.Panel1.TabIndex = 10 Me.Panel1.Visible = False ' + 'txtDatBis + ' + Me.txtDatBis._DateTimeOnly = False + Me.txtDatBis._numbersOnly = False + Me.txtDatBis._numbersOnlyKommastellen = "" + Me.txtDatBis._numbersOnlyTrennzeichen = True + Me.txtDatBis._Prozent = False + Me.txtDatBis._ShortDateNew = False + Me.txtDatBis._ShortDateOnly = True + Me.txtDatBis._TimeOnly = False + Me.txtDatBis._TimeOnly_Seconds = False + Me.txtDatBis._value = "" + Me.txtDatBis._Waehrung = False + Me.txtDatBis._WaehrungZeichen = True + 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(53, 63) + 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 = 36 + ' 'btnSuche ' Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(921, 5) + Me.btnSuche.Location = New System.Drawing.Point(414, 19) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) Me.btnSuche.TabIndex = 35 @@ -870,12 +896,13 @@ Partial Class frmGesamtsicherheitenNEU 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(1194, 60) + Me.btnSucheStarten.Location = New System.Drawing.Point(1262, 60) Me.btnSucheStarten.Name = "btnSucheStarten" Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) Me.btnSucheStarten.TabIndex = 17 Me.btnSucheStarten.Text = "Suche starten" Me.btnSucheStarten.UseVisualStyleBackColor = False + Me.btnSucheStarten.Visible = False ' 'Label23 ' @@ -883,87 +910,87 @@ Partial Class frmGesamtsicherheitenNEU Me.Label23.AutoSize = True Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label23.ForeColor = System.Drawing.Color.Honeydew - Me.Label23.Location = New System.Drawing.Point(139, 5) + Me.Label23.Location = New System.Drawing.Point(207, 5) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(24, 15) Me.Label23.TabIndex = 13 Me.Label23.Text = "Bis" ' - 'MyComboBox1 + 'cbxWarenort ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.DropDownWidth = 300 - Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(336, 13) - Me.MyComboBox1.MaxLength = 4 - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(95, 24) - Me.MyComboBox1.TabIndex = 9 + Me.cbxWarenort._allowedValuesFreiText = Nothing + Me.cbxWarenort._allowFreiText = False + Me.cbxWarenort._value = "" + Me.cbxWarenort.DropDownWidth = 300 + Me.cbxWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxWarenort.FormattingEnabled = True + Me.cbxWarenort.Location = New System.Drawing.Point(663, 29) + Me.cbxWarenort.MaxLength = 4 + Me.cbxWarenort.Name = "cbxWarenort" + Me.cbxWarenort.Size = New System.Drawing.Size(95, 24) + Me.cbxWarenort.TabIndex = 9 ' 'Label19 ' Me.Label19.AutoSize = True Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label19.Location = New System.Drawing.Point(333, 0) + Me.Label19.Location = New System.Drawing.Point(660, 16) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(63, 13) Me.Label19.TabIndex = 8 Me.Label19.Text = "Warenort:" ' - 'MyComboBox2 + 'cbxFiliale ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.DropDownWidth = 300 - Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(456, 16) - Me.MyComboBox2.MaxLength = 4 - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(95, 21) - Me.MyComboBox2.TabIndex = 2 + Me.cbxFiliale._allowedValuesFreiText = Nothing + Me.cbxFiliale._allowFreiText = False + Me.cbxFiliale._value = "" + Me.cbxFiliale.DropDownWidth = 300 + Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxFiliale.FormattingEnabled = True + Me.cbxFiliale.Location = New System.Drawing.Point(783, 32) + Me.cbxFiliale.MaxLength = 4 + Me.cbxFiliale.Name = "cbxFiliale" + Me.cbxFiliale.Size = New System.Drawing.Size(95, 21) + Me.cbxFiliale.TabIndex = 2 ' - 'FlatButton2 + 'btnNeu ' - Me.FlatButton2.allowBorder = False - Me.FlatButton2.BackColor = System.Drawing.Color.Gainsboro - 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(1194, 16) - Me.FlatButton2.Name = "FlatButton2" - Me.FlatButton2.Size = New System.Drawing.Size(75, 23) - Me.FlatButton2.TabIndex = 7 - Me.FlatButton2.Text = "Speichern" - Me.FlatButton2.UseVisualStyleBackColor = False + Me.btnNeu.allowBorder = False + Me.btnNeu.BackColor = System.Drawing.Color.Gainsboro + 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(1156, 31) + Me.btnNeu.Name = "btnNeu" + Me.btnNeu.Size = New System.Drawing.Size(75, 23) + Me.btnNeu.TabIndex = 7 + Me.btnNeu.Text = "Neu" + Me.btnNeu.UseVisualStyleBackColor = False ' - 'TextBox1 + 'txtLKW ' - Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox1.Location = New System.Drawing.Point(728, 16) - Me.TextBox1.Margin = New System.Windows.Forms.Padding(0) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(79, 24) - Me.TextBox1.TabIndex = 6 + Me.txtLKW.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtLKW.Location = New System.Drawing.Point(1055, 32) + Me.txtLKW.Margin = New System.Windows.Forms.Padding(0) + Me.txtLKW.Name = "txtLKW" + Me.txtLKW.Size = New System.Drawing.Size(79, 24) + Me.txtLKW.TabIndex = 6 ' - 'TextBox2 + 'txtAbfNr ' - Me.TextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox2.Location = New System.Drawing.Point(571, 16) - Me.TextBox2.Margin = New System.Windows.Forms.Padding(0) - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(122, 24) - Me.TextBox2.TabIndex = 4 + Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAbfNr.Location = New System.Drawing.Point(898, 32) + Me.txtAbfNr.Margin = New System.Windows.Forms.Padding(0) + Me.txtAbfNr.Name = "txtAbfNr" + Me.txtAbfNr.Size = New System.Drawing.Size(122, 24) + Me.txtAbfNr.TabIndex = 4 ' 'Label20 ' Me.Label20.AutoSize = True Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label20.Location = New System.Drawing.Point(725, 0) + Me.Label20.Location = New System.Drawing.Point(1052, 16) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(55, 13) Me.Label20.TabIndex = 5 @@ -973,7 +1000,7 @@ Partial Class frmGesamtsicherheitenNEU ' Me.Label21.AutoSize = True Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(568, 0) + Me.Label21.Location = New System.Drawing.Point(895, 16) Me.Label21.Name = "Label21" Me.Label21.Size = New System.Drawing.Size(125, 13) Me.Label21.TabIndex = 3 @@ -983,7 +1010,7 @@ Partial Class frmGesamtsicherheitenNEU ' 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(453, 0) + Me.Label22.Location = New System.Drawing.Point(780, 16) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(44, 13) Me.Label22.TabIndex = 1 @@ -998,7 +1025,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnDeleteClose.FlatAppearance.BorderSize = 0 Me.btnDeleteClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDeleteClose.ForeColor = System.Drawing.Color.Black - Me.btnDeleteClose.Location = New System.Drawing.Point(1348, 74) + Me.btnDeleteClose.Location = New System.Drawing.Point(1348, 195) Me.btnDeleteClose.Name = "btnDeleteClose" Me.btnDeleteClose.Size = New System.Drawing.Size(24, 24) Me.btnDeleteClose.TabIndex = 7 @@ -1030,7 +1057,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnUpdateClose.FlatAppearance.BorderSize = 0 Me.btnUpdateClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnUpdateClose.ForeColor = System.Drawing.Color.Black - Me.btnUpdateClose.Location = New System.Drawing.Point(1348, 136) + Me.btnUpdateClose.Location = New System.Drawing.Point(1348, 257) Me.btnUpdateClose.Name = "btnUpdateClose" Me.btnUpdateClose.Size = New System.Drawing.Size(24, 24) Me.btnUpdateClose.TabIndex = 37 @@ -1253,32 +1280,6 @@ Partial Class frmGesamtsicherheitenNEU Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24) Me.txtFreitextOpen.TabIndex = 40 ' - 'txtDatBis - ' - Me.txtDatBis._DateTimeOnly = False - Me.txtDatBis._numbersOnly = False - Me.txtDatBis._numbersOnlyKommastellen = "" - Me.txtDatBis._numbersOnlyTrennzeichen = True - Me.txtDatBis._Prozent = False - Me.txtDatBis._ShortDateNew = False - Me.txtDatBis._ShortDateOnly = True - Me.txtDatBis._TimeOnly = False - Me.txtDatBis._TimeOnly_Seconds = False - Me.txtDatBis._value = "" - Me.txtDatBis._Waehrung = False - Me.txtDatBis._WaehrungZeichen = True - 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(53, 63) - 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 = 36 - ' 'frmGesamtsicherheitenNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1297,7 +1298,7 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel2.ResumeLayout(False) Me.panOverlay.ResumeLayout(False) Me.panOverlay.PerformLayout() - CType(Me.dgvGesamtsicherheitCRN, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvGesamtsicherheitPositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.panOben.ResumeLayout(False) Me.panOben.PerformLayout() Me.Panel1.ResumeLayout(False) @@ -1308,7 +1309,7 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents dgvGesamtsicherheitMRN As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents Panel2 As Panel - Friend WithEvents dgvGesamtsicherheitCRN As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents dgvGesamtsicherheitPositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents btnAddClose As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btnAddOpen As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblGestellungNr As Label @@ -1323,7 +1324,7 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents txtMRNSicherheitsbetrag As TextBox Friend WithEvents txtMRNWarenwert As TextBox Friend WithEvents txtMRN As TextBox - Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btn_resetSearch As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblZollsatz As Label Friend WithEvents lblReferenzwert As Label Friend WithEvents lblSaldo As Label @@ -1366,12 +1367,12 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents ClosedErzeugenToolStripMenuItem As ToolStripMenuItem Friend WithEvents Panel1 As Panel - Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label19 As Label - Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents TextBox1 As TextBox - Friend WithEvents TextBox2 As TextBox + Friend WithEvents cbxFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents txtLKW As TextBox + Friend WithEvents txtAbfNr As TextBox Friend WithEvents Label20 As Label Friend WithEvents Label21 As Label Friend WithEvents Label22 As Label diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 1a967c3..7d86c17 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -6,14 +6,23 @@ Imports VERAG_PROG_ALLGEMEIN Public Class frmGesamtsicherheitenNEU + + + Dim openopened As cSicherheiten + + Dim closedopened As cSicherheiten + + Dim sicherheiten As cSicherheiten + Property GesSichRef As cGesamtsicherheitsReferenz + Property GesSichPos As cGesamtsicherheitsPositionen Public Property gessicherheitID As Integer Public Property datum As DateTime = Nothing - Property GesSichRef As cGesamtsicherheitsReferenz - Property GesSichPos As cGesamtssicherheitsPositionen Property Standort As String = "" Public ZollsatzMulti As Double = 0 + Public Zollsatz As Double + Public Saldo As Integer = 0 Public Neu As Boolean = False @@ -26,26 +35,21 @@ Public Class frmGesamtsicherheitenNEU Public warenortID As String - Dim openopened As cSicherheiten - - Dim closedopened As cSicherheiten - - Dim sicherheiten As cSicherheiten - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) + Dim srcTAG As Date = CDate(Now.ToShortDateString) Dim JAHR As Date = CDate("01.01." & Now.Year) - Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click + Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs) Handles btn_resetSearch.Click Dim dgv As String = "" For Each c As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns dgv &= c.Width & c.HeaderText & vbCrLf Next - ' MsgBox(dgv) + LoadDGV() GesSichRef.LOAD() LoadStandort() @@ -58,23 +62,24 @@ Public Class frmGesamtsicherheitenNEU If setNullToZero(gessicherheitID) = "" Or Neu = True Then panOben.Enabled = False : panOben.Enabled = False - 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) - cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True) + 'panOverlay.Visible = True + cbxFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) + cbxFiliale.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 Else LoadDGV() End If LoadStandort() cboATR.Enabled = GesSichRef.gsr_ATR + Zollsatz = GesSichRef.gsr_zollsatz Me.Text = "Gesamtsicherheit " & Standort - frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitCRN) + frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitPositionen) End Sub Public Sub LoadDGV() - 'lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString("N") + lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString() lblGestellungNr.Text = "" Dim sqladd1 As String = "" @@ -83,24 +88,25 @@ Public Class frmGesamtsicherheitenNEU Dim addtosqlstring As String = "" - Dim SQLStringMRN As String = "select [gs_gsId], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "' and [gs_art] = 'Open' order by [gs_datum]" + Dim SQLStringMRN As String = "select [gs_gsId], [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]" dgvGesamtsicherheitMRN.SET_SQL(SQLStringMRN, "AVISO", ,) dgvGesamtsicherheitMRN.LOAD() - Dim SQLStringCRN As String = "select [gs_gsId], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo], [gs_freitext] from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "' and [gs_art] = 'Close' order by [gs_datum]" - dgvGesamtsicherheitCRN.SET_SQL(SQLStringCRN, "AVISO", ,) - dgvGesamtsicherheitCRN.LOAD() + 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] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gessicherheitID & "' order by [gsp_gspPosId]" + dgvGesamtsicherheitPositionen.SET_SQL(SQLStringCRN, "AVISO", ,) + dgvGesamtsicherheitPositionen.LOAD() Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'" Dim dt As New DataTable dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) If dt.Rows.Count > 0 Then - 'Me.GesamtsichNr = dt.Rows(0).Item("GesamtsichNr") + Me.LKWID = setNullToZero(dt.Rows(0).Item("gs_LKWID")) Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr")) Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr")) Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort")) + If Me.LKWID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWID & " " 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 & " " @@ -134,15 +140,13 @@ Public Class frmGesamtsicherheitenNEU .Columns("gs_sicherheitsbetrag").Width = 100 .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill End With - ' For Each col As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns - 'col.Width = 120 - 'Next + End If - If dgvGesamtsicherheitCRN.Columns.Count > 0 Then - With dgvGesamtsicherheitCRN + If dgvGesamtsicherheitPositionen.Columns.Count > 0 Then + With dgvGesamtsicherheitPositionen .RowHeadersWidth = 10 - .Columns("gs_gsId").Visible = False + .Columns("gsp_gsId").Visible = False .Columns("gs_warenwert").DefaultCellStyle.Format = "c" .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c" .Columns("gs_saldo").DefaultCellStyle.Format = "c" @@ -159,9 +163,7 @@ Public Class frmGesamtsicherheitenNEU .Columns("gs_sicherheitsbetrag").Width = 100 .Columns("gs_freitext").Width = 220 End With - 'For Each col As DataGridViewColumn In dgvGesamtsicherheitCRN.Columns - ' col.Width = 120 - 'Next + End If @@ -169,13 +171,7 @@ Public Class frmGesamtsicherheitenNEU Public Sub LoadStandort() - 'Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & Standort & "'" - 'Dim dt As New DataTable - 'dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) - 'Zollsatz = dt.Rows(0).Item("Zollsatz") - 'Referenzwert = dt.Rows(0).Item("Referenzwert") - 'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N") lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString() lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%" ZollsatzMulti = GesSichRef.gsr_zollsatz / 100 @@ -260,83 +256,68 @@ Public Class frmGesamtsicherheitenNEU Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click Try - If Integer.Parse(setNullToZero(txtPos.Text)) > 1 Then - Dim limit As Integer = Integer.Parse(setNullToZero(txtPos.Text)) + Dim limit As Integer = Integer.Parse(setNullToZero(txtPos.Text)) - For count As Integer = 1 To limit + Dim OPEN As New cSicherheiten() + + With OPEN + .gs_ATBNr = txtMRN.Text + .gs_posNr = Integer.Parse(setNullToZero(txtPos.Text)) + .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) + .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") + .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") + .gs_standort = Me.Standort + .gs_art = "OPEN" + .gs_gsNr = Me.gessicherheitID + .gs_erstellungsdatum = Me.datum + .gs_freitext = Me.txtFreitextOpen.Text + .gs_saldo = GesSichRef.gsr_Saldo + .gs_atr = setNullToZero(cboATR.SelectedItem) + setEnviromentDataToObject(OPEN, Me) + End With + + + For count As Integer = 1 To limit If (count > 1) Then txtMRNWarenwert.Text = 0 - Dim OPENWithMultiplePosNr As New cSicherheiten() - With OPENWithMultiplePosNr - .gs_ATBNr = txtMRN.Text - .gs_posNr = count - .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) - .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") - .gs_standort = Me.Standort - .gs_art = "OPEN" - .gs_gsNr = Me.gessicherheitID - .gs_erstellungsdatum = Me.datum - .gs_freitext = Me.txtFreitextOpen.Text - .gs_saldo = GesSichRef.gsr_Saldo - .gs_atr = setNullToZero(cboATR.SelectedItem) - setEnviromentDataToObject(OPENWithMultiplePosNr, Me) - End With + Dim OPENPos As New cGesamtsicherheitsPositionen() - 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 - - Next - - AfterButton() - - Else - - 'Dim OPEN As New cSicherheiten(Me) - Dim OPEN As New cSicherheiten() - - With OPEN - .gs_ATBNr = txtMRN.Text - .gs_posNr = Integer.Parse(setNullToZero(txtPos.Text)) - .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) - .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") - .gs_standort = Me.Standort - .gs_art = "OPEN" - .gs_gsNr = Me.gessicherheitID - .gs_erstellungsdatum = Me.datum - .gs_freitext = Me.txtFreitextOpen.Text - .gs_saldo = GesSichRef.gsr_Saldo - .gs_atr = setNullToZero(cboATR.SelectedItem) - setEnviromentDataToObject(OPEN, Me) + With OPENPos + .gsp_gsId = OPEN.gs_gsId + .gsp_gspPosId = count + .gsp_warenwert = 0 + .gsp_sicherheitsbetrag = 0 + .gsp_freitext = "" + .gsp_filialenNr = OPEN.gs_filialenNr + .gsp_art = "OPEN" + .gsp_abfertigungsNr = "" + .gsp_avisoId = "" + .gsp_ust = OPEN.gs_ust + .gsp_ATCNr = "" + .gsp_MRNNr = "" End With - If Neu = True Then OPEN.gs_gsNr = AddNewGesamtSichNr() + If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr() Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID) Case "Neu" OPEN.SAVE() Case Else - MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE() + If (count > 1) Then + OPEN.SAVE() + Else + MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE() + End If + End Select + Next AfterButton() - End If + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -494,7 +475,6 @@ Public Class frmGesamtsicherheitenNEU Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitMRN.CurrentRow.Cells("gs_gsId").Value) - 'Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value) txtMRN.Text = Sicherh.gs_ATBNr txtPos.Text = Sicherh.gs_posNr @@ -550,10 +530,9 @@ Public Class frmGesamtsicherheitenNEU AfterButton() End Sub - Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitCRN.CellDoubleClick + Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitPositionen.CellDoubleClick - Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value) - 'Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value) + Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitPositionen.CurrentRow.Cells("gs_gsId").Value) txtCRN.Text = Sicherh.gs_ATBNr txtCRNWarenwert.Text = Sicherh.gs_warenwert @@ -639,18 +618,12 @@ Public Class frmGesamtsicherheitenNEU DateTimePicker1.Value = MONAT DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1) Case "Jahr" - ' If cbxGeschaftsjahr.Checked Then - 'DateTimePicker1.Value = JAHR.AddMonths(1) - ' DateTimePicker2.Value = JAHR.AddYears(1).AddMonths(1).AddDays(-1) - ' Else + DateTimePicker1.Value = JAHR DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) 'End If Case "Tag" - ' If cbxGeschaftsjahr.Checked Then - 'DateTimePicker1.Value = JAHR.AddMonths(1) - ' DateTimePicker2.Value = JAHR.AddYears(1).AddMonths(1).AddDays(-1) - ' Else + DateTimePicker1.Value = srcTAG DateTimePicker2.Value = srcTAG If srcTAG = Now.ToShortDateString Then @@ -699,6 +672,12 @@ Public Class frmGesamtsicherheitenNEU txtDatBis._value = CDate(sender.value).ToShortDateString End Sub + Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles btnNeu.Click + End Sub + + Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click + + End Sub End Class From b67e780cb73979e6e1dbcf50ee64e80b3bdf674d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 19 Oct 2022 17:04:36 +0200 Subject: [PATCH 2/3] Feature_Gesamtsicherheiten --- Aviso/Aviso.vbproj | 13 +- Aviso/My Project/Application.Designer.vb | 2 +- Aviso/frmGesamtsicherheitenMenu.vb | 4 - Aviso/frmGesamtsicherheitenNEU.Designer.vb | 612 ++++++++++----------- Aviso/frmGesamtsicherheitenNEU.vb | 535 +++++++++++------- Aviso/frmHauptfenster.Designer.vb | 477 ++++++++-------- Aviso/frmHauptfenster.vb | 6 + 7 files changed, 892 insertions(+), 757 deletions(-) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 6691d31..304bf68 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -101,7 +101,7 @@ false - x86 + x64 bin\Debug\ @@ -126,7 +126,8 @@ ..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll - + + False ..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.dll @@ -316,6 +317,10 @@ ..\..\..\dll\ThoughtWorks.QRCode.dll + + False + ..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll + @@ -1368,10 +1373,6 @@ {289bcd77-bc00-4ba1-95ed-a79176d99525} SDL - - {a3b497bd-842c-4a2b-b398-ed1976849df1} - VERAG_PROG_ALLGEMEIN - {110c923b-cb02-4fd0-af24-95e0f0eeeff5} Gemeinsames diff --git a/Aviso/My Project/Application.Designer.vb b/Aviso/My Project/Application.Designer.vb index a77e014..c6a8fea 100644 --- a/Aviso/My Project/Application.Designer.vb +++ b/Aviso/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.AVISO.frmLogin + Me.MainForm = AVISO.frmLogin End Sub End Class End Namespace diff --git a/Aviso/frmGesamtsicherheitenMenu.vb b/Aviso/frmGesamtsicherheitenMenu.vb index 26a2af0..9a7c6ed 100644 --- a/Aviso/frmGesamtsicherheitenMenu.vb +++ b/Aviso/frmGesamtsicherheitenMenu.vb @@ -178,10 +178,6 @@ Public Class frmGesamtsicherheitenMenu btnSucheStarten_Click(sender, e) End Sub - Private Sub MyTextBox1_TextChanged(sender As Object, e As EventArgs) - - End Sub - Private Sub btnSucheStarten_Click(sender As Object, e As EventArgs) Handles btnSucheStarten.Click Try Date.Parse(txtVon.Text) diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index a86ce1d..814441b 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -29,7 +29,7 @@ Partial Class frmGesamtsicherheitenNEU Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU)) - Me.dgvGesamtsicherheitMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ClosedErzeugenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel2 = New System.Windows.Forms.Panel() @@ -44,18 +44,18 @@ Partial Class frmGesamtsicherheitenNEU Me.Label17 = New System.Windows.Forms.Label() Me.Label16 = New System.Windows.Forms.Label() Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.dgvGesamtsicherheitPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.btnAddClose = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnAddOpen = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblGestellungNr = New System.Windows.Forms.Label() Me.txtCRNTime = New System.Windows.Forms.TextBox() Me.txtCRNDate = New System.Windows.Forms.TextBox() Me.txtMRNTime = New System.Windows.Forms.TextBox() Me.txtMRNDate = New System.Windows.Forms.TextBox() Me.btnSaveOben = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.txtCRNSicherheitsbetrag = New System.Windows.Forms.TextBox() - Me.txtCRNWarenwert = New System.Windows.Forms.TextBox() - Me.txtCRN = New System.Windows.Forms.TextBox() + Me.txtPosSicherheitsbetrag = New System.Windows.Forms.TextBox() + Me.txtPosWarenwert = New System.Windows.Forms.TextBox() + Me.txtPositionenCRN = New System.Windows.Forms.TextBox() Me.txtMRNSicherheitsbetrag = New System.Windows.Forms.TextBox() Me.txtMRNWarenwert = New System.Windows.Forms.TextBox() Me.txtMRN = New System.Windows.Forms.TextBox() @@ -64,13 +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.Label20 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnSuche = New System.Windows.Forms.Button() Me.Label26 = New System.Windows.Forms.Label() - Me.Button7 = New System.Windows.Forms.Button() - Me.Button6 = New System.Windows.Forms.Button() - Me.Button5 = New System.Windows.Forms.Button() + Me.btnBisTag = New System.Windows.Forms.Button() + Me.btnVonTag = New System.Windows.Forms.Button() + Me.btnTag = New System.Windows.Forms.Button() Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label24 = New System.Windows.Forms.Label() Me.btnJahr = New System.Windows.Forms.Button() @@ -84,19 +86,17 @@ Partial Class frmGesamtsicherheitenNEU Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label23 = New System.Windows.Forms.Label() - Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label19 = New System.Windows.Forms.Label() - Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbx_Suche_Filiale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.txtLKW = New System.Windows.Forms.TextBox() - Me.txtAbfNr = New System.Windows.Forms.TextBox() - Me.Label20 = New System.Windows.Forms.Label() + Me.txt_Suche = New System.Windows.Forms.TextBox() Me.Label21 = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label() - Me.btnDeleteClose = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnDeleteOpen = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnUpdateClose = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnUpdateOpen = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnDeletePos = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnDeleteSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnUpdatePos = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnUpdateSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label15 = New System.Windows.Forms.Label() Me.txtPos = New System.Windows.Forms.TextBox() Me.Label14 = New System.Windows.Forms.Label() @@ -115,22 +115,22 @@ Partial Class frmGesamtsicherheitenNEU Me.Label3 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.txtFreitextClose = New System.Windows.Forms.TextBox() + Me.txtPosFreitext = New System.Windows.Forms.TextBox() Me.txtFreitextOpen = New System.Windows.Forms.TextBox() - CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel2.SuspendLayout() Me.panOverlay.SuspendLayout() - CType(Me.dgvGesamtsicherheitPositionen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).BeginInit() Me.panOben.SuspendLayout() Me.Panel1.SuspendLayout() Me.SuspendLayout() ' - 'dgvGesamtsicherheitMRN + 'dgvGesamtsicherheit ' - Me.dgvGesamtsicherheitMRN.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvGesamtsicherheitMRN.AllowUserToAddRows = False - Me.dgvGesamtsicherheitMRN.AllowUserToDeleteRows = False + Me.dgvGesamtsicherheit.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvGesamtsicherheit.AllowUserToAddRows = False + Me.dgvGesamtsicherheit.AllowUserToDeleteRows = False DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -138,9 +138,9 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvGesamtsicherheitMRN.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvGesamtsicherheitMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvGesamtsicherheitMRN.ContextMenuStrip = Me.ContextMenuStrip1 + Me.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStrip1 DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -148,11 +148,11 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvGesamtsicherheitMRN.DefaultCellStyle = DataGridViewCellStyle2 - Me.dgvGesamtsicherheitMRN.Dock = System.Windows.Forms.DockStyle.Left - Me.dgvGesamtsicherheitMRN.Location = New System.Drawing.Point(0, 0) - Me.dgvGesamtsicherheitMRN.Name = "dgvGesamtsicherheitMRN" - Me.dgvGesamtsicherheitMRN.ReadOnly = True + Me.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle2 + Me.dgvGesamtsicherheit.Dock = System.Windows.Forms.DockStyle.Left + Me.dgvGesamtsicherheit.Location = New System.Drawing.Point(0, 0) + Me.dgvGesamtsicherheit.Name = "dgvGesamtsicherheit" + Me.dgvGesamtsicherheit.ReadOnly = True DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -160,10 +160,10 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvGesamtsicherheitMRN.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 - Me.dgvGesamtsicherheitMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvGesamtsicherheitMRN.Size = New System.Drawing.Size(692, 486) - Me.dgvGesamtsicherheitMRN.TabIndex = 0 + Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(692, 486) + Me.dgvGesamtsicherheit.TabIndex = 0 ' 'ContextMenuStrip1 ' @@ -180,8 +180,8 @@ Partial Class frmGesamtsicherheitenNEU 'Panel2 ' Me.Panel2.Controls.Add(Me.panOverlay) - Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitPositionen) - Me.Panel2.Controls.Add(Me.dgvGesamtsicherheitMRN) + Me.Panel2.Controls.Add(Me.dgvSicherheitsPos) + Me.Panel2.Controls.Add(Me.dgvGesamtsicherheit) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 290) Me.Panel2.Name = "Panel2" @@ -201,7 +201,7 @@ Partial Class frmGesamtsicherheitenNEU Me.panOverlay.Controls.Add(Me.Label17) Me.panOverlay.Controls.Add(Me.Label16) Me.panOverlay.Controls.Add(Me.btnClosePanOverlay) - Me.panOverlay.Location = New System.Drawing.Point(27, 183) + Me.panOverlay.Location = New System.Drawing.Point(493, 15) Me.panOverlay.Name = "panOverlay" Me.panOverlay.Size = New System.Drawing.Size(527, 275) Me.panOverlay.TabIndex = 2 @@ -323,11 +323,11 @@ Partial Class frmGesamtsicherheitenNEU Me.btnClosePanOverlay.TabIndex = 0 Me.btnClosePanOverlay.UseVisualStyleBackColor = False ' - 'dgvGesamtsicherheitPositionen + 'dgvSicherheitsPos ' - Me.dgvGesamtsicherheitPositionen.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvGesamtsicherheitPositionen.AllowUserToAddRows = False - Me.dgvGesamtsicherheitPositionen.AllowUserToDeleteRows = False + Me.dgvSicherheitsPos.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvSicherheitsPos.AllowUserToAddRows = False + Me.dgvSicherheitsPos.AllowUserToDeleteRows = False DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -335,8 +335,8 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvGesamtsicherheitPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 - Me.dgvGesamtsicherheitPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -344,44 +344,44 @@ Partial Class frmGesamtsicherheitenNEU DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvGesamtsicherheitPositionen.DefaultCellStyle = DataGridViewCellStyle5 - Me.dgvGesamtsicherheitPositionen.Dock = System.Windows.Forms.DockStyle.Right - Me.dgvGesamtsicherheitPositionen.Location = New System.Drawing.Point(692, 0) - Me.dgvGesamtsicherheitPositionen.Name = "dgvGesamtsicherheitPositionen" - Me.dgvGesamtsicherheitPositionen.ReadOnly = True - Me.dgvGesamtsicherheitPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvGesamtsicherheitPositionen.Size = New System.Drawing.Size(692, 486) - Me.dgvGesamtsicherheitPositionen.TabIndex = 1 + Me.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle5 + Me.dgvSicherheitsPos.Dock = System.Windows.Forms.DockStyle.Right + Me.dgvSicherheitsPos.Location = New System.Drawing.Point(692, 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.TabIndex = 1 ' - 'btnAddClose + 'btnAddPos ' - Me.btnAddClose.allowBorder = False - Me.btnAddClose.BackColor = System.Drawing.Color.White - Me.btnAddClose.BackgroundImage = Global.AVISO.My.Resources.Resources.plus - Me.btnAddClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btnAddClose.FlatAppearance.BorderSize = 0 - Me.btnAddClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAddClose.ForeColor = System.Drawing.Color.Black - Me.btnAddClose.Location = New System.Drawing.Point(1348, 225) - Me.btnAddClose.Name = "btnAddClose" - Me.btnAddClose.Size = New System.Drawing.Size(24, 24) - Me.btnAddClose.TabIndex = 31 - Me.btnAddClose.UseVisualStyleBackColor = False + Me.btnAddPos.allowBorder = False + Me.btnAddPos.BackColor = System.Drawing.Color.White + Me.btnAddPos.BackgroundImage = Global.AVISO.My.Resources.Resources.plus + Me.btnAddPos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnAddPos.FlatAppearance.BorderSize = 0 + Me.btnAddPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddPos.ForeColor = System.Drawing.Color.Black + Me.btnAddPos.Location = New System.Drawing.Point(1348, 225) + Me.btnAddPos.Name = "btnAddPos" + Me.btnAddPos.Size = New System.Drawing.Size(24, 24) + Me.btnAddPos.TabIndex = 31 + Me.btnAddPos.UseVisualStyleBackColor = False ' - 'btnAddOpen + 'btnAddSicherheit ' - Me.btnAddOpen.allowBorder = False - Me.btnAddOpen.BackColor = System.Drawing.Color.White - Me.btnAddOpen.BackgroundImage = Global.AVISO.My.Resources.Resources.plus - Me.btnAddOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btnAddOpen.FlatAppearance.BorderSize = 0 - Me.btnAddOpen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAddOpen.ForeColor = System.Drawing.Color.Black - Me.btnAddOpen.Location = New System.Drawing.Point(654, 205) - Me.btnAddOpen.Name = "btnAddOpen" - Me.btnAddOpen.Size = New System.Drawing.Size(24, 24) - Me.btnAddOpen.TabIndex = 30 - Me.btnAddOpen.UseVisualStyleBackColor = False + Me.btnAddSicherheit.allowBorder = False + Me.btnAddSicherheit.BackColor = System.Drawing.Color.White + Me.btnAddSicherheit.BackgroundImage = Global.AVISO.My.Resources.Resources.plus + Me.btnAddSicherheit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnAddSicherheit.FlatAppearance.BorderSize = 0 + Me.btnAddSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddSicherheit.ForeColor = System.Drawing.Color.Black + 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.UseVisualStyleBackColor = False ' 'lblGestellungNr ' @@ -447,33 +447,33 @@ Partial Class frmGesamtsicherheitenNEU Me.btnSaveOben.Text = "Speichern" Me.btnSaveOben.UseVisualStyleBackColor = False ' - 'txtCRNSicherheitsbetrag + 'txtPosSicherheitsbetrag ' - Me.txtCRNSicherheitsbetrag.Enabled = False - Me.txtCRNSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCRNSicherheitsbetrag.Location = New System.Drawing.Point(1172, 204) - Me.txtCRNSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0) - Me.txtCRNSicherheitsbetrag.Name = "txtCRNSicherheitsbetrag" - Me.txtCRNSicherheitsbetrag.Size = New System.Drawing.Size(100, 24) - Me.txtCRNSicherheitsbetrag.TabIndex = 29 + Me.txtPosSicherheitsbetrag.Enabled = False + Me.txtPosSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1172, 204) + 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 ' - 'txtCRNWarenwert + 'txtPosWarenwert ' - Me.txtCRNWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCRNWarenwert.Location = New System.Drawing.Point(1072, 204) - Me.txtCRNWarenwert.Margin = New System.Windows.Forms.Padding(0) - Me.txtCRNWarenwert.Name = "txtCRNWarenwert" - Me.txtCRNWarenwert.Size = New System.Drawing.Size(100, 24) - Me.txtCRNWarenwert.TabIndex = 28 + Me.txtPosWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPosWarenwert.Location = New System.Drawing.Point(1072, 204) + 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 ' - 'txtCRN + 'txtPositionenCRN ' - Me.txtCRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCRN.Location = New System.Drawing.Point(708, 204) - Me.txtCRN.Margin = New System.Windows.Forms.Padding(0) - Me.txtCRN.Name = "txtCRN" - Me.txtCRN.Size = New System.Drawing.Size(205, 24) - Me.txtCRN.TabIndex = 25 + Me.txtPositionenCRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPositionenCRN.Location = New System.Drawing.Point(708, 204) + 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 ' 'txtMRNSicherheitsbetrag ' @@ -511,7 +511,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btn_resetSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn_resetSearch.ForeColor = System.Drawing.Color.Black Me.btn_resetSearch.Image = Global.AVISO.My.Resources.Resources.refresh - Me.btn_resetSearch.Location = New System.Drawing.Point(354, 28) + Me.btn_resetSearch.Location = New System.Drawing.Point(610, 33) Me.btn_resetSearch.Name = "btn_resetSearch" Me.btn_resetSearch.Size = New System.Drawing.Size(32, 33) Me.btn_resetSearch.TabIndex = 3 @@ -523,7 +523,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(1010, 190) + Me.lblZollsatz.Location = New System.Drawing.Point(962, 168) Me.lblZollsatz.Name = "lblZollsatz" Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 4 @@ -535,7 +535,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(1010, 168) + Me.lblReferenzwert.Location = New System.Drawing.Point(962, 152) Me.lblReferenzwert.Name = "lblReferenzwert" Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 1 @@ -547,7 +547,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblSaldo.AutoSize = True Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew - Me.lblSaldo.Location = New System.Drawing.Point(1152, 160) + Me.lblSaldo.Location = New System.Drawing.Point(1225, 152) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(147, 24) Me.lblSaldo.TabIndex = 5 @@ -556,11 +556,13 @@ 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.Label20) + Me.panOben.Controls.Add(Me.TextBox1) Me.panOben.Controls.Add(Me.Panel1) - Me.panOben.Controls.Add(Me.btnDeleteClose) - Me.panOben.Controls.Add(Me.btnDeleteOpen) - Me.panOben.Controls.Add(Me.btnUpdateClose) - Me.panOben.Controls.Add(Me.btnUpdateOpen) + Me.panOben.Controls.Add(Me.btnDeletePos) + Me.panOben.Controls.Add(Me.btnDeleteSicherheit) + Me.panOben.Controls.Add(Me.btnUpdatePos) + Me.panOben.Controls.Add(Me.btnUpdateSicherheit) Me.panOben.Controls.Add(Me.Label15) Me.panOben.Controls.Add(Me.txtPos) Me.panOben.Controls.Add(Me.Label14) @@ -579,19 +581,19 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Controls.Add(Me.Label3) Me.panOben.Controls.Add(Me.Label2) Me.panOben.Controls.Add(Me.Label1) - Me.panOben.Controls.Add(Me.txtFreitextClose) + Me.panOben.Controls.Add(Me.txtPosFreitext) Me.panOben.Controls.Add(Me.txtFreitextOpen) - Me.panOben.Controls.Add(Me.btnAddClose) - Me.panOben.Controls.Add(Me.btnAddOpen) + Me.panOben.Controls.Add(Me.btnAddPos) + Me.panOben.Controls.Add(Me.btnAddSicherheit) Me.panOben.Controls.Add(Me.lblGestellungNr) Me.panOben.Controls.Add(Me.txtCRNTime) Me.panOben.Controls.Add(Me.txtCRNDate) Me.panOben.Controls.Add(Me.txtMRNTime) Me.panOben.Controls.Add(Me.txtMRNDate) Me.panOben.Controls.Add(Me.btnSaveOben) - Me.panOben.Controls.Add(Me.txtCRNSicherheitsbetrag) - Me.panOben.Controls.Add(Me.txtCRNWarenwert) - Me.panOben.Controls.Add(Me.txtCRN) + Me.panOben.Controls.Add(Me.txtPosSicherheitsbetrag) + Me.panOben.Controls.Add(Me.txtPosWarenwert) + Me.panOben.Controls.Add(Me.txtPositionenCRN) Me.panOben.Controls.Add(Me.txtMRNSicherheitsbetrag) Me.panOben.Controls.Add(Me.txtMRNWarenwert) Me.panOben.Controls.Add(Me.txtMRN) @@ -605,15 +607,35 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Size = New System.Drawing.Size(1384, 290) Me.panOben.TabIndex = 0 ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.ForeColor = System.Drawing.SystemColors.ButtonHighlight + Me.Label20.Location = New System.Drawing.Point(918, 237) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(25, 13) + Me.Label20.TabIndex = 42 + Me.Label20.Text = "Pos" + ' + 'TextBox1 + ' + Me.TextBox1.Enabled = False + Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBox1.Location = New System.Drawing.Point(921, 250) + Me.TextBox1.Margin = New System.Windows.Forms.Padding(0) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(37, 24) + Me.TextBox1.TabIndex = 43 + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight Me.Panel1.Controls.Add(Me.txtDatBis) Me.Panel1.Controls.Add(Me.btnSuche) Me.Panel1.Controls.Add(Me.Label26) - Me.Panel1.Controls.Add(Me.Button7) - Me.Panel1.Controls.Add(Me.Button6) - Me.Panel1.Controls.Add(Me.Button5) + Me.Panel1.Controls.Add(Me.btnBisTag) + Me.Panel1.Controls.Add(Me.btnVonTag) + Me.Panel1.Controls.Add(Me.btnTag) Me.Panel1.Controls.Add(Me.txtDatVon) Me.Panel1.Controls.Add(Me.Label24) Me.Panel1.Controls.Add(Me.btnJahr) @@ -627,13 +649,11 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Controls.Add(Me.DateTimePicker1) Me.Panel1.Controls.Add(Me.btnSucheStarten) Me.Panel1.Controls.Add(Me.Label23) - Me.Panel1.Controls.Add(Me.cbxWarenort) + Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort) Me.Panel1.Controls.Add(Me.Label19) - Me.Panel1.Controls.Add(Me.cbxFiliale) + Me.Panel1.Controls.Add(Me.cbx_Suche_Filiale) Me.Panel1.Controls.Add(Me.btnNeu) - Me.Panel1.Controls.Add(Me.txtLKW) - Me.Panel1.Controls.Add(Me.txtAbfNr) - Me.Panel1.Controls.Add(Me.Label20) + Me.Panel1.Controls.Add(Me.txt_Suche) Me.Panel1.Controls.Add(Me.Label21) Me.Panel1.Controls.Add(Me.Label22) Me.Panel1.Controls.Add(Me.btn_resetSearch) @@ -641,7 +661,6 @@ Partial Class frmGesamtsicherheitenNEU Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1384, 97) Me.Panel1.TabIndex = 10 - Me.Panel1.Visible = False ' 'txtDatBis ' @@ -674,7 +693,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(414, 19) + Me.btnSuche.Location = New System.Drawing.Point(692, 20) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) Me.btnSuche.TabIndex = 35 @@ -691,49 +710,49 @@ Partial Class frmGesamtsicherheitenNEU Me.Label26.TabIndex = 34 Me.Label26.Text = "Datum" ' - 'Button7 + 'btnBisTag ' - Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button7.ForeColor = System.Drawing.Color.Black - Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button7.Location = New System.Drawing.Point(284, 7) - Me.Button7.Margin = New System.Windows.Forms.Padding(0) - Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(34, 23) - Me.Button7.TabIndex = 26 - Me.Button7.Text = ">>" - Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button7.UseVisualStyleBackColor = True + Me.btnBisTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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(284, 7) + 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 = 26 + Me.btnBisTag.Text = ">>" + Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisTag.UseVisualStyleBackColor = True ' - 'Button6 + 'btnVonTag ' - Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button6.ForeColor = System.Drawing.Color.Black - Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(165, 7) - Me.Button6.Margin = New System.Windows.Forms.Padding(0) - Me.Button6.Name = "Button6" - Me.Button6.Size = New System.Drawing.Size(34, 23) - Me.Button6.TabIndex = 24 - Me.Button6.Text = "<<" - Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.UseVisualStyleBackColor = True + Me.btnVonTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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(165, 7) + 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 = 24 + Me.btnVonTag.Text = "<<" + Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonTag.UseVisualStyleBackColor = True ' - 'Button5 + 'btnTag ' - Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button5.ForeColor = System.Drawing.Color.Black - Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(198, 7) - Me.Button5.Margin = New System.Windows.Forms.Padding(0) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(87, 23) - Me.Button5.TabIndex = 25 - Me.Button5.Text = "Heute" - Me.Button5.UseVisualStyleBackColor = True + Me.btnTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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(198, 7) + 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 = 25 + Me.btnTag.Text = "Heute" + Me.btnTag.UseVisualStyleBackColor = True ' 'txtDatVon ' @@ -916,43 +935,43 @@ Partial Class frmGesamtsicherheitenNEU Me.Label23.TabIndex = 13 Me.Label23.Text = "Bis" ' - 'cbxWarenort + 'cbx_Suche_Warenort ' - Me.cbxWarenort._allowedValuesFreiText = Nothing - Me.cbxWarenort._allowFreiText = False - Me.cbxWarenort._value = "" - Me.cbxWarenort.DropDownWidth = 300 - Me.cbxWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxWarenort.FormattingEnabled = True - Me.cbxWarenort.Location = New System.Drawing.Point(663, 29) - Me.cbxWarenort.MaxLength = 4 - Me.cbxWarenort.Name = "cbxWarenort" - Me.cbxWarenort.Size = New System.Drawing.Size(95, 24) - Me.cbxWarenort.TabIndex = 9 + Me.cbx_Suche_Warenort._allowedValuesFreiText = Nothing + Me.cbx_Suche_Warenort._allowFreiText = False + Me.cbx_Suche_Warenort._value = "" + Me.cbx_Suche_Warenort.DropDownWidth = 300 + Me.cbx_Suche_Warenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbx_Suche_Warenort.FormattingEnabled = True + Me.cbx_Suche_Warenort.Location = New System.Drawing.Point(345, 20) + 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 ' 'Label19 ' Me.Label19.AutoSize = True Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label19.Location = New System.Drawing.Point(660, 16) + Me.Label19.Location = New System.Drawing.Point(342, 7) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(63, 13) Me.Label19.TabIndex = 8 Me.Label19.Text = "Warenort:" ' - 'cbxFiliale + 'cbx_Suche_Filiale ' - Me.cbxFiliale._allowedValuesFreiText = Nothing - Me.cbxFiliale._allowFreiText = False - Me.cbxFiliale._value = "" - Me.cbxFiliale.DropDownWidth = 300 - Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxFiliale.FormattingEnabled = True - Me.cbxFiliale.Location = New System.Drawing.Point(783, 32) - Me.cbxFiliale.MaxLength = 4 - Me.cbxFiliale.Name = "cbxFiliale" - Me.cbxFiliale.Size = New System.Drawing.Size(95, 21) - Me.cbxFiliale.TabIndex = 2 + Me.cbx_Suche_Filiale._allowedValuesFreiText = Nothing + Me.cbx_Suche_Filiale._allowFreiText = False + Me.cbx_Suche_Filiale._value = "" + Me.cbx_Suche_Filiale.DropDownWidth = 300 + Me.cbx_Suche_Filiale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbx_Suche_Filiale.FormattingEnabled = True + Me.cbx_Suche_Filiale.Location = New System.Drawing.Point(493, 21) + Me.cbx_Suche_Filiale.MaxLength = 4 + Me.cbx_Suche_Filiale.Name = "cbx_Suche_Filiale" + Me.cbx_Suche_Filiale.Size = New System.Drawing.Size(95, 21) + Me.cbx_Suche_Filiale.TabIndex = 2 ' 'btnNeu ' @@ -961,124 +980,105 @@ Partial Class frmGesamtsicherheitenNEU 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(1156, 31) + Me.btnNeu.Location = New System.Drawing.Point(1262, 31) Me.btnNeu.Name = "btnNeu" Me.btnNeu.Size = New System.Drawing.Size(75, 23) Me.btnNeu.TabIndex = 7 Me.btnNeu.Text = "Neu" Me.btnNeu.UseVisualStyleBackColor = False ' - 'txtLKW + 'txt_Suche ' - Me.txtLKW.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtLKW.Location = New System.Drawing.Point(1055, 32) - Me.txtLKW.Margin = New System.Windows.Forms.Padding(0) - Me.txtLKW.Name = "txtLKW" - Me.txtLKW.Size = New System.Drawing.Size(79, 24) - Me.txtLKW.TabIndex = 6 - ' - 'txtAbfNr - ' - Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtAbfNr.Location = New System.Drawing.Point(898, 32) - Me.txtAbfNr.Margin = New System.Windows.Forms.Padding(0) - Me.txtAbfNr.Name = "txtAbfNr" - Me.txtAbfNr.Size = New System.Drawing.Size(122, 24) - Me.txtAbfNr.TabIndex = 4 - ' - 'Label20 - ' - Me.Label20.AutoSize = True - Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label20.Location = New System.Drawing.Point(1052, 16) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(55, 13) - Me.Label20.TabIndex = 5 - Me.Label20.Text = "LKW-ID:" + Me.txt_Suche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txt_Suche.Location = New System.Drawing.Point(345, 68) + 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 ' 'Label21 ' Me.Label21.AutoSize = True Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(895, 16) + Me.Label21.Location = New System.Drawing.Point(342, 52) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(125, 13) + Me.Label21.Size = New System.Drawing.Size(47, 13) Me.Label21.TabIndex = 3 - Me.Label21.Text = "Abfertigungsnummer:" + Me.Label21.Text = "Suche:" ' '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(780, 16) + Me.Label22.Location = New System.Drawing.Point(490, 5) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(44, 13) Me.Label22.TabIndex = 1 Me.Label22.Text = "Filiale:" ' - 'btnDeleteClose + 'btnDeletePos ' - Me.btnDeleteClose.allowBorder = False - Me.btnDeleteClose.BackColor = System.Drawing.Color.White - Me.btnDeleteClose.BackgroundImage = Global.AVISO.My.Resources.Resources.del2 - Me.btnDeleteClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btnDeleteClose.FlatAppearance.BorderSize = 0 - Me.btnDeleteClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDeleteClose.ForeColor = System.Drawing.Color.Black - Me.btnDeleteClose.Location = New System.Drawing.Point(1348, 195) - Me.btnDeleteClose.Name = "btnDeleteClose" - Me.btnDeleteClose.Size = New System.Drawing.Size(24, 24) - Me.btnDeleteClose.TabIndex = 7 - Me.btnDeleteClose.UseVisualStyleBackColor = False - Me.btnDeleteClose.Visible = False + Me.btnDeletePos.allowBorder = False + Me.btnDeletePos.BackColor = System.Drawing.Color.White + Me.btnDeletePos.BackgroundImage = Global.AVISO.My.Resources.Resources.del2 + Me.btnDeletePos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnDeletePos.FlatAppearance.BorderSize = 0 + Me.btnDeletePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDeletePos.ForeColor = System.Drawing.Color.Black + Me.btnDeletePos.Location = New System.Drawing.Point(1348, 195) + Me.btnDeletePos.Name = "btnDeletePos" + Me.btnDeletePos.Size = New System.Drawing.Size(24, 24) + Me.btnDeletePos.TabIndex = 7 + Me.btnDeletePos.UseVisualStyleBackColor = False + Me.btnDeletePos.Visible = False ' - 'btnDeleteOpen + 'btnDeleteSicherheit ' - Me.btnDeleteOpen.allowBorder = False - Me.btnDeleteOpen.BackColor = System.Drawing.Color.White - Me.btnDeleteOpen.BackgroundImage = Global.AVISO.My.Resources.Resources.del2 - Me.btnDeleteOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btnDeleteOpen.FlatAppearance.BorderSize = 0 - Me.btnDeleteOpen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDeleteOpen.ForeColor = System.Drawing.Color.Black - Me.btnDeleteOpen.Location = New System.Drawing.Point(654, 175) - Me.btnDeleteOpen.Name = "btnDeleteOpen" - Me.btnDeleteOpen.Size = New System.Drawing.Size(24, 24) - Me.btnDeleteOpen.TabIndex = 6 - Me.btnDeleteOpen.UseVisualStyleBackColor = False - Me.btnDeleteOpen.Visible = False + Me.btnDeleteSicherheit.allowBorder = False + Me.btnDeleteSicherheit.BackColor = System.Drawing.Color.White + Me.btnDeleteSicherheit.BackgroundImage = Global.AVISO.My.Resources.Resources.del2 + Me.btnDeleteSicherheit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnDeleteSicherheit.FlatAppearance.BorderSize = 0 + Me.btnDeleteSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDeleteSicherheit.ForeColor = System.Drawing.Color.Black + 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.UseVisualStyleBackColor = False + Me.btnDeleteSicherheit.Visible = False ' - 'btnUpdateClose + 'btnUpdatePos ' - Me.btnUpdateClose.allowBorder = False - Me.btnUpdateClose.BackColor = System.Drawing.Color.White - Me.btnUpdateClose.BackgroundImage = Global.AVISO.My.Resources.Resources.ok - Me.btnUpdateClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btnUpdateClose.FlatAppearance.BorderSize = 0 - Me.btnUpdateClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUpdateClose.ForeColor = System.Drawing.Color.Black - Me.btnUpdateClose.Location = New System.Drawing.Point(1348, 257) - Me.btnUpdateClose.Name = "btnUpdateClose" - Me.btnUpdateClose.Size = New System.Drawing.Size(24, 24) - Me.btnUpdateClose.TabIndex = 37 - Me.btnUpdateClose.UseVisualStyleBackColor = False - Me.btnUpdateClose.Visible = False + Me.btnUpdatePos.allowBorder = False + Me.btnUpdatePos.BackColor = System.Drawing.Color.White + Me.btnUpdatePos.BackgroundImage = Global.AVISO.My.Resources.Resources.ok + Me.btnUpdatePos.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnUpdatePos.FlatAppearance.BorderSize = 0 + Me.btnUpdatePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUpdatePos.ForeColor = System.Drawing.Color.Black + Me.btnUpdatePos.Location = New System.Drawing.Point(1348, 257) + Me.btnUpdatePos.Name = "btnUpdatePos" + Me.btnUpdatePos.Size = New System.Drawing.Size(24, 24) + Me.btnUpdatePos.TabIndex = 37 + Me.btnUpdatePos.UseVisualStyleBackColor = False + Me.btnUpdatePos.Visible = False ' - 'btnUpdateOpen + 'btnUpdateSicherheit ' - Me.btnUpdateOpen.allowBorder = False - Me.btnUpdateOpen.BackColor = System.Drawing.Color.White - Me.btnUpdateOpen.BackgroundImage = Global.AVISO.My.Resources.Resources.ok - Me.btnUpdateOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btnUpdateOpen.FlatAppearance.BorderSize = 0 - Me.btnUpdateOpen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUpdateOpen.ForeColor = System.Drawing.Color.Black - Me.btnUpdateOpen.Location = New System.Drawing.Point(654, 237) - Me.btnUpdateOpen.Name = "btnUpdateOpen" - Me.btnUpdateOpen.Size = New System.Drawing.Size(24, 24) - Me.btnUpdateOpen.TabIndex = 35 - Me.btnUpdateOpen.UseVisualStyleBackColor = False - Me.btnUpdateOpen.Visible = False + Me.btnUpdateSicherheit.allowBorder = False + Me.btnUpdateSicherheit.BackColor = System.Drawing.Color.White + Me.btnUpdateSicherheit.BackgroundImage = Global.AVISO.My.Resources.Resources.ok + Me.btnUpdateSicherheit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnUpdateSicherheit.FlatAppearance.BorderSize = 0 + Me.btnUpdateSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUpdateSicherheit.ForeColor = System.Drawing.Color.Black + 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.UseVisualStyleBackColor = False + Me.btnUpdateSicherheit.Visible = False ' 'Label15 ' @@ -1262,14 +1262,14 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1.TabIndex = 8 Me.Label1.Text = "ATB Nummer" ' - 'txtFreitextClose + 'txtPosFreitext ' - Me.txtFreitextClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtFreitextClose.Location = New System.Drawing.Point(1017, 250) - Me.txtFreitextClose.Margin = New System.Windows.Forms.Padding(0) - Me.txtFreitextClose.Name = "txtFreitextClose" - Me.txtFreitextClose.Size = New System.Drawing.Size(255, 24) - Me.txtFreitextClose.TabIndex = 41 + Me.txtPosFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPosFreitext.Location = New System.Drawing.Point(1017, 250) + 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 ' 'txtFreitextOpen ' @@ -1293,12 +1293,12 @@ Partial Class frmGesamtsicherheitenNEU Me.Name = "frmGesamtsicherheitenNEU" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "frmGesSich" - CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.panOverlay.ResumeLayout(False) Me.panOverlay.PerformLayout() - CType(Me.dgvGesamtsicherheitPositionen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).EndInit() Me.panOben.ResumeLayout(False) Me.panOben.PerformLayout() Me.Panel1.ResumeLayout(False) @@ -1307,20 +1307,20 @@ Partial Class frmGesamtsicherheitenNEU End Sub - Friend WithEvents dgvGesamtsicherheitMRN As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents dgvGesamtsicherheit As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents Panel2 As Panel - Friend WithEvents dgvGesamtsicherheitPositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents btnAddClose As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents btnAddOpen As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents dgvSicherheitsPos As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents btnAddPos As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnAddSicherheit As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblGestellungNr As Label Friend WithEvents txtCRNTime As TextBox Friend WithEvents txtCRNDate As TextBox Friend WithEvents txtMRNTime As TextBox Friend WithEvents txtMRNDate As TextBox Friend WithEvents btnSaveOben As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents txtCRNSicherheitsbetrag As TextBox - Friend WithEvents txtCRNWarenwert As TextBox - Friend WithEvents txtCRN As TextBox + Friend WithEvents txtPosSicherheitsbetrag As TextBox + Friend WithEvents txtPosWarenwert As TextBox + Friend WithEvents txtPositionenCRN As TextBox Friend WithEvents txtMRNSicherheitsbetrag As TextBox Friend WithEvents txtMRNWarenwert As TextBox Friend WithEvents txtMRN As TextBox @@ -1329,7 +1329,7 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents lblReferenzwert As Label Friend WithEvents lblSaldo As Label Friend WithEvents panOben As Panel - Friend WithEvents txtFreitextClose As TextBox + Friend WithEvents txtPosFreitext As TextBox Friend WithEvents txtFreitextOpen As TextBox Friend WithEvents Label14 As Label Friend WithEvents txtEust As TextBox @@ -1358,30 +1358,28 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents Label16 As Label Friend WithEvents btnClosePanOverlay As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents cboFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents btnUpdateClose As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents btnUpdateOpen As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents btnDeleteClose As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents btnDeleteOpen As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnUpdatePos As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnUpdateSicherheit As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnDeletePos As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnDeleteSicherheit As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents cboWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblWarenort As Label Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents ClosedErzeugenToolStripMenuItem As ToolStripMenuItem Friend WithEvents Panel1 As Panel - Friend WithEvents cbxWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbx_Suche_Warenort As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label19 As Label - Friend WithEvents cbxFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbx_Suche_Filiale As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents txtLKW As TextBox - Friend WithEvents txtAbfNr As TextBox - Friend WithEvents Label20 As Label + Friend WithEvents txt_Suche As TextBox Friend WithEvents Label21 As Label Friend WithEvents Label22 As Label Friend WithEvents btnSucheStarten As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Label23 As Label Friend WithEvents Label26 As Label - Friend WithEvents Button7 As Button - Friend WithEvents Button6 As Button - Friend WithEvents Button5 As Button + Friend WithEvents btnBisTag As Button + Friend WithEvents btnVonTag As Button + Friend WithEvents btnTag As Button Friend WithEvents txtDatVon As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label24 As Label Friend WithEvents btnJahr As Button @@ -1395,4 +1393,6 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents DateTimePicker1 As DateTimePicker Friend WithEvents btnSuche As Button Friend WithEvents txtDatBis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label20 As Label + Friend WithEvents TextBox1 As TextBox End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 7d86c17..e37b04d 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -7,14 +7,13 @@ Imports VERAG_PROG_ALLGEMEIN Public Class frmGesamtsicherheitenNEU + 'Dim openopened As cSicherheiten - Dim openopened As cSicherheiten + 'Dim closedopened As cSicherheiten - Dim closedopened As cSicherheiten - - Dim sicherheiten As cSicherheiten - Property GesSichRef As cGesamtsicherheitsReferenz - Property GesSichPos As cGesamtsicherheitsPositionen + Dim currentSicherheit As cSicherheiten + Property currentSPos As cGesamtsicherheitsPositionen + Property currentGesSichRef As cGesamtsicherheitsReferenz Public Property gessicherheitID As Integer Public Property datum As DateTime = Nothing Property Standort As String = "" @@ -35,6 +34,8 @@ Public Class frmGesamtsicherheitenNEU Public warenortID As String + Dim indexGsId As Integer = 0 + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) @@ -43,85 +44,78 @@ Public Class frmGesamtsicherheitenNEU Dim JAHR As Date = CDate("01.01." & Now.Year) - Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs) Handles btn_resetSearch.Click - Dim dgv As String = "" - For Each c As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns - dgv &= c.Width & c.HeaderText & vbCrLf - Next - LoadDGV() - GesSichRef.LOAD() + Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort) + lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N") + + + + If setNullToZero(gessicherheitID) = 0 Or Neu = True Then + 'panOben.Enabled = False : panOben.Enabled = False + Panel1.Enabled = True + '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) + cboWarenort.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_Filiale.Items.AddRange(cboFiliale.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) + cbx_Suche_Warenort.Items.AddRange(cboWarenort.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) + + If datum = Nothing Then datum = Date.Now + Else + LoadDGVSicherheiten() + End If LoadStandort() - End Sub + cboATR.Enabled = currentGesSichRef.gsr_ATR + Zollsatz = currentGesSichRef.gsr_zollsatz - Private Sub frmGesamtsicherheit_Load(sender As Object, e As EventArgs) Handles MyBase.Load + txtDatVon.Text = Date.Today.ToString("dd.MM.yyyy") + txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") btnMonat.Text = MONAT.ToString("MMMM") btnJahr.Text = JAHR.Year - If setNullToZero(gessicherheitID) = "" Or Neu = True Then - panOben.Enabled = False : panOben.Enabled = False - 'panOverlay.Visible = True - cbxFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) - cbxFiliale.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 - Else - LoadDGV() - End If - LoadStandort() - cboATR.Enabled = GesSichRef.gsr_ATR - Zollsatz = GesSichRef.gsr_zollsatz - Me.Text = "Gesamtsicherheit " & Standort - frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitPositionen) + frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos) End Sub - Public Sub LoadDGV() + Public Sub LoadDGVSicherheiten() - lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString() + lblSaldo.Text = "Saldo: € " & currentGesSichRef.gsr_Saldo.ToString() lblGestellungNr.Text = "" Dim sqladd1 As String = "" - If GesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & GesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust" - If GesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]" + 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]" Dim addtosqlstring As String = "" - Dim SQLStringMRN As String = "select [gs_gsId], [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]" - dgvGesamtsicherheitMRN.SET_SQL(SQLStringMRN, "AVISO", ,) - dgvGesamtsicherheitMRN.LOAD() + Dim SQLStringMRN 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_LKWID like '%" & txt_Suche.Text & "%' OR" & + " gs_warenort like '%" & cbx_Suche_Warenort.Text & "%') order by [gs_datum]" - 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] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gessicherheitID & "' order by [gsp_gspPosId]" - dgvGesamtsicherheitPositionen.SET_SQL(SQLStringCRN, "AVISO", ,) - dgvGesamtsicherheitPositionen.LOAD() - - Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'" - Dim dt As New DataTable - dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) - - If dt.Rows.Count > 0 Then - Me.LKWID = setNullToZero(dt.Rows(0).Item("gs_LKWID")) - Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr")) - Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr")) - Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort")) - - If Me.LKWID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWID & " " - 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 & " " - End If + dgvGesamtsicherheit.SET_SQL(SQLStringMRN, "AVISO", ,) + dgvGesamtsicherheit.LOAD() - If dgvGesamtsicherheitMRN.Columns.Count > 0 Then - With dgvGesamtsicherheitMRN + + + + If dgvGesamtsicherheit.Columns.Count > 0 Then + With dgvGesamtsicherheit .RowHeadersWidth = 10 .Columns("gs_gsId").Visible = False .Columns("gs_warenwert").DefaultCellStyle.Format = "c" .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c" .Columns("gs_saldo").DefaultCellStyle.Format = "c" .Columns("gs_saldo").Visible = False - Select Case GesSichRef.gsr_ATR + Select Case currentGesSichRef.gsr_ATR Case True .Columns("gs_ATBNr").HeaderText = "ATB" .Columns("gs_atr").HeaderText = "ATR" @@ -141,71 +135,113 @@ 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 - If dgvGesamtsicherheitPositionen.Columns.Count > 0 Then - With dgvGesamtsicherheitPositionen + + End Sub + + 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) + currentSicherheit = New cSicherheiten(indexGsId) + + LoadDGVSicherheitsPos(indexGsId) + loadTitle(indexGsId) + + If dgvGesamtsicherheit.Enabled = False Then Exit Sub + + End If + End Sub + + Public Sub LoadDGVSicherheitsPos(gsId As Integer) + + If gsId = 0 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] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gsId & "' order by [gsp_gspPosId]" + dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,) + dgvSicherheitsPos.LOAD() + + If dgvSicherheitsPos.Columns.Count > 0 Then + With dgvSicherheitsPos .RowHeadersWidth = 10 .Columns("gsp_gsId").Visible = False - .Columns("gs_warenwert").DefaultCellStyle.Format = "c" - .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c" - .Columns("gs_saldo").DefaultCellStyle.Format = "c" - .Columns("gs_saldo").Visible = False - Select Case GesSichRef.gsr_ATR + .Columns("gsp_warenwert").DefaultCellStyle.Format = "c" + .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c" + '.Columns("gs_saldo").DefaultCellStyle.Format = "c" + '.Columns("gs_saldo").Visible = False + Select Case currentGesSichRef.gsr_ATR Case True - .Columns("gs_ATBNr").HeaderText = "ATC / MRN" + .Columns("gsp_ATCNr").HeaderText = "ATC / MRN" Case Else - .Columns("gs_ATBNr").HeaderText = "CRN" + .Columns("gsp_ATCNr").HeaderText = "CRN" End Select - .Columns("gs_ATBNr").Width = 120 - .Columns("gs_datum").Width = 140 - .Columns("gs_warenwert").Width = 100 - .Columns("gs_sicherheitsbetrag").Width = 100 - .Columns("gs_freitext").Width = 220 + .Columns("gsp_ATCNr").Width = 120 + '.Columns("gs_datum").Width = 140 + .Columns("gsp_warenwert").Width = 100 + .Columns("gsp_sicherheitsbetrag").Width = 100 + .Columns("gsp_freitext").Width = 220 End With End If + End Sub + Sub loadTitle(indexGsId As Integer) + 'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'" + + lblGestellungNr.Text = "" + + Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsId] = '" & indexGsId & "'" + + + Dim dt As New DataTable + dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) + + If dt.Rows.Count > 0 Then + Me.LKWID = setNullToZero(dt.Rows(0).Item("gs_LKWID")) + Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr")) + Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr")) + Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort")) + + If Me.LKWID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWID & " " + 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 & " " + End If End Sub Public Sub LoadStandort() - lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString() - lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%" - ZollsatzMulti = GesSichRef.gsr_zollsatz / 100 + lblReferenzwert.Text = "Referenzwert: €" & currentGesSichRef.gsr_referenzwert.ToString() + lblZollsatz.Text = "Zollsatz: " & currentGesSichRef.gsr_zollsatz & "%" + ZollsatzMulti = currentGesSichRef.gsr_zollsatz / 100 End Sub - - - 'Private Sub CalcSaldo() - ' Dim SaldoString As String = "select SUM([MRN_Sicherheitsbetrag]) as sumone, SUM([CRN_Sicherheitsbetrag]) As sumtwo from [tblGesamtsicherheit]" - ' Dim dt As New DataTable - ' dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True) - ' Dim mrn As Integer = dt.Rows(0).Item(0) - ' Dim crn As Integer = dt.Rows(0).Item(1) - - ' Saldo = Referenzwert - mrn + crn - - ' lblSaldo.Text = "Saldo: €" & Saldo.ToString("N") - 'End Sub - - - Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtCRNWarenwert.TextChanged + Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtPosWarenwert.TextChanged Try Select Case sender.name Case "txtMRNWarenwert" txtMRNSicherheitsbetrag.Text = (txtMRNWarenwert.Text * ZollsatzMulti).ToString("N") - If GesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (GesSichRef.gsr_ust / 100) + If currentGesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (currentGesSichRef.gsr_ust / 100) Case "txtCRNWarenwert" - txtCRNSicherheitsbetrag.Text = (txtCRNWarenwert.Text * ZollsatzMulti).ToString("N") + txtPosSicherheitsbetrag.Text = (txtPosWarenwert.Text * ZollsatzMulti).ToString("N") End Select Catch End Try End Sub - Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtCRNWarenwert.KeyPress, txtPos.KeyPress + Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtPos.KeyPress Select Case Asc(e.KeyChar) Case 48 To 57, 8, 44 ' Zahlen, Backspace und , zulassen @@ -253,7 +289,7 @@ Public Class frmGesamtsicherheitenNEU End Select End Sub - Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click + Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click Try @@ -272,50 +308,56 @@ Public Class frmGesamtsicherheitenNEU .gs_gsNr = Me.gessicherheitID .gs_erstellungsdatum = Me.datum .gs_freitext = Me.txtFreitextOpen.Text - .gs_saldo = GesSichRef.gsr_Saldo + .gs_saldo = currentGesSichRef.gsr_Saldo .gs_atr = setNullToZero(cboATR.SelectedItem) setEnviromentDataToObject(OPEN, Me) End With + indexGsId = OPEN.SAVEOBJECT() For count As Integer = 1 To limit - If (count > 1) Then txtMRNWarenwert.Text = 0 + 'If (count > 1) Then txtMRNWarenwert.Text = 0 - Dim OPENPos As New cGesamtsicherheitsPositionen() + Dim OPENPos As New cGesamtsicherheitsPositionen(indexGsId, count) With OPENPos - .gsp_gsId = OPEN.gs_gsId - .gsp_gspPosId = count + '.gsp_gsId = + '.gsp_gspPosId = count .gsp_warenwert = 0 .gsp_sicherheitsbetrag = 0 .gsp_freitext = "" .gsp_filialenNr = OPEN.gs_filialenNr .gsp_art = "OPEN" - .gsp_abfertigungsNr = "" - .gsp_avisoId = "" - .gsp_ust = OPEN.gs_ust + .gsp_abfertigungsNr = OPEN.gs_filialenNr + .gsp_avisoId = OPEN.gs_ATBNr + .gsp_ust = "" .gsp_ATCNr = "" .gsp_MRNNr = "" End With + OPENPos.SAVE() - If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr() + '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() - Else - MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE() - End If + 'Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID) + ' Case "Neu" + ' OPEN.SAVE() - End Select + ' 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() + + + AfterButton() Catch ex As Exception @@ -323,31 +365,42 @@ Public Class frmGesamtsicherheitenNEU End Try End Sub - Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click + Private Sub btnAddPos_Click(sender As Object, e As EventArgs) Handles btnAddPos.Click + + If dgvGesamtsicherheit.SelectedRows.Count = 0 Then + + MsgBox("Bitte Sicherheit markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll") + Exit Sub + End If + Try - 'Dim Close As New cSicherheiten(Me) - Dim Close As New cSicherheiten() - With Close - .gs_ATBNr = txtCRN.Text - .gs_datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) - .gs_warenwert = Integer.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") - .gs_standort = Me.Standort - .gs_art = "CLOSE" - .gs_gsNr = Me.gessicherheitID - .gs_erstellungsdatum = Me.datum - .gs_freitext = Me.txtFreitextClose.Text - .gs_saldo = GesSichRef.gsr_Saldo + + Dim SicherheitsPos As New cGesamtsicherheitsPositionen() + With SicherheitsPos + .gsp_gsId = currentSicherheit.gs_gsId + .gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsId) + 1 + .gsp_warenwert = 0 + .gsp_sicherheitsbetrag = 0 + .gsp_freitext = "" + .gsp_filialenNr = currentSicherheit.gs_filialenNr + .gsp_art = "OPEN" + .gsp_abfertigungsNr = "" + .gsp_avisoId = "" + .gsp_ust = currentSicherheit.gs_ust + .gsp_ATCNr = "" + .gsp_MRNNr = "" End With - If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr() + SicherheitsPos.SAVE() - 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 + '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 @@ -366,8 +419,8 @@ Public Class frmGesamtsicherheitenNEU End If End Function Sub AfterButton() - GesSichRef.CalcSaldo() - LoadDGV() + currentGesSichRef.CalcSaldo() + LoadDGVSicherheiten() EmptyTXT() End Sub @@ -434,7 +487,7 @@ Public Class frmGesamtsicherheitenNEU End Try Try - Me.warenortID = checkNothingValue(cboWarenort.SelectedItem, "String") + Me.warenortID = checkNothingValue(cbx_Suche_Warenort.SelectedItem, "String") Catch Me.warenortID = "-" @@ -446,7 +499,7 @@ Public Class frmGesamtsicherheitenNEU If setNullToZero(Me.gessicherheitID) >= 0 Then Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "', [gs_LKWID] = '" & Me.LKWID & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' " SQL.doSQL(sqlstring, "AVISO") - LoadDGV() + LoadDGVSicherheiten() End If panOben.Enabled = True : panOben.Enabled = True @@ -472,9 +525,9 @@ Public Class frmGesamtsicherheitenNEU End Function - Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick + Private Sub dgvGesamtsicherheit_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheit.CellContentClick - Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitMRN.CurrentRow.Cells("gs_gsId").Value) + Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value) txtMRN.Text = Sicherh.gs_ATBNr txtPos.Text = Sicherh.gs_posNr @@ -484,15 +537,15 @@ Public Class frmGesamtsicherheitenNEU txtMRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy") txtMRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm") - openopened = Sicherh + currentSicherheit = Sicherh - btnAddOpen.Visible = False - btnUpdateOpen.Visible = True - btnDeleteOpen.Visible = True + btnAddSicherheit.Visible = False + btnUpdateSicherheit.Visible = True + btnDeleteSicherheit.Visible = True End Sub - Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click - With openopened + Private Sub btnUpdateSicherheit_Click(sender As Object, e As EventArgs) Handles btnUpdateSicherheit.Click + With currentSicherheit .gs_ATBNr = txtMRN.Text .gs_posNr = Double.Parse(setNullToZero(txtPos.Text)) .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) @@ -503,68 +556,69 @@ Public Class frmGesamtsicherheitenNEU .gs_gsNr = Me.gessicherheitID '.MakeDate = Me.MakeDate .gs_freitext = Me.txtFreitextOpen.Text - '.saldo = GesSichRef.Saldo + '.saldo = currentGesSichRef.Saldo .gs_atr = setNullToZero(cboATR.SelectedItem) End With - openopened.SAVE() - btnUpdateOpen.Visible = False - btnAddOpen.Visible = True - btnDeleteOpen.Visible = False + currentSicherheit.SAVE() + btnUpdateSicherheit.Visible = False + btnAddSicherheit.Visible = True + btnDeleteSicherheit.Visible = False AfterButton() End Sub - Private Sub btnDeleteClose_Click(sender As Object, e As EventArgs) Handles btnUpdateClose.Click - With closedopened - .gs_ATBNr = txtCRN.Text - .gs_datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) - .gs_warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") - .gs_standort = Me.Standort - .gs_art = "CLOSE" - .gs_freitext = Me.txtFreitextClose.Text + Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click + With currentSPos + + .gsp_art = "CLOSE" + .gsp_gspPosId = txtPos.Text + .gsp_freitext = txtPosFreitext.Text + .gsp_sicherheitsbetrag = txtPosSicherheitsbetrag.Text + .gsp_warenwert = txtPosWarenwert.Text + .gsp_ATCNr = txtPositionenCRN.Text + End With - closedopened.SAVE() - btnAddClose.Visible = True - btnUpdateClose.Visible = False - btnDeleteClose.Visible = False + currentSPos.SAVE() + btnAddPos.Visible = True + btnUpdatePos.Visible = False + btnDeletePos.Visible = False AfterButton() End Sub - Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitPositionen.CellDoubleClick + Private Sub dgvGesamtsicherheitPositionen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellContentClick - Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitPositionen.CurrentRow.Cells("gs_gsId").Value) + Dim sPos As New cGesamtsicherheitsPositionen(indexGsId, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value) - txtCRN.Text = Sicherh.gs_ATBNr - txtCRNWarenwert.Text = Sicherh.gs_warenwert - txtFreitextClose.Text = Sicherh.gs_freitext - txtCRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy") - txtCRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm") + txtPos.Text = sPos.gsp_gspPosId + txtPosFreitext.Text = sPos.gsp_freitext + txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag + txtPosWarenwert.Text = sPos.gsp_sicherheitsbetrag + txtPositionenCRN.Text = sPos.gsp_ATCNr - closedopened = Sicherh + currentSPos = sPos - btnDeleteClose.Visible = True - btnAddClose.Visible = False - btnUpdateClose.Visible = True + btnDeletePos.Visible = True + btnAddPos.Visible = False + btnUpdatePos.Visible = True End Sub - Private Sub btnDeleteOpen_Click(sender As Object, e As EventArgs) Handles btnDeleteOpen.Click + Private Sub btnDeleteSicherheit_Click(sender As Object, e As EventArgs) Handles btnDeleteSicherheit.Click Try - openopened.Delete() - btnUpdateOpen.Visible = False - btnAddOpen.Visible = True - btnDeleteOpen.Visible = False + currentSicherheit.Delete() + btnUpdateSicherheit.Visible = False + btnAddSicherheit.Visible = True + btnDeleteSicherheit.Visible = False AfterButton() Catch ex As Exception MsgBox(ex.Message) End Try End Sub - Private Sub btnDeleteClose_Click_1(sender As Object, e As EventArgs) Handles btnDeleteClose.Click + Private Sub btnDeletePos_Click(sender As Object, e As EventArgs) Handles btnDeletePos.Click Try - closedopened.Delete() - btnUpdateClose.Visible = False - btnAddClose.Visible = True - btnDeleteClose.Visible = False + currentSPos.Delete() + btnUpdatePos.Visible = False + btnAddPos.Visible = True + btnDeletePos.Visible = False AfterButton() Catch ex As Exception MsgBox(ex.Message) @@ -575,15 +629,15 @@ 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) - 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 = cboWarenort.FindString(Me.warenortID) + 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) txtAbfertNum.Text = Me.Abfertigungsnummer txtLKWID.Text = Me.LKWID panOben.Enabled = False End Sub Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click - Close() + panOverlay.Visible = False End Sub Private Function checkMandatoryFieldsAreFilled() As Boolean @@ -607,9 +661,28 @@ Public Class frmGesamtsicherheitenNEU sicherheiten.gs_warenort = gessich.warenortID End Sub - Private Sub ClosedErzeugenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClosedErzeugenToolStripMenuItem.Click - MsgBox("") - End Sub + + + Private Function getLatestPosNr(gs_gsId As Integer) 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 dt As New DataTable + dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then + + posNr = dt.Rows(0).Item(0) + + End If + + Return posNr + + End Function + + + 'Kalenderhandling + + Sub initBtns(MonatJahr) btnMonat.Text = MONAT.ToString("MMMM") btnJahr.Text = JAHR.Year @@ -627,13 +700,13 @@ Public Class frmGesamtsicherheitenNEU DateTimePicker1.Value = srcTAG DateTimePicker2.Value = srcTAG If srcTAG = Now.ToShortDateString Then - Button5.Text = "Heute" + btnTag.Text = "Heute" ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then - Button5.Text = "Gestern" + btnTag.Text = "Gestern" ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then - Button5.Text = "Vorgestern" + btnTag.Text = "Vorgestern" Else - Button5.Text = srcTAG.ToString("dd.MM") + btnTag.Text = srcTAG.ToString("dd.MM") End If 'End If @@ -649,6 +722,20 @@ Public Class frmGesamtsicherheitenNEU initBtns("Jahr") End Sub + Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click + JAHR = JAHR.AddYears(1) + initBtns("Jahr") + End Sub + + Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click + JAHR = JAHR.AddYears(-1) + initBtns("Jahr") + End Sub + + Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click + initBtns("Monat") + End Sub + Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click MONAT = MONAT.AddMonths(1) initBtns("Monat") @@ -659,9 +746,19 @@ Public Class frmGesamtsicherheitenNEU initBtns("Monat") End Sub - Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click - JAHR = JAHR.AddYears(1) - initBtns("Jahr") + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnTag.Click + initBtns("Tag") + End Sub + + Private Sub Button6_Click(sender As Object, e As EventArgs) Handles btnVonTag.Click + srcTAG = srcTAG.AddDays(-1) + initBtns("Tag") + End Sub + + Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btnBisTag.Click + srcTAG = srcTAG.AddDays(1) + initBtns("Tag") End Sub Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged @@ -672,12 +769,40 @@ Public Class frmGesamtsicherheitenNEU txtDatBis._value = CDate(sender.value).ToShortDateString End Sub - Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles btnNeu.Click - - End Sub - Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click - + Try + Date.Parse(txtDatVon.Text) + Date.Parse(txtDatBis.Text) + If Me.Visible Then LoadDGVSicherheiten() + Catch ex As Exception + MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.") + End Try End Sub + + Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click + panOverlay.Visible = True + End Sub + + Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs) Handles btn_resetSearch.Click + + Dim dgv As String = "" + For Each c As DataGridViewColumn In dgvGesamtsicherheit.Columns + dgv &= c.Width & c.HeaderText & vbCrLf + Next + + clearSearchFields() + + LoadDGVSicherheiten() + currentGesSichRef.LOAD() + LoadStandort() + End Sub + + Private Sub clearSearchFields() + cbx_Suche_Warenort.changeItem("") + cbx_Suche_Filiale.changeItem("") + txt_Suche.Clear() + End Sub + + End Class diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 75d6542..9782cc8 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -362,6 +362,7 @@ 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() @@ -404,13 +405,13 @@ Partial Class frmHauptfenster 'mnuInfo ' Me.mnuInfo.Name = "mnuInfo" - Me.mnuInfo.Size = New System.Drawing.Size(291, 34) + Me.mnuInfo.Size = New System.Drawing.Size(193, 22) Me.mnuInfo.Text = "Info" ' 'conÜbernehmen ' Me.conÜbernehmen.Name = "conÜbernehmen" - Me.conÜbernehmen.Size = New System.Drawing.Size(400, 32) + Me.conÜbernehmen.Size = New System.Drawing.Size(284, 22) Me.conÜbernehmen.Text = "Akt übernehmen" ' 'conMenuAviso @@ -418,75 +419,74 @@ Partial Class frmHauptfenster Me.conMenuAviso.ImageScalingSize = New System.Drawing.Size(24, 24) Me.conMenuAviso.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conÜbernehmen, Me.ToolStripSeparator5, Me.conFertig, Me.ToolStripSeparator1, Me.conVorgeschrieben, Me.conVorbereitet, Me.conAnkunft, Me.conFreigabe, Me.conNichtEingetroffen, Me.ToolStripSeparator2, Me.conÄndern}) Me.conMenuAviso.Name = "conMenuTage" - Me.conMenuAviso.Size = New System.Drawing.Size(401, 278) + Me.conMenuAviso.Size = New System.Drawing.Size(285, 198) ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(397, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(281, 6) ' 'conFertig ' Me.conFertig.Name = "conFertig" - Me.conFertig.Size = New System.Drawing.Size(400, 32) + Me.conFertig.Size = New System.Drawing.Size(284, 22) Me.conFertig.Text = "LKW ist FERTIG / nicht FERTIG" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(397, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(281, 6) ' 'conVorgeschrieben ' Me.conVorgeschrieben.Name = "conVorgeschrieben" - Me.conVorgeschrieben.Size = New System.Drawing.Size(400, 32) + Me.conVorgeschrieben.Size = New System.Drawing.Size(284, 22) Me.conVorgeschrieben.Text = "auf Status VORGESCHRIEBEN setzen" ' 'conVorbereitet ' Me.conVorbereitet.Name = "conVorbereitet" - Me.conVorbereitet.Size = New System.Drawing.Size(400, 32) + Me.conVorbereitet.Size = New System.Drawing.Size(284, 22) Me.conVorbereitet.Text = "auf Status VORBEREITET setzen" Me.conVorbereitet.Visible = False ' 'conAnkunft ' Me.conAnkunft.Name = "conAnkunft" - Me.conAnkunft.Size = New System.Drawing.Size(400, 32) + Me.conAnkunft.Size = New System.Drawing.Size(284, 22) Me.conAnkunft.Text = "auf Status ANKUNFT setzen" ' 'conFreigabe ' Me.conFreigabe.Name = "conFreigabe" - Me.conFreigabe.Size = New System.Drawing.Size(400, 32) + Me.conFreigabe.Size = New System.Drawing.Size(284, 22) Me.conFreigabe.Text = "auf Status FREIGABE setzen" ' 'conNichtEingetroffen ' Me.conNichtEingetroffen.Name = "conNichtEingetroffen" - Me.conNichtEingetroffen.Size = New System.Drawing.Size(400, 32) + Me.conNichtEingetroffen.Size = New System.Drawing.Size(284, 22) Me.conNichtEingetroffen.Text = "auf Status NICHT EINGETROFFEN setzen" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(397, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(281, 6) ' 'conÄndern ' Me.conÄndern.Name = "conÄndern" - Me.conÄndern.Size = New System.Drawing.Size(400, 32) + Me.conÄndern.Size = New System.Drawing.Size(284, 22) Me.conÄndern.Text = "Eintrag ändern" ' 'MenuStrip1 ' Me.MenuStrip1.BackColor = System.Drawing.Color.White - Me.MenuStrip1.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.FunktionenToolStripMenuItem, Me.StatistikToolStripMenuItem, Me.ToolStripFormulare, Me.BREXITToolStripMenuItem, Me.mnuFragezeichen}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1372, 36) + Me.MenuStrip1.Size = New System.Drawing.Size(1372, 24) Me.MenuStrip1.TabIndex = 3 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -496,45 +496,45 @@ Partial Class frmHauptfenster Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AvisoTVToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.SpracheWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem}) Me.mnuProgramm.ForeColor = System.Drawing.Color.Black Me.mnuProgramm.Name = "mnuProgramm" - Me.mnuProgramm.Size = New System.Drawing.Size(116, 30) + Me.mnuProgramm.Size = New System.Drawing.Size(78, 20) Me.mnuProgramm.Text = "Verwaltung" ' 'mnuFirmen ' Me.mnuFirmen.Name = "mnuFirmen" - Me.mnuFirmen.Size = New System.Drawing.Size(282, 34) + Me.mnuFirmen.Size = New System.Drawing.Size(184, 22) Me.mnuFirmen.Text = "Firmen" Me.mnuFirmen.Visible = False ' 'NeuesPasswortToolStripMenuItem ' Me.NeuesPasswortToolStripMenuItem.Name = "NeuesPasswortToolStripMenuItem" - Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.NeuesPasswortToolStripMenuItem.Text = "Neues Passwort" ' 'OptionenToolStripMenuItem ' Me.OptionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZeilenInFarbeEinausToolStripMenuItem, Me.BerechtigungenNeuLadenToolStripMenuItem}) Me.OptionenToolStripMenuItem.Name = "OptionenToolStripMenuItem" - Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.OptionenToolStripMenuItem.Text = "Optionen" ' 'ZeilenInFarbeEinausToolStripMenuItem ' Me.ZeilenInFarbeEinausToolStripMenuItem.Name = "ZeilenInFarbeEinausToolStripMenuItem" - Me.ZeilenInFarbeEinausToolStripMenuItem.Size = New System.Drawing.Size(319, 34) + Me.ZeilenInFarbeEinausToolStripMenuItem.Size = New System.Drawing.Size(213, 22) Me.ZeilenInFarbeEinausToolStripMenuItem.Text = "Zeilen in Farbe ein/aus" ' 'BerechtigungenNeuLadenToolStripMenuItem ' Me.BerechtigungenNeuLadenToolStripMenuItem.Name = "BerechtigungenNeuLadenToolStripMenuItem" - Me.BerechtigungenNeuLadenToolStripMenuItem.Size = New System.Drawing.Size(319, 34) + Me.BerechtigungenNeuLadenToolStripMenuItem.Size = New System.Drawing.Size(213, 22) Me.BerechtigungenNeuLadenToolStripMenuItem.Text = "Berechtigungen neu laden" ' 'StandorteToolStripMenuItem ' Me.StandorteToolStripMenuItem.Name = "StandorteToolStripMenuItem" - Me.StandorteToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.StandorteToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.StandorteToolStripMenuItem.Text = "Standorte" Me.StandorteToolStripMenuItem.Visible = False ' @@ -542,444 +542,444 @@ Partial Class frmHauptfenster ' Me.AvisoTVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.InfoTextÄndernToolStripMenuItem}) Me.AvisoTVToolStripMenuItem.Name = "AvisoTVToolStripMenuItem" - Me.AvisoTVToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.AvisoTVToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.AvisoTVToolStripMenuItem.Text = "AvisoTV" Me.AvisoTVToolStripMenuItem.Visible = False ' 'InfoTextÄndernToolStripMenuItem ' Me.InfoTextÄndernToolStripMenuItem.Name = "InfoTextÄndernToolStripMenuItem" - Me.InfoTextÄndernToolStripMenuItem.Size = New System.Drawing.Size(236, 34) + Me.InfoTextÄndernToolStripMenuItem.Size = New System.Drawing.Size(156, 22) Me.InfoTextÄndernToolStripMenuItem.Text = "InfoText ändern" ' 'SecretAvisoToolStripMenuItem ' Me.SecretAvisoToolStripMenuItem.Name = "SecretAvisoToolStripMenuItem" - Me.SecretAvisoToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.SecretAvisoToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.SecretAvisoToolStripMenuItem.Text = "SecretAviso" ' 'AdministrationToolStripMenuItem ' Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem}) Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem" - Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.AdministrationToolStripMenuItem.Text = "Administration" Me.AdministrationToolStripMenuItem.Visible = False ' 'KdNrZuordnenToolStripMenuItem ' Me.KdNrZuordnenToolStripMenuItem.Name = "KdNrZuordnenToolStripMenuItem" - Me.KdNrZuordnenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.KdNrZuordnenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.KdNrZuordnenToolStripMenuItem.Text = "KdNr Zuordnen" ' 'OptionenToolStripMenuItem1 ' Me.OptionenToolStripMenuItem1.Name = "OptionenToolStripMenuItem1" - Me.OptionenToolStripMenuItem1.Size = New System.Drawing.Size(313, 34) + Me.OptionenToolStripMenuItem1.Size = New System.Drawing.Size(209, 22) Me.OptionenToolStripMenuItem1.Text = "Optionen" ' 'VorlagenUploadToolStripMenuItem ' Me.VorlagenUploadToolStripMenuItem.Name = "VorlagenUploadToolStripMenuItem" - Me.VorlagenUploadToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.VorlagenUploadToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.VorlagenUploadToolStripMenuItem.Text = "Vorlagen Upload" ' 'BarcodeTestToolStripMenuItem ' Me.BarcodeTestToolStripMenuItem.Name = "BarcodeTestToolStripMenuItem" - Me.BarcodeTestToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.BarcodeTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.BarcodeTestToolStripMenuItem.Text = "Barcode Test" ' 'TabellenToolStripMenuItem ' Me.TabellenToolStripMenuItem.Name = "TabellenToolStripMenuItem" - Me.TabellenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.TabellenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.TabellenToolStripMenuItem.Text = "Tabellen" ' 'SMSTestToolStripMenuItem ' Me.SMSTestToolStripMenuItem.Name = "SMSTestToolStripMenuItem" - Me.SMSTestToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.SMSTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.SMSTestToolStripMenuItem.Text = "SMS Test" ' 'QSTeamsToolStripMenuItem ' Me.QSTeamsToolStripMenuItem.Name = "QSTeamsToolStripMenuItem" - Me.QSTeamsToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.QSTeamsToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.QSTeamsToolStripMenuItem.Text = "QS Teams" ' 'LeereRechnungToolStripMenuItem ' Me.LeereRechnungToolStripMenuItem.Name = "LeereRechnungToolStripMenuItem" - Me.LeereRechnungToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.LeereRechnungToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.LeereRechnungToolStripMenuItem.Text = "leere Rechnung TEST" ' 'EMAILTESTToolStripMenuItem ' Me.EMAILTESTToolStripMenuItem.Name = "EMAILTESTToolStripMenuItem" - Me.EMAILTESTToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.EMAILTESTToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.EMAILTESTToolStripMenuItem.Text = "EMAILTEST" ' 'FreigabeMailTestToolStripMenuItem ' Me.FreigabeMailTestToolStripMenuItem.Name = "FreigabeMailTestToolStripMenuItem" - Me.FreigabeMailTestToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.FreigabeMailTestToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.FreigabeMailTestToolStripMenuItem.Text = "FreigabeMail test" ' 'SDLProgrammStartenToolStripMenuItem ' Me.SDLProgrammStartenToolStripMenuItem.Name = "SDLProgrammStartenToolStripMenuItem" - Me.SDLProgrammStartenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.SDLProgrammStartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.SDLProgrammStartenToolStripMenuItem.Text = "SDL Programm starten" ' 'TESTToolStripMenuItem ' Me.TESTToolStripMenuItem.Name = "TESTToolStripMenuItem" - Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.TESTToolStripMenuItem.Text = "TEST" ' 'AlleStatusMailsSchickenToolStripMenuItem ' Me.AlleStatusMailsSchickenToolStripMenuItem.Name = "AlleStatusMailsSchickenToolStripMenuItem" - Me.AlleStatusMailsSchickenToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.AlleStatusMailsSchickenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.AlleStatusMailsSchickenToolStripMenuItem.Text = "Alle Status Mails schicken" ' 'RoutenverwaltungToolStripMenuItem ' Me.RoutenverwaltungToolStripMenuItem.Name = "RoutenverwaltungToolStripMenuItem" - Me.RoutenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(313, 34) + Me.RoutenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.RoutenverwaltungToolStripMenuItem.Text = "Routenverwaltung" ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(181, 6) ' 'FirmaWechselnToolStripMenuItem ' Me.FirmaWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.VERIMEXToolStripMenuItem}) Me.FirmaWechselnToolStripMenuItem.Name = "FirmaWechselnToolStripMenuItem" - Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.FirmaWechselnToolStripMenuItem.Text = "Firma wechseln" ' 'VERAGToolStripMenuItem ' Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem" - Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.VERAGToolStripMenuItem.Text = "VERAG" ' 'ATILLAToolStripMenuItem ' Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem" - Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.ATILLAToolStripMenuItem.Text = "ATILLA" ' 'IMEXToolStripMenuItem ' Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem" - Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.IMEXToolStripMenuItem.Text = "IMEX" ' 'UNISPEDToolStripMenuItem ' Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem" - Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.UNISPEDToolStripMenuItem.Text = "UNISPED" ' 'AMBARToolStripMenuItem ' Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem" - Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.AMBARToolStripMenuItem.Text = "AMBAR" ' 'FRONTOFFICEToolStripMenuItem ' Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem" - Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.FRONTOFFICEToolStripMenuItem.Text = "FRONTOFFICE" ' 'VERIMEXToolStripMenuItem ' Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem" - Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(226, 34) + Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(148, 22) Me.VERIMEXToolStripMenuItem.Text = "VERIMEX" ' 'StandortWechselnToolStripMenuItem ' Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem, Me.DTBToolStripMenuItem}) Me.StandortWechselnToolStripMenuItem.Name = "StandortWechselnToolStripMenuItem" - Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.StandortWechselnToolStripMenuItem.Text = "Standort wechseln" Me.StandortWechselnToolStripMenuItem.Visible = False ' 'SUBToolStripMenuItem ' Me.SUBToolStripMenuItem.Name = "SUBToolStripMenuItem" - Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.SUBToolStripMenuItem.Text = "SUB" ' 'SBGToolStripMenuItem ' Me.SBGToolStripMenuItem.Name = "SBGToolStripMenuItem" - Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.SBGToolStripMenuItem.Text = "SBG" ' 'WAIToolStripMenuItem ' Me.WAIToolStripMenuItem.Name = "WAIToolStripMenuItem" - Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.WAIToolStripMenuItem.Text = "WAI" ' 'NKDToolStripMenuItem ' Me.NKDToolStripMenuItem.Name = "NKDToolStripMenuItem" - Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.NKDToolStripMenuItem.Text = "NKD" ' 'NEUToolStripMenuItem ' Me.NEUToolStripMenuItem.Name = "NEUToolStripMenuItem" - Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.NEUToolStripMenuItem.Text = "NEU" ' 'AMBToolStripMenuItem ' Me.AMBToolStripMenuItem.Name = "AMBToolStripMenuItem" - Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.AMBToolStripMenuItem.Text = "AMB" Me.AMBToolStripMenuItem.Visible = False ' 'DTBToolStripMenuItem ' Me.DTBToolStripMenuItem.Name = "DTBToolStripMenuItem" - Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(152, 34) + Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(100, 22) Me.DTBToolStripMenuItem.Text = "DTB" ' 'SpracheWechselnToolStripMenuItem ' Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.TürkischToolStripMenuItem}) Me.SpracheWechselnToolStripMenuItem.Name = "SpracheWechselnToolStripMenuItem" - Me.SpracheWechselnToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.SpracheWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.SpracheWechselnToolStripMenuItem.Text = "Sprache wechseln" ' 'DeutschToolStripMenuItem ' Me.DeutschToolStripMenuItem.Name = "DeutschToolStripMenuItem" - Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(178, 34) + Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(118, 22) Me.DeutschToolStripMenuItem.Text = "Deutsch" ' 'TürkischToolStripMenuItem ' Me.TürkischToolStripMenuItem.Name = "TürkischToolStripMenuItem" - Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(178, 34) + Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(118, 22) Me.TürkischToolStripMenuItem.Text = "Türkisch" ' 'NacherfassungToolStripMenuItem ' Me.NacherfassungToolStripMenuItem.Name = "NacherfassungToolStripMenuItem" - Me.NacherfassungToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.NacherfassungToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.NacherfassungToolStripMenuItem.Text = "Nacherfassung" Me.NacherfassungToolStripMenuItem.Visible = False ' 'VollständigesUpdateToolStripMenuItem ' Me.VollständigesUpdateToolStripMenuItem.Name = "VollständigesUpdateToolStripMenuItem" - Me.VollständigesUpdateToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.VollständigesUpdateToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.VollständigesUpdateToolStripMenuItem.Text = "Vollständiges Update" ' 'UpdateToolStripMenuItem ' Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem" - Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.UpdateToolStripMenuItem.Text = "Update" ' 'LogoutToolStripMenuItem ' Me.LogoutToolStripMenuItem.Name = "LogoutToolStripMenuItem" - Me.LogoutToolStripMenuItem.Size = New System.Drawing.Size(282, 34) + Me.LogoutToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.LogoutToolStripMenuItem.Text = "Logout" Me.LogoutToolStripMenuItem.Visible = False ' '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.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.Name = "FunktionenToolStripMenuItem" - Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(116, 30) + Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20) Me.FunktionenToolStripMenuItem.Text = "Funktionen" ' 'GenerelleGestellungenDurchsuchenToolStripMenuItem ' Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem" - Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen" Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False ' 'KundenVonFremdenSpeditionenToolStripMenuItem ' Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem" - Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen" ' 'KundenverwaltungToolStripMenuItem ' Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem" - Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung" ' 'MDMParkplatzkartenToolStripMenuItem ' Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem" - Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten" ' 'SMSSendenToolStripMenuItem ' Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem}) Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem" - Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.SMSSendenToolStripMenuItem.Text = "SMS" ' 'NeueSMSSendenToolStripMenuItem ' Me.NeueSMSSendenToolStripMenuItem.Name = "NeueSMSSendenToolStripMenuItem" - Me.NeueSMSSendenToolStripMenuItem.Size = New System.Drawing.Size(258, 34) + Me.NeueSMSSendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.NeueSMSSendenToolStripMenuItem.Text = "Neue SMS senden" ' 'GesendeteSMSToolStripMenuItem ' Me.GesendeteSMSToolStripMenuItem.Name = "GesendeteSMSToolStripMenuItem" - Me.GesendeteSMSToolStripMenuItem.Size = New System.Drawing.Size(258, 34) + Me.GesendeteSMSToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.GesendeteSMSToolStripMenuItem.Text = "SMS Verlauf" ' 'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem ' Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem" - Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen" ' 'MRNBarcodedruckToolStripMenuItem ' Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem" - Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck" ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(572, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6) ' 'ToolStripMenuItem3 ' Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(575, 34) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem3.Text = "Bürgschaften Excel" ' 'ToolStripMenuItem4 ' Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(575, 34) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel" Me.ToolStripMenuItem4.Visible = False ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - Me.ToolStripMenuItem5.Size = New System.Drawing.Size(575, 34) + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel" Me.ToolStripMenuItem5.Visible = False ' 'BürgschaftenExcelToolStripMenuItem ' Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem" - Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel" Me.BürgschaftenExcelToolStripMenuItem.Visible = False ' 'ToolStripMenuItem6 ' Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" - Me.ToolStripMenuItem6.Size = New System.Drawing.Size(575, 34) + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel" Me.ToolStripMenuItem6.Visible = False ' 'ToolStripMenuItem10 ' Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(575, 34) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem10.Text = "TICKET Parkplatz" ' 'TICKETWaidhausToolStripMenuItem ' Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem" - Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz" ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(572, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6) ' 'DAKOSYToolStripMenuItem ' Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem}) Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem" - Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.DAKOSYToolStripMenuItem.Text = "DAKOSY" ' 'StammreferenzenVerwaltenToolStripMenuItem ' Me.StammreferenzenVerwaltenToolStripMenuItem.Name = "StammreferenzenVerwaltenToolStripMenuItem" - Me.StammreferenzenVerwaltenToolStripMenuItem.Size = New System.Drawing.Size(332, 34) + Me.StammreferenzenVerwaltenToolStripMenuItem.Size = New System.Drawing.Size(221, 22) Me.StammreferenzenVerwaltenToolStripMenuItem.Text = "Stammreferenzen verwalten" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(572, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6) ' 'SDLAbholaufträgeToolStripMenuItem ' Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem" - Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge" ' 'ToolStripMenuItem13 ' Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13" - Me.ToolStripMenuItem13.Size = New System.Drawing.Size(575, 34) + Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)" ' 'VorauskassenToolStripMenuItem ' Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem" - Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen" ' 'DEGesamtsicherheitVeragGmbHToolStripMenuItem ' Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Name = "DEGesamtsicherheitVeragGmbHToolStripMenuItem" - Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Text = "DE | Gesamtsicherheit Verag GmbH" Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = False ' 'ATGesamtsicherheitVeragAGToolStripMenuItem ' Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Name = "ATGesamtsicherheitVeragAGToolStripMenuItem" - Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag AG" Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = False ' 'ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem ' Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Name = "ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem" - Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Text = "AT | Gesamtsicherheit IMEX CS GmbH" Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = False ' 'ATGesamtsicherheitVeragCSToolStripMenuItem ' Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Name = "ATGesamtsicherheitVeragCSToolStripMenuItem" - Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(575, 34) + Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag CS" Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = False ' @@ -988,53 +988,53 @@ Partial Class frmHauptfenster Me.StatistikToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LKWBerichtToolStripMenuItem, Me.StatistikADMINToolStripMenuItem, Me.ToolStripSeparator8, Me.BürgschafrtsbuchungenFremdToolStripMenuItem, Me.LKWEingetroffenNachToolStripMenuItem, Me.ToolStripSeparator7, Me.SDLAuswertungenToolStripMenuItem, Me.SDLAuswertungenToolStripMenuItem1}) Me.StatistikToolStripMenuItem.ForeColor = System.Drawing.Color.Black Me.StatistikToolStripMenuItem.Name = "StatistikToolStripMenuItem" - Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(123, 30) + Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(83, 20) Me.StatistikToolStripMenuItem.Text = "Auswertung" ' 'LKWBerichtToolStripMenuItem ' Me.LKWBerichtToolStripMenuItem.Name = "LKWBerichtToolStripMenuItem" - Me.LKWBerichtToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.LKWBerichtToolStripMenuItem.Size = New System.Drawing.Size(234, 22) Me.LKWBerichtToolStripMenuItem.Text = "LKW Bericht" ' 'StatistikADMINToolStripMenuItem ' Me.StatistikADMINToolStripMenuItem.Name = "StatistikADMINToolStripMenuItem" - Me.StatistikADMINToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.StatistikADMINToolStripMenuItem.Size = New System.Drawing.Size(234, 22) Me.StatistikADMINToolStripMenuItem.Text = "Statistik (Aviso)" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(231, 6) ' 'BürgschafrtsbuchungenFremdToolStripMenuItem ' Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Name = "BürgschafrtsbuchungenFremdToolStripMenuItem" - Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Size = New System.Drawing.Size(234, 22) Me.BürgschafrtsbuchungenFremdToolStripMenuItem.Text = "Bürgschaftsbuchungen Fremd" ' 'LKWEingetroffenNachToolStripMenuItem ' Me.LKWEingetroffenNachToolStripMenuItem.Name = "LKWEingetroffenNachToolStripMenuItem" - Me.LKWEingetroffenNachToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.LKWEingetroffenNachToolStripMenuItem.Size = New System.Drawing.Size(234, 22) Me.LKWEingetroffenNachToolStripMenuItem.Text = "LKW eingetroffen nach ..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(231, 6) ' 'SDLAuswertungenToolStripMenuItem ' Me.SDLAuswertungenToolStripMenuItem.Name = "SDLAuswertungenToolStripMenuItem" - Me.SDLAuswertungenToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.SDLAuswertungenToolStripMenuItem.Size = New System.Drawing.Size(234, 22) Me.SDLAuswertungenToolStripMenuItem.Text = "Buchhaltung" ' 'SDLAuswertungenToolStripMenuItem1 ' Me.SDLAuswertungenToolStripMenuItem1.Name = "SDLAuswertungenToolStripMenuItem1" - Me.SDLAuswertungenToolStripMenuItem1.Size = New System.Drawing.Size(351, 34) + Me.SDLAuswertungenToolStripMenuItem1.Size = New System.Drawing.Size(234, 22) Me.SDLAuswertungenToolStripMenuItem1.Text = "SDL Auswertungen" ' 'ToolStripFormulare @@ -1046,201 +1046,201 @@ Partial Class frmHauptfenster Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight Me.ToolStripFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.ToolStripFormulare.Name = "ToolStripFormulare" - Me.ToolStripFormulare.Size = New System.Drawing.Size(108, 30) + Me.ToolStripFormulare.Size = New System.Drawing.Size(73, 20) Me.ToolStripFormulare.Text = "Formulare" ' 'MANAGERToolStripMenuItem ' Me.MANAGERToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold) Me.MANAGERToolStripMenuItem.Name = "MANAGERToolStripMenuItem" - Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.MANAGERToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.MANAGERToolStripMenuItem.Text = "Formular - Manager" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6) ' 'ToolStripMenuItem2 ' Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStrVM_de, Me.ZollvollmachtDEFiskalToolStripMenuItem, Me.toolStrVM_at, Me.toolStrVM_at4200, Me.ZollvollmachtATEVToolStripMenuItem}) Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(421, 34) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(277, 22) Me.ToolStripMenuItem2.Text = "Vollmachten" ' 'toolStrVM_de ' Me.toolStrVM_de.Name = "toolStrVM_de" - Me.toolStrVM_de.Size = New System.Drawing.Size(307, 34) + Me.toolStrVM_de.Size = New System.Drawing.Size(204, 22) Me.toolStrVM_de.Text = "Zollvollmacht DE" ' 'ZollvollmachtDEFiskalToolStripMenuItem ' Me.ZollvollmachtDEFiskalToolStripMenuItem.Name = "ZollvollmachtDEFiskalToolStripMenuItem" - Me.ZollvollmachtDEFiskalToolStripMenuItem.Size = New System.Drawing.Size(307, 34) + Me.ZollvollmachtDEFiskalToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.ZollvollmachtDEFiskalToolStripMenuItem.Text = "Zollvollmacht DE - Fiskal" ' 'toolStrVM_at ' Me.toolStrVM_at.Name = "toolStrVM_at" - Me.toolStrVM_at.Size = New System.Drawing.Size(307, 34) + Me.toolStrVM_at.Size = New System.Drawing.Size(204, 22) Me.toolStrVM_at.Text = "Zollvollmacht AT" ' 'toolStrVM_at4200 ' Me.toolStrVM_at4200.Name = "toolStrVM_at4200" - Me.toolStrVM_at4200.Size = New System.Drawing.Size(307, 34) + Me.toolStrVM_at4200.Size = New System.Drawing.Size(204, 22) Me.toolStrVM_at4200.Text = "Zollvollmacht AT - Fiskal" ' 'ZollvollmachtATEVToolStripMenuItem ' Me.ZollvollmachtATEVToolStripMenuItem.Name = "ZollvollmachtATEVToolStripMenuItem" - Me.ZollvollmachtATEVToolStripMenuItem.Size = New System.Drawing.Size(307, 34) + Me.ZollvollmachtATEVToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.ZollvollmachtATEVToolStripMenuItem.Text = "Zollvollmacht AT - EV" ' 'ToolStripMenuItem7 ' Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7" - Me.ToolStripMenuItem7.Size = New System.Drawing.Size(421, 34) + Me.ToolStripMenuItem7.Size = New System.Drawing.Size(277, 22) Me.ToolStripMenuItem7.Text = "Gestellungsgarantien" ' 'ToolStripMenuItem12 ' Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12" - Me.ToolStripMenuItem12.Size = New System.Drawing.Size(421, 34) + Me.ToolStripMenuItem12.Size = New System.Drawing.Size(277, 22) Me.ToolStripMenuItem12.Text = "Importaviso" ' 'ToolStripMenuItem15 ' Me.ToolStripMenuItem15.Name = "ToolStripMenuItem15" - Me.ToolStripMenuItem15.Size = New System.Drawing.Size(421, 34) + Me.ToolStripMenuItem15.Size = New System.Drawing.Size(277, 22) Me.ToolStripMenuItem15.Text = "Dispoliste" ' 'ToolStripMenuItem18 ' Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(421, 34) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(277, 22) Me.ToolStripMenuItem18.Text = "Verzollungspreise" ' 'AuftragÜberwachungsdokumentToolStripMenuItem ' Me.AuftragÜberwachungsdokumentToolStripMenuItem.Name = "AuftragÜberwachungsdokumentToolStripMenuItem" - Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.AuftragÜberwachungsdokumentToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.AuftragÜberwachungsdokumentToolStripMenuItem.Text = "Auftrag Überwachungsdokument" ' 'toolVUB ' Me.toolVUB.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VUBVERAGSpeditionAGToolStripMenuItem, Me.VeragCustomsServiceToolStripMenuItem}) Me.toolVUB.Name = "toolVUB" - Me.toolVUB.Size = New System.Drawing.Size(421, 34) + Me.toolVUB.Size = New System.Drawing.Size(277, 22) Me.toolVUB.Text = "VUB" ' 'VUBVERAGSpeditionAGToolStripMenuItem ' Me.VUBVERAGSpeditionAGToolStripMenuItem.Name = "VUBVERAGSpeditionAGToolStripMenuItem" - Me.VUBVERAGSpeditionAGToolStripMenuItem.Size = New System.Drawing.Size(411, 34) + Me.VUBVERAGSpeditionAGToolStripMenuItem.Size = New System.Drawing.Size(271, 22) Me.VUBVERAGSpeditionAGToolStripMenuItem.Text = "VUB - VERAG Spedition AG" ' 'VeragCustomsServiceToolStripMenuItem ' Me.VeragCustomsServiceToolStripMenuItem.Name = "VeragCustomsServiceToolStripMenuItem" - Me.VeragCustomsServiceToolStripMenuItem.Size = New System.Drawing.Size(411, 34) + Me.VeragCustomsServiceToolStripMenuItem.Size = New System.Drawing.Size(271, 22) Me.VeragCustomsServiceToolStripMenuItem.Text = "VUB - VERAG Customs Service GmbH" ' 'toolVPCreditreform ' Me.toolVPCreditreform.Name = "toolVPCreditreform" - Me.toolVPCreditreform.Size = New System.Drawing.Size(421, 34) + Me.toolVPCreditreform.Size = New System.Drawing.Size(277, 22) Me.toolVPCreditreform.Text = "Bonitätsauskunft (Creditreform)" Me.toolVPCreditreform.Visible = False ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6) ' 'VerzollungsunterlagenToolStripMenuItem ' Me.VerzollungsunterlagenToolStripMenuItem.Name = "VerzollungsunterlagenToolStripMenuItem" - Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.VerzollungsunterlagenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.VerzollungsunterlagenToolStripMenuItem.Text = "Verzollungsunterlagen" ' 'ToolStripMenuItem11 ' Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11" - Me.ToolStripMenuItem11.Size = New System.Drawing.Size(421, 34) + Me.ToolStripMenuItem11.Size = New System.Drawing.Size(277, 22) Me.ToolStripMenuItem11.Text = "Verzollungsunterlagen BAR" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6) ' 'WAIDHAUSToolStripMenuItem ' Me.WAIDHAUSToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem8, Me.ToolStripMenuItem9, Me.AnnahmeblattIMPORTToolStripMenuItem, Me.AnnahmeblattEXPORTToolStripMenuItem, Me.ChecklisteVerwahrlagerToolStripMenuItem}) Me.WAIDHAUSToolStripMenuItem.Name = "WAIDHAUSToolStripMenuItem" - Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.WAIDHAUSToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.WAIDHAUSToolStripMenuItem.Text = "WAIDHAUS" ' 'ToolStripMenuItem8 ' Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" - Me.ToolStripMenuItem8.Size = New System.Drawing.Size(370, 34) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(243, 22) Me.ToolStripMenuItem8.Text = "Annahmeblatt IMPORT DE / TR" ' 'ToolStripMenuItem9 ' Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" - Me.ToolStripMenuItem9.Size = New System.Drawing.Size(370, 34) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(243, 22) Me.ToolStripMenuItem9.Text = "Annahmeblatt EXPORT DE / TR" ' 'AnnahmeblattIMPORTToolStripMenuItem ' Me.AnnahmeblattIMPORTToolStripMenuItem.Name = "AnnahmeblattIMPORTToolStripMenuItem" - Me.AnnahmeblattIMPORTToolStripMenuItem.Size = New System.Drawing.Size(370, 34) + Me.AnnahmeblattIMPORTToolStripMenuItem.Size = New System.Drawing.Size(243, 22) Me.AnnahmeblattIMPORTToolStripMenuItem.Text = "Annahmeblatt IMPORT DE / SRB" ' 'AnnahmeblattEXPORTToolStripMenuItem ' Me.AnnahmeblattEXPORTToolStripMenuItem.Name = "AnnahmeblattEXPORTToolStripMenuItem" - Me.AnnahmeblattEXPORTToolStripMenuItem.Size = New System.Drawing.Size(370, 34) + Me.AnnahmeblattEXPORTToolStripMenuItem.Size = New System.Drawing.Size(243, 22) Me.AnnahmeblattEXPORTToolStripMenuItem.Text = "Annahmeblatt EXPORT DE / SRB" ' 'ChecklisteVerwahrlagerToolStripMenuItem ' Me.ChecklisteVerwahrlagerToolStripMenuItem.Name = "ChecklisteVerwahrlagerToolStripMenuItem" - Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(370, 34) + Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(243, 22) Me.ChecklisteVerwahrlagerToolStripMenuItem.Text = "Checkliste Verwahrlager" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6) ' 'EinheitspapierToolStripMenuItem ' Me.EinheitspapierToolStripMenuItem.Name = "EinheitspapierToolStripMenuItem" - Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.EinheitspapierToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.EinheitspapierToolStripMenuItem.Text = "Einheitspapier 0777 (Vereinfachte ZA)" ' 'CMRToolStripMenuItem ' Me.CMRToolStripMenuItem.Name = "CMRToolStripMenuItem" - Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.CMRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.CMRToolStripMenuItem.Text = "CMR" ' 'Einheitspapier0735VersandverfahrenToolStripMenuItem ' Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Name = "Einheitspapier0735VersandverfahrenToolStripMenuItem" - Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(421, 34) + Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)" ' 'BREXITToolStripMenuItem ' Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem}) Me.BREXITToolStripMenuItem.Name = "BREXITToolStripMenuItem" - Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(83, 29) + Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 20) Me.BREXITToolStripMenuItem.Text = "BREXIT" Me.BREXITToolStripMenuItem.Visible = False ' @@ -1248,147 +1248,147 @@ Partial Class frmHauptfenster ' Me.GVMSToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.GVMSToolStripMenuItem.Name = "GVMSToolStripMenuItem" - Me.GVMSToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.GVMSToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.GVMSToolStripMenuItem.Text = "GVMS" ' 'GVMSUKIMportToolStripMenuItem ' Me.GVMSUKIMportToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.GVMSUKIMportToolStripMenuItem.Name = "GVMSUKIMportToolStripMenuItem" - Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.GVMSUKIMportToolStripMenuItem.Text = "GVMS (UK Import)" ' 'GVMSBeschreibungToolStripMenuItem ' Me.GVMSBeschreibungToolStripMenuItem.Enabled = False Me.GVMSBeschreibungToolStripMenuItem.Name = "GVMSBeschreibungToolStripMenuItem" - Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.GVMSBeschreibungToolStripMenuItem.Text = "GVMS Beschreibung" ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(366, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(245, 6) ' 'TicketIBFInlandBorderFacilitiesToolStripMenuItem ' Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Name = "TicketIBFInlandBorderFacilitiesToolStripMenuItem" - Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Text = "Ticket IBF (InlandBorderFacilities)" ' 'TicketIBFBeschreibungToolStripMenuItem ' Me.TicketIBFBeschreibungToolStripMenuItem.Name = "TicketIBFBeschreibungToolStripMenuItem" - Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.TicketIBFBeschreibungToolStripMenuItem.Text = "Ticket IBF Beschreibung" ' 'IBFStatusToolStripMenuItem ' Me.IBFStatusToolStripMenuItem.Name = "IBFStatusToolStripMenuItem" - Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.IBFStatusToolStripMenuItem.Text = "IBF Status" ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(366, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(245, 6) ' 'FREnveloppeSmartBorderToolStripMenuItem ' Me.FREnveloppeSmartBorderToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.FREnveloppeSmartBorderToolStripMenuItem.Name = "FREnveloppeSmartBorderToolStripMenuItem" - Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.FREnveloppeSmartBorderToolStripMenuItem.Text = "FR: Enveloppe (SmartBorder)" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(366, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(245, 6) ' 'PBNIrelandFähreToolStripMenuItem ' Me.PBNIrelandFähreToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.PBNIrelandFähreToolStripMenuItem.Name = "PBNIrelandFähreToolStripMenuItem" - Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.PBNIrelandFähreToolStripMenuItem.Text = "PBN (Ireland Fähre)" ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(366, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(245, 6) ' 'WARENORTToolStripMenuItem ' Me.WARENORTToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATFormularZa282ToolStripMenuItem, Me.ATInfoToolStripMenuItem, Me.ToolStripSeparator17, Me.DEFormular0442ToolStripMenuItem, Me.DEInfoToolStripMenuItem}) Me.WARENORTToolStripMenuItem.Name = "WARENORTToolStripMenuItem" - Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.WARENORTToolStripMenuItem.Text = "REX" ' 'ATFormularZa282ToolStripMenuItem ' Me.ATFormularZa282ToolStripMenuItem.Name = "ATFormularZa282ToolStripMenuItem" - Me.ATFormularZa282ToolStripMenuItem.Size = New System.Drawing.Size(264, 34) + Me.ATFormularZa282ToolStripMenuItem.Size = New System.Drawing.Size(172, 22) Me.ATFormularZa282ToolStripMenuItem.Text = "AT Formular Za278" ' 'ATInfoToolStripMenuItem ' Me.ATInfoToolStripMenuItem.Name = "ATInfoToolStripMenuItem" - Me.ATInfoToolStripMenuItem.Size = New System.Drawing.Size(264, 34) + Me.ATInfoToolStripMenuItem.Size = New System.Drawing.Size(172, 22) Me.ATInfoToolStripMenuItem.Text = "AT Info" ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(261, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(169, 6) ' 'DEFormular0442ToolStripMenuItem ' Me.DEFormular0442ToolStripMenuItem.Name = "DEFormular0442ToolStripMenuItem" - Me.DEFormular0442ToolStripMenuItem.Size = New System.Drawing.Size(264, 34) + Me.DEFormular0442ToolStripMenuItem.Size = New System.Drawing.Size(172, 22) Me.DEFormular0442ToolStripMenuItem.Text = "DE Formular 0442" ' 'DEInfoToolStripMenuItem ' Me.DEInfoToolStripMenuItem.Name = "DEInfoToolStripMenuItem" - Me.DEInfoToolStripMenuItem.Size = New System.Drawing.Size(264, 34) + Me.DEInfoToolStripMenuItem.Size = New System.Drawing.Size(172, 22) Me.DEInfoToolStripMenuItem.Text = "DE Info" ' 'ToolStripMenuItem14 ' Me.ToolStripMenuItem14.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem16, Me.ToolStripSeparator19}) Me.ToolStripMenuItem14.Name = "ToolStripMenuItem14" - Me.ToolStripMenuItem14.Size = New System.Drawing.Size(369, 34) + Me.ToolStripMenuItem14.Size = New System.Drawing.Size(248, 22) Me.ToolStripMenuItem14.Text = "WARENORT" ' 'ToolStripMenuItem16 ' Me.ToolStripMenuItem16.Name = "ToolStripMenuItem16" - Me.ToolStripMenuItem16.Size = New System.Drawing.Size(264, 34) + Me.ToolStripMenuItem16.Size = New System.Drawing.Size(172, 22) Me.ToolStripMenuItem16.Text = "AT Formular Za283" ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(261, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(169, 6) ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(366, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(245, 6) ' 'EORIUKGeneriertenToolStripMenuItem ' Me.EORIUKGeneriertenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen1 Me.EORIUKGeneriertenToolStripMenuItem.Name = "EORIUKGeneriertenToolStripMenuItem" - Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.EORIUKGeneriertenToolStripMenuItem.Text = "EORI UK generierten" ' 'KAPKentAccessPermitToolStripMenuItem ' Me.KAPKentAccessPermitToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen Me.KAPKentAccessPermitToolStripMenuItem.Name = "KAPKentAccessPermitToolStripMenuItem" - Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(369, 34) + Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(248, 22) Me.KAPKentAccessPermitToolStripMenuItem.Text = "KAP (KentAccessPermit)" ' 'mnuFragezeichen @@ -1397,85 +1397,85 @@ Partial Class frmHauptfenster Me.mnuFragezeichen.ForeColor = System.Drawing.Color.Black Me.mnuFragezeichen.ImageTransparentColor = System.Drawing.Color.Brown Me.mnuFragezeichen.Name = "mnuFragezeichen" - Me.mnuFragezeichen.Size = New System.Drawing.Size(36, 30) + Me.mnuFragezeichen.Size = New System.Drawing.Size(24, 20) Me.mnuFragezeichen.Text = "?" ' 'VerfahrenshandbücherToolStripMenuItem ' Me.VerfahrenshandbücherToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem}) Me.VerfahrenshandbücherToolStripMenuItem.Name = "VerfahrenshandbücherToolStripMenuItem" - Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(291, 34) + Me.VerfahrenshandbücherToolStripMenuItem.Size = New System.Drawing.Size(193, 22) Me.VerfahrenshandbücherToolStripMenuItem.Text = "Verfahrenshandbücher" ' 'VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem ' Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Name = "VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem" - Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Size = New System.Drawing.Size(463, 34) + Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Size = New System.Drawing.Size(306, 22) Me.VerfahrenshandbuchVERAGGmbHZollWOToolStripMenuItem.Text = "Verfahrenshandbuch VERAG GmbH Zoll WO" ' 'ChecklistenToolStripMenuItem ' Me.ChecklistenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChecklisteWOCHECKLISTEZEallgemein, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem, Me.ToolStripSeparator22, Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem, Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1, Me.ToolStripSeparator21, Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem, Me.WOCECKLISTEZEWDHToolStripMenuItem}) Me.ChecklistenToolStripMenuItem.Name = "ChecklistenToolStripMenuItem" - Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(291, 34) + Me.ChecklistenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) Me.ChecklistenToolStripMenuItem.Text = "Checklisten" ' 'ChecklisteWOCHECKLISTEZEallgemein ' Me.ChecklisteWOCHECKLISTEZEallgemein.Name = "ChecklisteWOCHECKLISTEZEallgemein" - Me.ChecklisteWOCHECKLISTEZEallgemein.Size = New System.Drawing.Size(573, 34) + Me.ChecklisteWOCHECKLISTEZEallgemein.Size = New System.Drawing.Size(381, 22) Me.ChecklisteWOCHECKLISTEZEallgemein.Text = "ZE WO CHECKLISTE ZE allgemein" ' 'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem ' Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem" - Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Size = New System.Drawing.Size(573, 34) + Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Size = New System.Drawing.Size(381, 22) Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA" ' 'ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem ' Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Name = "ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem" - Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Size = New System.Drawing.Size(573, 34) + Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Size = New System.Drawing.Size(381, 22) Me.ZEVerfahrensanleitungGestellungSumAFremdpersonalToolStripMenuItem.Text = "ZE Verfahrensanleitung Gestellung/SumA - Fremdpersonal" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(570, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(378, 6) ' 'WOCHECKLISTEZVAllgemeinToolStripMenuItem ' Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Name = "WOCHECKLISTEZVAllgemeinToolStripMenuItem" - Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Size = New System.Drawing.Size(573, 34) + Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Size = New System.Drawing.Size(381, 22) Me.WOCHECKLISTEZVAllgemeinToolStripMenuItem.Text = "ZV WO CHECKLISTE ZV allgemein" ' 'ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1 ' Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Name = "ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1" - Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Size = New System.Drawing.Size(573, 34) + Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Size = New System.Drawing.Size(381, 22) Me.ZEVerfahrensanleitungGestellungSumAToolStripMenuItem1.Text = "ZV Verfahrensanleitung" ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(570, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(378, 6) ' 'WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem ' Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Name = "WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem" - Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Size = New System.Drawing.Size(573, 34) + Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Size = New System.Drawing.Size(381, 22) Me.WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem.Text = "WO CHECKLISTE Abgang Verwahrungsort ZV" ' 'WOCECKLISTEZEWDHToolStripMenuItem ' Me.WOCECKLISTEZEWDHToolStripMenuItem.Name = "WOCECKLISTEZEWDHToolStripMenuItem" - Me.WOCECKLISTEZEWDHToolStripMenuItem.Size = New System.Drawing.Size(573, 34) + Me.WOCECKLISTEZEWDHToolStripMenuItem.Size = New System.Drawing.Size(381, 22) Me.WOCECKLISTEZEWDHToolStripMenuItem.Text = "WO CHECKLISTE ZE WDH" ' 'HandbuchToolStripMenuItem ' Me.HandbuchToolStripMenuItem.Name = "HandbuchToolStripMenuItem" - Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(291, 34) + Me.HandbuchToolStripMenuItem.Size = New System.Drawing.Size(193, 22) Me.HandbuchToolStripMenuItem.Text = "Handbuch" ' 'btnWoche @@ -1534,7 +1534,7 @@ Partial Class frmHauptfenster Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 587) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 599) Me.pnlDetailsRechts.TabIndex = 0 ' 'Label6 @@ -1544,7 +1544,7 @@ Partial Class frmHauptfenster Me.Label6.ForeColor = System.Drawing.Color.White Me.Label6.Location = New System.Drawing.Point(232, 55) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(109, 17) + Me.Label6.Size = New System.Drawing.Size(81, 13) Me.Label6.TabIndex = 11 Me.Label6.Text = "mind. 2 Zeichen" ' @@ -1554,7 +1554,7 @@ Partial Class frmHauptfenster Me.txtSuche.Location = New System.Drawing.Point(7, 28) Me.txtSuche.MaxLength = 30 Me.txtSuche.Name = "txtSuche" - Me.txtSuche.Size = New System.Drawing.Size(306, 35) + Me.txtSuche.Size = New System.Drawing.Size(306, 26) Me.txtSuche.TabIndex = 0 ' 'Top @@ -1575,7 +1575,7 @@ Partial Class frmHauptfenster Me.Top.Controls.Add(Me.btnKunden) Me.Top.Controls.Add(Me.btnSpedBuch) Me.Top.Dock = System.Windows.Forms.DockStyle.Top - Me.Top.Location = New System.Drawing.Point(0, 36) + Me.Top.Location = New System.Drawing.Point(0, 24) Me.Top.Name = "Top" Me.Top.Size = New System.Drawing.Size(1372, 52) Me.Top.TabIndex = 6 @@ -1861,7 +1861,7 @@ Partial Class frmHauptfenster Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.lblMitarbeiter.Location = New System.Drawing.Point(2, 184) Me.lblMitarbeiter.Name = "lblMitarbeiter" - Me.lblMitarbeiter.Size = New System.Drawing.Size(190, 20) + Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) Me.lblMitarbeiter.TabIndex = 1 Me.lblMitarbeiter.Text = "Max Mustermann (Admin)" Me.lblMitarbeiter.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1875,7 +1875,7 @@ Partial Class frmHauptfenster Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.lblGrenzstelle.Location = New System.Drawing.Point(143, 199) Me.lblGrenzstelle.Name = "lblGrenzstelle" - Me.lblGrenzstelle.Size = New System.Drawing.Size(43, 20) + Me.lblGrenzstelle.Size = New System.Drawing.Size(29, 13) Me.lblGrenzstelle.TabIndex = 0 Me.lblGrenzstelle.Text = "SUB" Me.lblGrenzstelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -2050,7 +2050,7 @@ Partial Class frmHauptfenster Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black Me.lblFimaAviso.Location = New System.Drawing.Point(67, 199) Me.lblFimaAviso.Name = "lblFimaAviso" - Me.lblFimaAviso.Size = New System.Drawing.Size(97, 20) + Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) Me.lblFimaAviso.TabIndex = 11 Me.lblFimaAviso.Text = "XXXXXXXX" ' @@ -2074,7 +2074,7 @@ Partial Class frmHauptfenster Me.Label7.ForeColor = System.Drawing.Color.Black Me.Label7.Location = New System.Drawing.Point(6, 5) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(56, 20) + Me.Label7.Size = New System.Drawing.Size(41, 13) Me.Label7.TabIndex = 3 Me.Label7.Text = "Links:" ' @@ -2138,7 +2138,7 @@ Partial Class frmHauptfenster Me.lblVersion.ForeColor = System.Drawing.Color.Black Me.lblVersion.Location = New System.Drawing.Point(3, 199) Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(68, 20) + Me.lblVersion.Size = New System.Drawing.Size(47, 13) Me.lblVersion.TabIndex = 6 Me.lblVersion.Text = "V1.0.0.0" ' @@ -2215,12 +2215,12 @@ Partial Class frmHauptfenster Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17}) Me.cntxtAtilla.Name = "cntxt" - Me.cntxtAtilla.Size = New System.Drawing.Size(139, 36) + Me.cntxtAtilla.Size = New System.Drawing.Size(111, 26) ' 'ToolStripMenuItem17 ' Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" - Me.ToolStripMenuItem17.Size = New System.Drawing.Size(138, 32) + Me.ToolStripMenuItem17.Size = New System.Drawing.Size(110, 22) Me.ToolStripMenuItem17.Text = "ATILLA" ' 'SplitContainer3 @@ -2355,7 +2355,7 @@ Partial Class frmHauptfenster Me.lblMeineAviso.ForeColor = System.Drawing.Color.White Me.lblMeineAviso.Location = New System.Drawing.Point(29, 5) Me.lblMeineAviso.Name = "lblMeineAviso" - Me.lblMeineAviso.Size = New System.Drawing.Size(163, 20) + Me.lblMeineAviso.Size = New System.Drawing.Size(113, 13) Me.lblMeineAviso.TabIndex = 0 Me.lblMeineAviso.Text = "Meine Sendungen:" ' @@ -2373,7 +2373,7 @@ Partial Class frmHauptfenster Me.cboMy_Grenzstelle.FormattingEnabled = True Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(113, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" - Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 28) + Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) Me.cboMy_Grenzstelle.TabIndex = 26 ' 'Label18 @@ -2392,9 +2392,9 @@ Partial Class frmHauptfenster Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_LKW.AutoSize = True Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White - Me.cbx_My_LKW.Location = New System.Drawing.Point(-18, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(-11, 3) Me.cbx_My_LKW.Name = "cbx_My_LKW" - Me.cbx_My_LKW.Size = New System.Drawing.Size(57, 21) + Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17) Me.cbx_My_LKW.TabIndex = 24 Me.cbx_My_LKW.Text = "LKW" Me.cbx_My_LKW.UseVisualStyleBackColor = True @@ -2406,9 +2406,9 @@ Partial Class frmHauptfenster Me.cboMy_QS.Checked = True Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_QS.ForeColor = System.Drawing.Color.White - Me.cboMy_QS.Location = New System.Drawing.Point(438, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(445, 3) Me.cboMy_QS.Name = "cboMy_QS" - Me.cboMy_QS.Size = New System.Drawing.Size(22, 21) + Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) Me.cboMy_QS.TabIndex = 23 Me.cboMy_QS.ThreeState = True Me.cboMy_QS.UseVisualStyleBackColor = True @@ -2420,9 +2420,9 @@ Partial Class frmHauptfenster Me.cboMy_VB.Checked = True Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_VB.ForeColor = System.Drawing.Color.White - Me.cboMy_VB.Location = New System.Drawing.Point(457, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(464, 3) Me.cboMy_VB.Name = "cboMy_VB" - Me.cboMy_VB.Size = New System.Drawing.Size(22, 21) + Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) Me.cboMy_VB.TabIndex = 22 Me.cboMy_VB.ThreeState = True Me.cboMy_VB.UseVisualStyleBackColor = True @@ -2440,7 +2440,7 @@ Partial Class frmHauptfenster Me.cboMyAvisoAnzeige.FormattingEnabled = True Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(232, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" - Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 28) + Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) Me.cboMyAvisoAnzeige.TabIndex = 21 ' 'Label17 @@ -2630,7 +2630,7 @@ Partial Class frmHauptfenster Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainer1.IsSplitterFixed = True - Me.SplitContainer1.Location = New System.Drawing.Point(0, 88) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 76) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -2643,7 +2643,7 @@ Partial Class frmHauptfenster Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts) Me.SplitContainer1.Panel2MinSize = 300 - Me.SplitContainer1.Size = New System.Drawing.Size(1372, 589) + Me.SplitContainer1.Size = New System.Drawing.Size(1372, 601) Me.SplitContainer1.SplitterDistance = 819 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 7 @@ -2657,7 +2657,7 @@ Partial Class frmHauptfenster Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564) Me.pnlDetailsLinks.Name = "pnlDetailsLinks" - Me.pnlDetailsLinks.Size = New System.Drawing.Size(817, 587) + Me.pnlDetailsLinks.Size = New System.Drawing.Size(817, 599) Me.pnlDetailsLinks.TabIndex = 0 ' 'splitMain @@ -2680,8 +2680,8 @@ Partial Class frmHauptfenster ' Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2) Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption) - Me.splitMain.Size = New System.Drawing.Size(815, 585) - Me.splitMain.SplitterDistance = 276 + Me.splitMain.Size = New System.Drawing.Size(815, 597) + Me.splitMain.SplitterDistance = 288 Me.splitMain.TabIndex = 0 ' 'gridAviso @@ -2734,7 +2734,7 @@ Partial Class frmHauptfenster Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAviso.Size = New System.Drawing.Size(815, 56) + Me.gridAviso.Size = New System.Drawing.Size(815, 68) Me.gridAviso.TabIndex = 1 Me.gridAviso.TabStop = False ' @@ -2820,7 +2820,7 @@ Partial Class frmHauptfenster Me.cboImEx.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD"}) Me.cboImEx.Location = New System.Drawing.Point(828, 3) Me.cboImEx.Name = "cboImEx" - Me.cboImEx.Size = New System.Drawing.Size(78, 33) + Me.cboImEx.Size = New System.Drawing.Size(78, 24) Me.cboImEx.TabIndex = 24 ' 'Label21 @@ -2841,7 +2841,7 @@ Partial Class frmHauptfenster Me.cbxCluster.ForeColor = System.Drawing.Color.White Me.cbxCluster.Location = New System.Drawing.Point(767, 35) Me.cbxCluster.Name = "cbxCluster" - Me.cbxCluster.Size = New System.Drawing.Size(103, 21) + Me.cbxCluster.Size = New System.Drawing.Size(96, 17) Me.cbxCluster.TabIndex = 20 Me.cbxCluster.Text = "Firmenverbund" Me.cbxCluster.UseVisualStyleBackColor = True @@ -2859,7 +2859,7 @@ Partial Class frmHauptfenster Me.cboTeams.FormattingEnabled = True Me.cboTeams.Location = New System.Drawing.Point(379, 3) Me.cboTeams.Name = "cboTeams" - Me.cboTeams.Size = New System.Drawing.Size(107, 33) + Me.cboTeams.Size = New System.Drawing.Size(107, 24) Me.cboTeams.TabIndex = 19 ' 'lblErweitereSuche @@ -2890,7 +2890,7 @@ Partial Class frmHauptfenster Me.Label8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) Me.Label8.Location = New System.Drawing.Point(67, 7) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(22, 26) + Me.Label8.Size = New System.Drawing.Size(15, 18) Me.Label8.TabIndex = 15 Me.Label8.Text = "*" Me.Label8.Visible = False @@ -2921,7 +2921,7 @@ Partial Class frmHauptfenster Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD", "NEU", "AMB", "???"}) Me.cboGrenzstelle.Location = New System.Drawing.Point(379, 30) Me.cboGrenzstelle.Name = "cboGrenzstelle" - Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 33) + Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 24) Me.cboGrenzstelle.TabIndex = 13 ' 'Label4 @@ -2964,7 +2964,7 @@ Partial Class frmHauptfenster Me.MyComboBox1.Location = New System.Drawing.Point(46, 1) Me.MyComboBox1.MaxLength = 4 Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(98, 28) + Me.MyComboBox1.Size = New System.Drawing.Size(98, 21) Me.MyComboBox1.TabIndex = 7 ' 'pnlSearch @@ -3003,7 +3003,7 @@ Partial Class frmHauptfenster Me.txtDyRef.Location = New System.Drawing.Point(389, 61) Me.txtDyRef.MaxLength = 100 Me.txtDyRef.Name = "txtDyRef" - Me.txtDyRef.Size = New System.Drawing.Size(216, 30) + Me.txtDyRef.Size = New System.Drawing.Size(216, 23) Me.txtDyRef.TabIndex = 21 ' 'Label19 @@ -3032,7 +3032,7 @@ Partial Class frmHauptfenster Me.txtlkwId.Location = New System.Drawing.Point(79, 61) Me.txtlkwId.MaxLength = 100 Me.txtlkwId.Name = "txtlkwId" - Me.txtlkwId.Size = New System.Drawing.Size(236, 30) + Me.txtlkwId.Size = New System.Drawing.Size(236, 23) Me.txtlkwId.TabIndex = 10 ' 'cbxNE @@ -3041,7 +3041,7 @@ Partial Class frmHauptfenster Me.cbxNE.ForeColor = System.Drawing.Color.White Me.cbxNE.Location = New System.Drawing.Point(553, 86) Me.cbxNE.Name = "cbxNE" - Me.cbxNE.Size = New System.Drawing.Size(117, 21) + Me.cbxNE.Size = New System.Drawing.Size(110, 17) Me.cbxNE.TabIndex = 16 Me.cbxNE.Text = "Nicht eingetroffen" Me.cbxNE.UseVisualStyleBackColor = True @@ -3052,7 +3052,7 @@ Partial Class frmHauptfenster Me.cbxFreigabe.ForeColor = System.Drawing.Color.White Me.cbxFreigabe.Location = New System.Drawing.Point(462, 86) Me.cbxFreigabe.Name = "cbxFreigabe" - Me.cbxFreigabe.Size = New System.Drawing.Size(92, 21) + Me.cbxFreigabe.Size = New System.Drawing.Size(85, 17) Me.cbxFreigabe.TabIndex = 15 Me.cbxFreigabe.Text = "Freigegeben" Me.cbxFreigabe.UseVisualStyleBackColor = True @@ -3063,7 +3063,7 @@ Partial Class frmHauptfenster Me.cbxAnkunft.ForeColor = System.Drawing.Color.White Me.cbxAnkunft.Location = New System.Drawing.Point(393, 86) Me.cbxAnkunft.Name = "cbxAnkunft" - Me.cbxAnkunft.Size = New System.Drawing.Size(70, 21) + Me.cbxAnkunft.Size = New System.Drawing.Size(63, 17) Me.cbxAnkunft.TabIndex = 14 Me.cbxAnkunft.Text = "Ankunft" Me.cbxAnkunft.UseVisualStyleBackColor = True @@ -3074,7 +3074,7 @@ Partial Class frmHauptfenster Me.cbxVorg.ForeColor = System.Drawing.Color.White Me.cbxVorg.Location = New System.Drawing.Point(294, 86) Me.cbxVorg.Name = "cbxVorg" - Me.cbxVorg.Size = New System.Drawing.Size(107, 21) + Me.cbxVorg.Size = New System.Drawing.Size(100, 17) Me.cbxVorg.TabIndex = 13 Me.cbxVorg.Text = "Vorgeschrieben" Me.cbxVorg.UseVisualStyleBackColor = True @@ -3085,7 +3085,7 @@ Partial Class frmHauptfenster Me.cbxVorb.ForeColor = System.Drawing.Color.White Me.cbxVorb.Location = New System.Drawing.Point(193, 86) Me.cbxVorb.Name = "cbxVorb" - Me.cbxVorb.Size = New System.Drawing.Size(102, 21) + Me.cbxVorb.Size = New System.Drawing.Size(95, 17) Me.cbxVorb.TabIndex = 12 Me.cbxVorb.Text = "Vorbereitet QS" Me.cbxVorb.UseVisualStyleBackColor = True @@ -3096,7 +3096,7 @@ Partial Class frmHauptfenster Me.cbxErfasst.ForeColor = System.Drawing.Color.White Me.cbxErfasst.Location = New System.Drawing.Point(129, 86) Me.cbxErfasst.Name = "cbxErfasst" - Me.cbxErfasst.Size = New System.Drawing.Size(65, 21) + Me.cbxErfasst.Size = New System.Drawing.Size(58, 17) Me.cbxErfasst.TabIndex = 11 Me.cbxErfasst.Text = "Erfasst" Me.cbxErfasst.UseVisualStyleBackColor = True @@ -3117,7 +3117,7 @@ Partial Class frmHauptfenster Me.txtKdAuftragsnr.Location = New System.Drawing.Point(389, 35) Me.txtKdAuftragsnr.MaxLength = 100 Me.txtKdAuftragsnr.Name = "txtKdAuftragsnr" - Me.txtKdAuftragsnr.Size = New System.Drawing.Size(216, 30) + Me.txtKdAuftragsnr.Size = New System.Drawing.Size(216, 23) Me.txtKdAuftragsnr.TabIndex = 9 ' 'txtAuftraggeber @@ -3126,7 +3126,7 @@ Partial Class frmHauptfenster Me.txtAuftraggeber.Location = New System.Drawing.Point(79, 13) Me.txtAuftraggeber.MaxLength = 100 Me.txtAuftraggeber.Name = "txtAuftraggeber" - Me.txtAuftraggeber.Size = New System.Drawing.Size(236, 30) + Me.txtAuftraggeber.Size = New System.Drawing.Size(236, 23) Me.txtAuftraggeber.TabIndex = 1 ' 'lblErwKdAtrNr @@ -3171,7 +3171,7 @@ Partial Class frmHauptfenster Me.txtEmpfänger.Location = New System.Drawing.Point(79, 35) Me.txtEmpfänger.MaxLength = 100 Me.txtEmpfänger.Name = "txtEmpfänger" - Me.txtEmpfänger.Size = New System.Drawing.Size(236, 30) + Me.txtEmpfänger.Size = New System.Drawing.Size(236, 23) Me.txtEmpfänger.TabIndex = 5 ' 'cboFiliale @@ -3185,7 +3185,7 @@ Partial Class frmHauptfenster Me.cboFiliale.Location = New System.Drawing.Point(389, 13) Me.cboFiliale.MaxLength = 4 Me.cboFiliale.Name = "cboFiliale" - Me.cboFiliale.Size = New System.Drawing.Size(70, 33) + Me.cboFiliale.Size = New System.Drawing.Size(70, 24) Me.cboFiliale.TabIndex = 3 ' 'txtAbfertigungsnummer @@ -3194,7 +3194,7 @@ Partial Class frmHauptfenster Me.txtAbfertigungsnummer.Location = New System.Drawing.Point(458, 13) Me.txtAbfertigungsnummer.MaxLength = 8 Me.txtAbfertigungsnummer.Name = "txtAbfertigungsnummer" - Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(147, 30) + Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(147, 23) Me.txtAbfertigungsnummer.TabIndex = 4 ' 'lblErwFilialePos @@ -3223,7 +3223,7 @@ Partial Class frmHauptfenster Me.cbxAlle.ForeColor = System.Drawing.Color.White Me.cbxAlle.Location = New System.Drawing.Point(79, 86) Me.cbxAlle.Name = "cbxAlle" - Me.cbxAlle.Size = New System.Drawing.Size(50, 21) + Me.cbxAlle.Size = New System.Drawing.Size(43, 17) Me.cbxAlle.TabIndex = 10 Me.cbxAlle.Text = "Alle" Me.cbxAlle.UseVisualStyleBackColor = True @@ -3256,7 +3256,7 @@ Partial Class frmHauptfenster Me.Label9.ForeColor = System.Drawing.Color.Red Me.Label9.Location = New System.Drawing.Point(370, 5) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(618, 22) + Me.Label9.Size = New System.Drawing.Size(438, 15) Me.Label9.TabIndex = 9 Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten." Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -3351,18 +3351,18 @@ Partial Class frmHauptfenster Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BundesanzeigerToolStripMenuItem, Me.EUTaricToolStripMenuItem, Me.ZugelassenerAusführerToolStripMenuItem}) Me.cntxt.Name = "cntxt" - Me.cntxt.Size = New System.Drawing.Size(278, 100) + Me.cntxt.Size = New System.Drawing.Size(207, 94) ' 'BundesanzeigerToolStripMenuItem ' Me.BundesanzeigerToolStripMenuItem.Name = "BundesanzeigerToolStripMenuItem" - Me.BundesanzeigerToolStripMenuItem.Size = New System.Drawing.Size(277, 32) + Me.BundesanzeigerToolStripMenuItem.Size = New System.Drawing.Size(206, 30) Me.BundesanzeigerToolStripMenuItem.Text = "Bundesanzeiger" ' 'EUTaricToolStripMenuItem ' Me.EUTaricToolStripMenuItem.Name = "EUTaricToolStripMenuItem" - Me.EUTaricToolStripMenuItem.Size = New System.Drawing.Size(277, 32) + Me.EUTaricToolStripMenuItem.Size = New System.Drawing.Size(206, 30) Me.EUTaricToolStripMenuItem.Text = "EU-Taric" ' 'ZugelassenerAusführerToolStripMenuItem @@ -3370,42 +3370,42 @@ Partial Class frmHauptfenster Me.ZugelassenerAusführerToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AllgemeinToolStripMenuItem, Me.AllgemeineEinführungExportkontrolleToolStripMenuItem, Me.BrexitToolStripMenuItem1, Me.EmbargosLänderToolStripMenuItem, Me.GüterlisteToolStripMenuItem}) Me.ZugelassenerAusführerToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico Me.ZugelassenerAusführerToolStripMenuItem.Name = "ZugelassenerAusführerToolStripMenuItem" - Me.ZugelassenerAusführerToolStripMenuItem.Size = New System.Drawing.Size(277, 32) + Me.ZugelassenerAusführerToolStripMenuItem.Size = New System.Drawing.Size(206, 30) Me.ZugelassenerAusführerToolStripMenuItem.Text = "Zugelassener Ausführer" ' 'AllgemeinToolStripMenuItem ' Me.AllgemeinToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico Me.AllgemeinToolStripMenuItem.Name = "AllgemeinToolStripMenuItem" - Me.AllgemeinToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.AllgemeinToolStripMenuItem.Size = New System.Drawing.Size(280, 22) Me.AllgemeinToolStripMenuItem.Text = "Allgemein" ' 'AllgemeineEinführungExportkontrolleToolStripMenuItem ' Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Name = "AllgemeineEinführungExportkontrolleToolStripMenuItem" - Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Size = New System.Drawing.Size(280, 22) Me.AllgemeineEinführungExportkontrolleToolStripMenuItem.Text = "Allgemeine Einführung Exportkontrolle" ' 'BrexitToolStripMenuItem1 ' Me.BrexitToolStripMenuItem1.Image = Global.AVISO.My.Resources.Resources.zollico Me.BrexitToolStripMenuItem1.Name = "BrexitToolStripMenuItem1" - Me.BrexitToolStripMenuItem1.Size = New System.Drawing.Size(419, 34) + Me.BrexitToolStripMenuItem1.Size = New System.Drawing.Size(280, 22) Me.BrexitToolStripMenuItem1.Text = "Brexit" ' 'EmbargosLänderToolStripMenuItem ' Me.EmbargosLänderToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico Me.EmbargosLänderToolStripMenuItem.Name = "EmbargosLänderToolStripMenuItem" - Me.EmbargosLänderToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.EmbargosLänderToolStripMenuItem.Size = New System.Drawing.Size(280, 22) Me.EmbargosLänderToolStripMenuItem.Text = "Embargos-Länder" ' 'GüterlisteToolStripMenuItem ' Me.GüterlisteToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.zollico Me.GüterlisteToolStripMenuItem.Name = "GüterlisteToolStripMenuItem" - Me.GüterlisteToolStripMenuItem.Size = New System.Drawing.Size(419, 34) + Me.GüterlisteToolStripMenuItem.Size = New System.Drawing.Size(280, 22) Me.GüterlisteToolStripMenuItem.Text = "Güterliste" ' 'Timer_REFRESH @@ -3429,35 +3429,41 @@ Partial Class frmHauptfenster Me.ctxtFarben.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ctxtFarben.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ALLEToolStripMenuItem, Me.ToolStripMenuItem19, Me.ToolStripMenuItem20, Me.ToolStripMenuItem21}) Me.ctxtFarben.Name = "cntxt" - Me.ctxtFarben.Size = New System.Drawing.Size(156, 132) + Me.ctxtFarben.Size = New System.Drawing.Size(122, 92) ' 'ALLEToolStripMenuItem ' Me.ALLEToolStripMenuItem.Name = "ALLEToolStripMenuItem" - Me.ALLEToolStripMenuItem.Size = New System.Drawing.Size(155, 32) + Me.ALLEToolStripMenuItem.Size = New System.Drawing.Size(121, 22) Me.ALLEToolStripMenuItem.Text = "ALLE" ' 'ToolStripMenuItem19 ' Me.ToolStripMenuItem19.BackColor = System.Drawing.Color.Red Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(155, 32) + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem19.Text = "ROT" ' 'ToolStripMenuItem20 ' Me.ToolStripMenuItem20.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(155, 32) + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem20.Text = "ORANGE" ' 'ToolStripMenuItem21 ' Me.ToolStripMenuItem21.BackColor = System.Drawing.Color.Yellow Me.ToolStripMenuItem21.Name = "ToolStripMenuItem21" - Me.ToolStripMenuItem21.Size = New System.Drawing.Size(155, 32) + 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!) @@ -3859,4 +3865,5 @@ 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 3c5a621..27e9a28 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4174,6 +4174,12 @@ Public Class frmHauptfenster btnColor.BackColor = Color.White meineAviso_anzeigen() End Sub + + Private Sub DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Click + Dim frm As New frmGesamtsicherheitenNEU + frm.Standort = "VERAG AG" + frm.Show() + End Sub End Class Public Class AvisoStatusFunctions From 3d5f7302dd64e47e2a2aab449c834544c0cc055e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 21 Oct 2022 17:01:56 +0200 Subject: [PATCH 3/3] feature_gesamtsicherheiten --- Aviso/Aviso.vbproj | 9 + Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmGesamtsicherheiten.vb | 2 +- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 697 ++++++++++++++++++ Aviso/frmGesamtsicherheitenMenuNEU.resx | 200 +++++ Aviso/frmGesamtsicherheitenMenuNEU.vb | 336 +++++++++ Aviso/frmGesamtsicherheitenNEU.Designer.vb | 638 ++++------------ Aviso/frmGesamtsicherheitenNEU.vb | 433 +++++------ Aviso/frmHauptfenster.vb | 2 +- 9 files changed, 1617 insertions(+), 704 deletions(-) create mode 100644 Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb create mode 100644 Aviso/frmGesamtsicherheitenMenuNEU.resx create mode 100644 Aviso/frmGesamtsicherheitenMenuNEU.vb diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 304bf68..532619e 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -545,6 +545,12 @@ Form + + frmGesamtsicherheitenMenuNEU.vb + + + Form + frmGesamtsicherheitenNEU.vb @@ -1079,6 +1085,9 @@ frmFreigabeSetzenAnhaenge.vb + + frmGesamtsicherheitenMenuNEU.vb + frmGesamtsicherheitenNEU.vb diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 7d145a6..016910b 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/frmGesamtsicherheiten.vb b/Aviso/frmGesamtsicherheiten.vb index 13ef88e..f4885c7 100644 --- a/Aviso/frmGesamtsicherheiten.vb +++ b/Aviso/frmGesamtsicherheiten.vb @@ -611,7 +611,7 @@ Public Class frmGesamtsicherheiten sicherheiten.gs_filialenNr = gessich.FilialNummer sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer - sicherheiten.gs_LKWID = gessich.LKWID + sicherheiten.gs_LKWKZ = gessich.LKWID sicherheiten.gs_warenort = gessich.warenortID End Sub diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb new file mode 100644 index 0000000..8e8b12a --- /dev/null +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -0,0 +1,697 @@ + +Partial Class frmGesamtsicherheitenMenuNEU + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + 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.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label26 = New System.Windows.Forms.Label() + Me.btnBisTag = New System.Windows.Forms.Button() + Me.btnVonTag = New System.Windows.Forms.Button() + Me.btnTag = New System.Windows.Forms.Button() + Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label24 = New System.Windows.Forms.Label() + Me.btnJahr = New System.Windows.Forms.Button() + Me.btnBisJahr = New System.Windows.Forms.Button() + Me.btnVonJahr = New System.Windows.Forms.Button() + Me.btnMonat = New System.Windows.Forms.Button() + Me.btnBisMonat = New System.Windows.Forms.Button() + Me.btnVonMonat = New System.Windows.Forms.Button() + Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() + Me.Label25 = New System.Windows.Forms.Label() + Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblFiliale = New System.Windows.Forms.Label() + Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.txtbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + 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.txtSuchbegriff = New System.Windows.Forms.TextBox() + Me.chkOffen = New System.Windows.Forms.CheckBox() + Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.lblSaldo = New System.Windows.Forms.Label() + Me.lblZollsatz = New System.Windows.Forms.Label() + Me.lblReferenzwert = New System.Windows.Forms.Label() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() + Me.ContextMenuStrip1.SuspendLayout() + Me.SuspendLayout() + ' + 'dgvListe + ' + Me.dgvListe.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvListe.AllowUserToAddRows = False + Me.dgvListe.AllowUserToDeleteRows = False + 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.Name = "dgvListe" + Me.dgvListe.ReadOnly = True + Me.dgvListe.Size = New System.Drawing.Size(502, 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.txtDatBis) + Me.Panel1.Controls.Add(Me.Label26) + Me.Panel1.Controls.Add(Me.btnBisTag) + Me.Panel1.Controls.Add(Me.btnVonTag) + Me.Panel1.Controls.Add(Me.btnTag) + Me.Panel1.Controls.Add(Me.txtDatVon) + Me.Panel1.Controls.Add(Me.Label24) + Me.Panel1.Controls.Add(Me.btnJahr) + Me.Panel1.Controls.Add(Me.btnBisJahr) + Me.Panel1.Controls.Add(Me.btnVonJahr) + Me.Panel1.Controls.Add(Me.btnMonat) + Me.Panel1.Controls.Add(Me.btnBisMonat) + Me.Panel1.Controls.Add(Me.btnVonMonat) + Me.Panel1.Controls.Add(Me.DateTimePicker2) + Me.Panel1.Controls.Add(Me.Label25) + Me.Panel1.Controls.Add(Me.DateTimePicker1) + Me.Panel1.Controls.Add(Me.cbxWarenort) + Me.Panel1.Controls.Add(Me.Label4) + Me.Panel1.Controls.Add(Me.cbxStandort) + Me.Panel1.Controls.Add(Me.lblFiliale) + Me.Panel1.Controls.Add(Me.FlatButton2) + Me.Panel1.Controls.Add(Me.btnSucheStarten) + Me.Panel1.Controls.Add(Me.txtbis) + Me.Panel1.Controls.Add(Me.txtVon) + 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.txtSuchbegriff) + Me.Panel1.Controls.Add(Me.chkOffen) + Me.Panel1.Controls.Add(Me.btnNeu) + Me.Panel1.Controls.Add(Me.lblSaldo) + Me.Panel1.Controls.Add(Me.lblZollsatz) + Me.Panel1.Controls.Add(Me.lblReferenzwert) + 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.TabIndex = 0 + ' + 'txtDatBis + ' + Me.txtDatBis._DateTimeOnly = False + Me.txtDatBis._numbersOnly = False + Me.txtDatBis._numbersOnlyKommastellen = "" + Me.txtDatBis._numbersOnlyTrennzeichen = True + Me.txtDatBis._Prozent = False + Me.txtDatBis._ShortDateNew = False + Me.txtDatBis._ShortDateOnly = True + Me.txtDatBis._TimeOnly = False + Me.txtDatBis._TimeOnly_Seconds = False + Me.txtDatBis._value = "" + Me.txtDatBis._Waehrung = False + Me.txtDatBis._WaehrungZeichen = True + 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.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 + ' + '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.Name = "Label26" + Me.Label26.Size = New System.Drawing.Size(43, 13) + Me.Label26.TabIndex = 51 + Me.Label26.Text = "Datum" + ' + 'btnBisTag + ' + Me.btnBisTag.BackColor = System.Drawing.Color.White + Me.btnBisTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = ">>" + Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisTag.UseVisualStyleBackColor = False + ' + 'btnVonTag + ' + Me.btnVonTag.BackColor = System.Drawing.Color.White + Me.btnVonTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = "<<" + Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonTag.UseVisualStyleBackColor = False + ' + 'btnTag + ' + Me.btnTag.BackColor = System.Drawing.Color.White + Me.btnTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = "Heute" + Me.btnTag.UseVisualStyleBackColor = False + ' + 'txtDatVon + ' + Me.txtDatVon._DateTimeOnly = False + Me.txtDatVon._numbersOnly = False + Me.txtDatVon._numbersOnlyKommastellen = "" + Me.txtDatVon._numbersOnlyTrennzeichen = True + Me.txtDatVon._Prozent = False + Me.txtDatVon._ShortDateNew = False + Me.txtDatVon._ShortDateOnly = True + Me.txtDatVon._TimeOnly = False + Me.txtDatVon._TimeOnly_Seconds = False + Me.txtDatVon._value = "" + Me.txtDatVon._Waehrung = False + 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.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 + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.ForeColor = System.Drawing.Color.White + Me.Label24.Location = New System.Drawing.Point(22, 173) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(23, 13) + Me.Label24.TabIndex = 40 + Me.Label24.Text = "bis:" + ' + 'btnJahr + ' + Me.btnJahr.BackColor = System.Drawing.Color.White + Me.btnJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = "2016" + Me.btnJahr.UseVisualStyleBackColor = False + ' + 'btnBisJahr + ' + Me.btnBisJahr.BackColor = System.Drawing.Color.White + Me.btnBisJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = ">>" + Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisJahr.UseVisualStyleBackColor = False + ' + 'btnVonJahr + ' + Me.btnVonJahr.BackColor = System.Drawing.Color.White + Me.btnVonJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = "<<" + Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonJahr.UseVisualStyleBackColor = False + ' + 'btnMonat + ' + Me.btnMonat.BackColor = System.Drawing.Color.White + Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = "September" + Me.btnMonat.UseVisualStyleBackColor = False + ' + 'btnBisMonat + ' + Me.btnBisMonat.BackColor = System.Drawing.Color.White + Me.btnBisMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = ">>" + Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisMonat.UseVisualStyleBackColor = False + ' + 'btnVonMonat + ' + Me.btnVonMonat.BackColor = System.Drawing.Color.White + Me.btnVonMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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.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.Text = "<<" + Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonMonat.UseVisualStyleBackColor = False + ' + 'DateTimePicker2 + ' + Me.DateTimePicker2.CustomFormat = "''" + Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom + Me.DateTimePicker2.Location = New System.Drawing.Point(51, 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 + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.ForeColor = System.Drawing.Color.White + Me.Label25.Location = New System.Drawing.Point(22, 149) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(28, 13) + Me.Label25.TabIndex = 44 + 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.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 + ' + '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(112, 67) + Me.cbxWarenort.Name = "cbxWarenort" + Me.cbxWarenort.Size = New System.Drawing.Size(81, 21) + Me.cbxWarenort.TabIndex = 17 + ' + '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 + Me.Label4.Location = New System.Drawing.Point(112, 49) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(60, 15) + Me.Label4.TabIndex = 16 + Me.Label4.Text = "Warenort:" + ' + 'cbxStandort + ' + 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(12, 67) + Me.cbxStandort.Name = "cbxStandort" + Me.cbxStandort.Size = New System.Drawing.Size(81, 21) + Me.cbxStandort.TabIndex = 15 + ' + '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 + Me.lblFiliale.Location = New System.Drawing.Point(12, 49) + Me.lblFiliale.Name = "lblFiliale" + Me.lblFiliale.Size = New System.Drawing.Size(43, 15) + Me.lblFiliale.TabIndex = 14 + Me.lblFiliale.Text = "Filiale:" + ' + 'FlatButton2 + ' + Me.FlatButton2.allowBorder = False + Me.FlatButton2.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.FlatButton2.BackColor = System.Drawing.Color.White + 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.Name = "FlatButton2" + Me.FlatButton2.Size = New System.Drawing.Size(81, 20) + Me.FlatButton2.TabIndex = 10 + Me.FlatButton2.Text = "jedes Datum" + Me.FlatButton2.UseVisualStyleBackColor = False + Me.FlatButton2.Visible = False + ' + '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 + Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black + Me.btnSucheStarten.Location = New System.Drawing.Point(28, 269) + Me.btnSucheStarten.Name = "btnSucheStarten" + Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) + Me.btnSucheStarten.TabIndex = 11 + Me.btnSucheStarten.Text = "Suche starten" + Me.btnSucheStarten.UseVisualStyleBackColor = False + ' + 'txtbis + ' + Me.txtbis._DateTimeOnly = False + Me.txtbis._numbersOnly = False + Me.txtbis._numbersOnlyKommastellen = "" + Me.txtbis._numbersOnlyTrennzeichen = True + Me.txtbis._Prozent = False + Me.txtbis._ShortDateNew = False + Me.txtbis._ShortDateOnly = False + Me.txtbis._TimeOnly = False + Me.txtbis._TimeOnly_Seconds = False + Me.txtbis._value = "" + Me.txtbis._Waehrung = False + 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.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.Visible = False + ' + 'txtVon + ' + Me.txtVon._DateTimeOnly = False + Me.txtVon._numbersOnly = False + Me.txtVon._numbersOnlyKommastellen = "" + Me.txtVon._numbersOnlyTrennzeichen = True + Me.txtVon._Prozent = False + Me.txtVon._ShortDateNew = False + Me.txtVon._ShortDateOnly = False + Me.txtVon._TimeOnly = False + Me.txtVon._TimeOnly_Seconds = False + Me.txtVon._value = "" + Me.txtVon._Waehrung = False + 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.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.Visible = False + ' + 'Label3 + ' + Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right + 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.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(24, 15) + Me.Label3.TabIndex = 5 + Me.Label3.Text = "Bis" + Me.Label3.Visible = False + ' + 'Label2 + ' + Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right + 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.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(28, 15) + Me.Label2.TabIndex = 4 + 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 + Me.Label1.Location = New System.Drawing.Point(12, 8) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(45, 15) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Suche:" + ' + 'FlatButton1 + ' + 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 + ' + 'txtSuchbegriff + ' + Me.txtSuchbegriff.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.txtSuchbegriff.Location = New System.Drawing.Point(12, 26) + Me.txtSuchbegriff.Name = "txtSuchbegriff" + Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20) + Me.txtSuchbegriff.TabIndex = 1 + ' + '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 + Me.chkOffen.ForeColor = System.Drawing.SystemColors.ButtonHighlight + Me.chkOffen.Location = New System.Drawing.Point(28, 221) + Me.chkOffen.Name = "chkOffen" + Me.chkOffen.Size = New System.Drawing.Size(120, 17) + Me.chkOffen.TabIndex = 12 + Me.chkOffen.Text = "nur offene anzeigen" + Me.chkOffen.UseVisualStyleBackColor = True + ' + 'btnNeu + ' + Me.btnNeu.allowBorder = False + Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.btnNeu.BackColor = System.Drawing.Color.White + 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.Name = "btnNeu" + Me.btnNeu.Size = New System.Drawing.Size(75, 23) + Me.btnNeu.TabIndex = 13 + Me.btnNeu.Text = "Neu" + Me.btnNeu.UseVisualStyleBackColor = False + ' + 'lblSaldo + ' + Me.lblSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right + 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.Name = "lblSaldo" + Me.lblSaldo.Size = New System.Drawing.Size(147, 24) + Me.lblSaldo.TabIndex = 3 + Me.lblSaldo.Text = "Saldo: €80.000" + ' + 'lblZollsatz + ' + Me.lblZollsatz.Anchor = System.Windows.Forms.AnchorStyles.Right + 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.Name = "lblZollsatz" + Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) + Me.lblZollsatz.TabIndex = 9 + Me.lblZollsatz.Text = "Zollsatz: 12%" + ' + 'lblReferenzwert + ' + Me.lblReferenzwert.Anchor = System.Windows.Forms.AnchorStyles.Right + 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.Name = "lblReferenzwert" + Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) + Me.lblReferenzwert.TabIndex = 6 + Me.lblReferenzwert.Text = "Referenzwert: €80.000" + ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem}) + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(133, 26) + ' + 'ExportCSVToolStripMenuItem + ' + Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem" + Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(132, 22) + Me.ExportCSVToolStripMenuItem.Text = "Export CSV" + ' + '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.Controls.Add(Me.dgvListe) + Me.Controls.Add(Me.Panel1) + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.MaximumSize = New System.Drawing.Size(800, 760) + Me.MinimumSize = New System.Drawing.Size(499, 760) + Me.Name = "frmGesamtsicherheitenMenuNEU" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "frmGesSichMenu" + CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.ContextMenuStrip1.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents dgvListe As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Panel1 As Panel + Friend WithEvents lblSaldo As Label + Friend WithEvents lblZollsatz As Label + Friend WithEvents lblReferenzwert As Label + 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 Label3 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label1 As Label + Friend WithEvents txtbis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtVon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents btnSucheStarten As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents ContextMenuStrip1 As ContextMenuStrip + Friend WithEvents ExportCSVToolStripMenuItem As ToolStripMenuItem + Friend WithEvents lblFiliale As Label + Friend WithEvents cbxStandort As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label4 As Label + Friend WithEvents txtDatBis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label26 As Label + Friend WithEvents btnBisTag As Button + Friend WithEvents btnVonTag As Button + Friend WithEvents btnTag As Button + Friend WithEvents txtDatVon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label24 As Label + Friend WithEvents btnJahr As Button + Friend WithEvents btnBisJahr As Button + Friend WithEvents btnVonJahr As Button + Friend WithEvents btnMonat As Button + Friend WithEvents btnBisMonat As Button + Friend WithEvents btnVonMonat As Button + Friend WithEvents DateTimePicker2 As DateTimePicker + Friend WithEvents Label25 As Label + Friend WithEvents DateTimePicker1 As DateTimePicker +End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.resx b/Aviso/frmGesamtsicherheitenMenuNEU.resx new file mode 100644 index 0000000..2cbc5c2 --- /dev/null +++ b/Aviso/frmGesamtsicherheitenMenuNEU.resx @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAACAAAAAgAAAAMAAAAEAAAAChEAEQ8NAA0TAAAAFgAA + ABkAAAAbAAAAGgAAABgAAAAUAAAADgAAAAwAAAAIAAAABAAAAAMAAAACAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAUgICAIEhISDg0NDRQAAAAbAAAAJAAA + ACsAAAAvAAAAMgAAADQAAAAzAAAAMAAAACsAAAAmAAAAHgAAABYAAAAQAAAACwAAAAYAAAAEAAAAAQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAFAAAACg8PDxEJCQkbBwcHJQUF + BTEEBAQ9AAAARwAAAE0AAABSAAAAUwAAAFIAAABOAAAESAAABD8AAAAzAAAAKAAAAB0AAAAUAAAADQAA + AAcAAAADAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAgAAAAQCgAKGg0G + DSgJDgk4BwcHSAYGBlsCAgVqAAAAcgAAAHUAAAB0AAAAcwAAAnAAAAVoAwMGWwMDA0wEAAA8AAAALQAA + AB4AAAAUAAAADAAAAAUAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAEAAAACgwM + DBUICAgiCgoKMwMHB0oFBQViCggCfmhWALWZfwDXpIYA37mXAOyxkQDmqIcA25d8AMlbSgCYAAMAZAMD + AE0ABAA6AAAAKAAAABoAAAAQAAAABwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA + AAYAAAAMFhYWFw0NDScFBQU3RjgAX7SUAM/XsQD/37YA/9+0AP/ftQD/37UA/9+1AP/etgD/3rUA/9+2 + AP/UrQD5qosArSMjAEEABgYqAAAAHAAAABEAAAAJAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAACAAAABgAAAAsMDAwWGhoJHcCdAJ7ctwD/3rYA/9+2AP/htgD/4rcA/+K3AP/itwD/4rcA/+K3 + AP/itwD/4bYA/9+2AP/etgD/2bMA9LKTAG0NDQ0UAAAAEAAAAAgAAAADAAAAAQAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAEAAAADAAAAB3ZiAA3YtADF3rYA/+C2AP/iuAD/5LgA/+W5AP/mugD/57oA/+e6 + AP/nugD/57oA/+a5AP/luQD/47gA/+K3AP/ftgD/3bYA/9eyAJEAAAAAAAAABAAAAAIAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAA3bcA1963AP/iuAD/5LoA/+e7AP/nvAD/6LwA/+m8 + AP/rvQD/7L4A/+2+AP/svwD/7L4A/+q8AP/ovAD/5rsA/+O6AP/huAD/3bYA/+C6AJsAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOC6ALXfuAD/4roA/+a8AP/nvAD/6b0A/+u+ + AP/svwD/7MAA/76cAP+NdwD/e2sb/3JkIv+HcwD/p4kA/+K5AP/qvQD/57wA/+W8AP/hugD/3rgA/965 + AG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADfugBn3rkA/+K7AP/mvgD/6b4A/+u/ + AP/rwAD/78QA/8CeAP9WTzL/QEBB/0JERf9ERUX/QUFB/zs8PP81NTX/Qzwn//DDAP/rvwD/6L4A/+a9 + AP/huwD/3bgA/9WxACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd25AO/hvAD/5r4A/+nA + AP/rwQD/7MIA//DEAP+ykwD/Ozw+/0VGRv9JSUn/SEtK/0dHSP9BQkT/Ozs8/zQ0NP9vYBP/8MUA/+zC + AP/rwQD/6L8A/+W+AP/huwD/27gAugAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADduQB44bwA/+a+ + AP/pwQD/7MMA/+7EAP/wxQD/1a8A/zw+Pv9HR0f/TU5O/05PUP+QgC7/uJsA/9WwAP/DowD/m4MA/6yQ + AP/xxQD/78QA/+7EAP/rwgD/6MAA/+W9AP/guwD/3LkALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN26 + ANrkvgD/6MEA/+vEAP/uxAD/8MUA//TJAP9wYiv/Q0ZG/05PT/9RVFX/up0Q//TJAP/xxwD/8ccA//HH + AP/yxwD/8scA//DGAP/wxgD/8MUA/+3FAP/rwwD/58AA/+K+AP/euwCZAAAAAAAAAAAAAAAAAAAAAAAA + AADcuQAW4L4A/+XBAP/qxQD/7cYA/+/IAP/1ywD/7cQA/z9BQP9MTU3/VVZW/351TP/4zwD/9MsA//XL + AP/1ywD/9csA//TLAP/xyQD/8ckA//HJAP/wyQD/78cA/+3GAP/pxAD/5cAA/969AOoAAAAAAAAAAAAA + AAAAAAAAAAAAAN27AEvjwAD/6MQA/+zGAP/vyAD/9swA/0xEHv8yMjT/QkRE/09QUP9XWFj/Wltb/1dZ + XP9SVFb/Sk1P/0JERv86Ojv/ZFgr//bNAP/zygD/88oA//PKAP/xygD/78gA/+vFAP/nwwD/4b8A/8aq + AAkAAAAAAAAAAAAAAAAAAAAA378Jb+TCAP/qxgD/7skA//DMAP/1zwD/dmUf/0xHNP9CRET/T1BQ/1dY + WP9zblX/e3NR/3dvTP9yaUb/bGI+/2NcNf+Ccyf/9tAA//PNAP/zzQD/880A//LMAP/wywD/7cgA/+jG + AP/jwQD/274GKwAAAAAAAAAAAAAAAAAAAADfvx545MQT/+rHAv/uywD/8s0A//TPAP/evAD/kn4q/0BB + Qf9OTk7/VVZX/7ykOv/fwBH/3b4V/9y9Ev/buxb/2roK/9++AP/10AD/9M8A//TPAP/0zwD/884A//HM + AP/uygD/6cYF/+TDFf/fvxs4AAAAAAAAAAAAAAAAAAAAAODCJXXlxiL/68oX//DND//zzwH/+NMA/0pD + If8tLi7/PDw8/0hKSf9SUlL/VVdY/1VXWf9RVFb/S05R/0VGSf87PD//Zlwz//nUAP/20QD/9tEA//bR + AP/10QD/888B/+7MEv/qyRn/5MQk/968IS4AAAAAAAAAAAAAAAAAAAAA4cMwVeXGLv/ryyn/8M4l//PR + Iv/31CH/lIEg/31tLf80NTX/QUFB/0pMTP9lYVD/m41J/5mISf+XiEb/lINB/5B/Of+ljzD/+NUf//fT + Hv/30x7/9tMe//XRIf/y0CP/7s0m/+rKKv/kxTD/2b8mFAAAAAAAAAAAAAAAAAAAAADixTMj5cY4/+vM + M//w0DL/9NIw//bUMf/51zD//9sw/0pELf83Nzf/QUJC/05OSv/y0TH/+9ct//rXLf/61y3/+tcw//rX + MP/41i//+NYv//jWL//31TD/9tQx//PRMf/vzzP/6ss0/+LFNvcAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AADkxj/06sw//+/QPv/z0z7/9tY8//jXPf/62D//tJw1/ywtLf83Nzf/QEBA/2pjSP/lyEL//No9//rZ + Pv/72T7//Ns8//TTPv/51z3/+Nc9//jXPf/21Tz/8tI+/+7PPf/oyj7/4sU+qAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAOHFRJLoy0T/7s9F//LTRv/21kf/+NdF//nYR//+3Ej/a2Aw/ywsLP81NTX/Ozs7/0VG + QP9vZ0X/k4VH/3dtQf9DQDT/s50+//vbR//52Ef/+NdF//bWR//x0kX/7c5G/+fJRf/hw0JNAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA379AEObKSv/sz0v/8dNM//XXTv/32U7/+dtN//rcTv/52k3/cGQy/ygo + KP8uLi7/MjQ0/zU2Nv81NTX/MTIy/ywsLP97bjf//NxQ//naTf/32E//9NZM//DSTf/rzkv/5MhI2AAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5clNiOnNUf/v0VP/89ZV//fZVf/521j/+txX//vc + Wf//4Vr/wqpJ/1xTL/8lJSX/KCkp/ygpKf8mJib/Ly0n/4Z3Of/93Vj/+dpX//bYVv/y1VT/7dFT/+fM + Uf/hyE5FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/v0AE5spS3ezQVf/w1Fj/9dda//fa + XP/53Fz/+t1d//veXf/932D//+Fg/+zQWP/ZwFP/2cFU/93DVf/+4l7//d9e//ncXP/22Vz/89da/+/S + V//qzlT/5MpTowAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADbwlUV5stY9+zR + W//w1V7/9dhg//fbYv/53GL/+t1k//veY//73mX//OBk//zgZf/832b//N9k//ndY//53GP/9tpg//PX + Xv/w1F3/69Ba/+XKV9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AADizFcj5stb7ezRXv/w1GL/89dj//XZZf/322b/+Nxn//ncZ//53Gf/+dxn//ncZ//43Gf/99tm//XZ + ZP/y12P/79Ng/+vQXf/my1rJ1apVBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAADVv1UM5stcxevQYP/u02L/8NZk//PXZv/02Wf/9dpo//XaaP/12mj/9dpo//TZ + Z//y12X/8NVk/+3SYv/pz1//5stdjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5ctfWebNYOLq0WP/7NJk/+7UZv/w1Wf/8NZn//DW + Z//v1Wb/7tRl/+vSZP/q0GL/58xfvuLMXyMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLLYyzlzGOB5s1izefP + ZNTp0GP/6dBj/ejOY9HmzWLA5sthcefCYRUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA+AAAf/AAAB/wAAAP4AAAD+AAAA/gAAAP4AAAB+AAAE/0AAA/+AAAH/AA + AA/gAAAP4AAAB+AAAAfAAAAHwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAH4AAAB+AAAAfgAAAP8AAAD/AA + AB/4AAA//AAAP/4AAP//gAH//+AH//////8= + + + \ No newline at end of file diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb new file mode 100644 index 0000000..661d9b9 --- /dev/null +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -0,0 +1,336 @@ +Imports System.Reflection + +Public Class frmGesamtsicherheitenMenuNEU + + Public SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz + Dim 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 + txtDatBis.Text = Now.ToShortDateString + + btnMonat.Text = MONAT.ToString("MMMM") + btnJahr.Text = JAHR.Year + + + 'txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy") + 'txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") + ShowStandort() + LoadDGV() + End Sub + + Public Function LoadDGV() + Dim sqladdon As String = "" + 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 + + From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where + gs_freitext like '%" & txtSuchbegriff.Text & "%' OR + gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR + gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR + gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR + gs_warenort like '%" & txtSuchbegriff.Text & "%' + ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2 + Where gs_standort = '" & Standort & "' " & sqladdon & " + AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "' + AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'" + + dgvListe.SET_SQL(sqlstring, "AVISO") + dgvListe.LOAD() + + With dgvListe + .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .RowHeadersWidth = 6 + .Columns("gs_standort").Visible = False + .Columns("gs_gsnr").HeaderText = "#" + .Columns("gs_gsnr").Width = 36 + .Columns("gs_filialenNr").HeaderText = "Filiale" + .Columns("gs_filialenNr").Width = 43 + .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr." + .Columns("gs_abfertigungsNr").Width = 107 + .Columns("gs_datum").Width = 112 + .Columns("gs_SicherheitsSaldo").Width = 106 + .Columns("gs_Warenort").Width = 96 + .Columns("gs_Warenort").HeaderText = "Warenort" + + End With + + For Each row As DataGridViewRow In dgvListe.Rows + If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then + row.DefaultCellStyle.BackColor = Color.Red + Else + row.DefaultCellStyle.BackColor = Color.Green + End If + Next + + End Function + + Public Sub ShowStandort() + 'lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString("N") + lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString() + lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%" + lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N") + End Sub + + + + + Private Sub OpenFRM(sender As Object, e As DataGridViewCellEventArgs) Handles dgvListe.CellDoubleClick + Dim frm As New frmGesamtsicherheitenNEU + With frm + .currentGesSichRef = GesSichRef + .gessicherheitID = dgvListe.CurrentRow.Cells("gs_gsnr").Value + .Standort = Me.Standort + .datum = dgvListe.CurrentRow.Cells("gs_datum").Value + .LKWKZ = dgvListe.CurrentRow.Cells("gs_LKWKZ").Value + .FilialNummer = dgvListe.CurrentRow.Cells("gs_filialenNr").Value + .Abfertigungsnummer = dgvListe.CurrentRow.Cells("gs_abfertigungsNr").Value + .warenortID = dgvListe.CurrentRow.Cells("gs_warenort").Value + End With + + AddHandler frm.FormClosing, Function() + GesSichRef.CalcSaldo() + ShowStandort() + LoadDGV() + Me.BringToFront() + End Function + frm.Show() + End Sub + + Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click + Dim frm As New frmGesamtsicherheitenNEU + With frm + .currentGesSichRef = GesSichRef + .Standort = Me.Standort + .datum = Date.Now + .Neu = True + End With + AddHandler frm.FormClosing, Function() + GesSichRef.CalcSaldo() + ShowStandort() + LoadDGV() + Me.BringToFront() + End Function + frm.Show() + End Sub + + Private Sub lblSaldo_Click(sender As Object, e As EventArgs) Handles lblSaldo.Click + lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N") + LoadDGV() + End Sub + + Private Sub chkOffen_CheckedChanged(sender As Object, e As EventArgs) + If Me.Visible Then LoadDGV() + End Sub + Private Sub Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) + Select Case Asc(e.KeyChar) + Case 48 To 57, 8, 46, 58, 32, 44, 65 To 90, 97 To 122 + ' Zahlen, Backspace, . und : zulassen + + Case Else + ' alle anderen Eingaben unterdrücken + e.Handled = True + End Select + End Sub + + Private Sub resetSearchfields_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click + txtSuchbegriff.Text = "" : chkOffen.Checked = True + txtDatVon.Text = Date.Today.AddDays(-30).ToString("dd.MM.yyyy") + txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") + cbxStandort._value = "" + cbxWarenort._value = "" + btnSucheStarten_Click(sender, e) + End Sub + + Private Sub btnSucheStarten_Click(sender As Object, e As EventArgs) Handles btnSucheStarten.Click + Try + Date.Parse(txtDatVon.Text) + Date.Parse(txtDatBis.Text) + If Me.Visible Then LoadDGV() + Catch ex As Exception + MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.") + End Try + End Sub + + 'Private Sub FlatButton2_Click(sender As Object, e As EventArgs) + ' txtDatVon.Text = Date.Parse("01.01.1970") + ' txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") + 'End Sub + + Private Sub ExportCSVToolStripMenuItem_Click(sender As Object, e As EventArgs) + csvexport(dgvListe) + End Sub + + Public Shared Function csvexport(quelldgv As DataGridView) + Dim savefiledialog As New SaveFileDialog + Dim firstin As String + Dim out As String + Dim in2 As String + Dim header As String + + savefiledialog.Filter = "CSV files (*.csv)|*.CSV" + savefiledialog.InitialDirectory = "C:\Verag" + savefiledialog.ShowDialog() + + + Try + For r As Integer = 0 To quelldgv.Rows.Count - 1 + For c As Integer = 0 To quelldgv.Columns.Count + 'test &= r & c & vbCrLf + Try + 'test &= Replace(quelldgv.Rows(r).Cells(c).Value.ToString, vbCrLf, "vbCrlLf") + firstin = quelldgv.Rows(r).Cells(c).Value.ToString + 'in2 = """" & firstin & """" & ";" + in2 = firstin & ";" + out &= Replace(in2, vbCrLf, "##vbCrLf##") + Catch ex As Exception + out &= "" + End Try + + Next + + out &= "nZ" + Next + For c As Integer = 0 To quelldgv.Columns.Count - 1 + header &= quelldgv.Columns(c).Name & ";" + Next + out = Replace(out, "nZ", vbCrLf) + 'MsgBox(out) + Using sw As New IO.StreamWriter(savefiledialog.FileName) + sw.WriteLine(header) + sw.WriteLine(out) + End Using + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Function + + Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) + Dim TAG As Date = CDate(Now.ToShortDateString) + Dim JAHR As Date = CDate("01.01." & Now.Year) + + + Sub initBtns(MonatJahr) + btnMonat.Text = MONAT.ToString("MMMM") + btnJahr.Text = JAHR.Year + Select Case MonatJahr + Case "Monat" + DateTimePicker1.Value = MONAT + DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1) + Case "Jahr" + + DateTimePicker1.Value = JAHR + DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) + 'End If + Case "Tag" + + DateTimePicker1.Value = TAG + DateTimePicker2.Value = TAG + If TAG = Now.ToShortDateString Then + btnTag.Text = "Heute" + ElseIf TAG = Now.AddDays(-1).ToShortDateString Then + btnTag.Text = "Gestern" + ElseIf TAG = Now.AddDays(-2).ToShortDateString Then + btnTag.Text = "Vorgestern" + ElseIf TAG = Now.AddDays(1).ToShortDateString Then + btnTag.Text = "Morgen" + Else + btnTag.Text = TAG.ToString("dd.MM") + End If + + 'End If + Case "" + DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year) + DateTimePicker2.Value = Now + End Select + + End Sub + + + Private Sub btnJahr_Click(sender As Object, e As EventArgs) Handles btnJahr.Click + initBtns("Jahr") + End Sub + + Private Sub btnPlusJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click + JAHR = JAHR.AddYears(1) + initBtns("Jahr") + End Sub + + Private Sub btnMinusJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click + JAHR = JAHR.AddYears(-1) + initBtns("Jahr") + End Sub + + Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click + initBtns("Monat") + End Sub + + Private Sub btnPlusMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click + MONAT = MONAT.AddMonths(1) + initBtns("Monat") + End Sub + + Private Sub btnMinusMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click + MONAT = MONAT.AddMonths(-1) + initBtns("Monat") + End Sub + + + Private Sub btnTag_Click(sender As Object, e As EventArgs) Handles btnTag.Click + initBtns("Tag") + End Sub + + Private Sub btnMinusTag_Click(sender As Object, e As EventArgs) Handles btnVonTag.Click + TAG = TAG.AddDays(-1) + initBtns("Tag") + End Sub + + Private Sub btnPlusTag_Click(sender As Object, e As EventArgs) Handles btnBisTag.Click + TAG = TAG.AddDays(1) + initBtns("Tag") + End Sub + + Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged + txtDatVon._value = CDate(sender.value).ToShortDateString + btnSucheStarten_Click(sender, e) + End Sub + + Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.ValueChanged + txtDatBis._value = CDate(sender.value).ToShortDateString + btnSucheStarten_Click(sender, e) + End Sub + + Function setNullToZero(s As String, Optional type As String = "") + + If s = "" Then + Dim zero As Double = 0 + + Return zero + Else + Return s + End If + End Function + + +End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index 814441b..dceae8b 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -48,61 +48,41 @@ Partial Class frmGesamtsicherheitenNEU Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblGestellungNr = New System.Windows.Forms.Label() - Me.txtCRNTime = New System.Windows.Forms.TextBox() - Me.txtCRNDate = New System.Windows.Forms.TextBox() - Me.txtMRNTime = New System.Windows.Forms.TextBox() - Me.txtMRNDate = New System.Windows.Forms.TextBox() + Me.txtPosTime = New System.Windows.Forms.TextBox() + 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() - Me.txtMRNSicherheitsbetrag = New System.Windows.Forms.TextBox() - Me.txtMRNWarenwert = New System.Windows.Forms.TextBox() - Me.txtMRN = New System.Windows.Forms.TextBox() + Me.txtSicherheitSicherheitsbetrag = New System.Windows.Forms.TextBox() + Me.txtSicherheitWarenwert = New System.Windows.Forms.TextBox() + Me.txtSicherheitATBNr = New System.Windows.Forms.TextBox() Me.btn_resetSearch = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblZollsatz = New System.Windows.Forms.Label() Me.lblReferenzwert = New System.Windows.Forms.Label() Me.lblSaldo = New System.Windows.Forms.Label() Me.panOben = New System.Windows.Forms.Panel() Me.Label20 = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.txtPosNr = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() - Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnSuche = New System.Windows.Forms.Button() - Me.Label26 = New System.Windows.Forms.Label() - Me.btnBisTag = New System.Windows.Forms.Button() - Me.btnVonTag = New System.Windows.Forms.Button() - Me.btnTag = New System.Windows.Forms.Button() - Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label24 = New System.Windows.Forms.Label() - Me.btnJahr = New System.Windows.Forms.Button() - Me.btnBisJahr = New System.Windows.Forms.Button() - Me.btnVonJahr = New System.Windows.Forms.Button() - Me.btnMonat = New System.Windows.Forms.Button() - Me.btnBisMonat = New System.Windows.Forms.Button() - Me.btnVonMonat = New System.Windows.Forms.Button() - Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() - Me.Label25 = New System.Windows.Forms.Label() - Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() - Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label23 = New System.Windows.Forms.Label() Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label19 = New System.Windows.Forms.Label() - Me.cbx_Suche_Filiale = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txt_Suche = New System.Windows.Forms.TextBox() Me.Label21 = New System.Windows.Forms.Label() - Me.Label22 = New System.Windows.Forms.Label() Me.btnDeletePos = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnDeleteSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnUpdatePos = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnUpdateSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label15 = New System.Windows.Forms.Label() - Me.txtPos = New System.Windows.Forms.TextBox() + Me.txtAnzahlPos = New System.Windows.Forms.TextBox() Me.Label14 = New System.Windows.Forms.Label() - Me.txtEust = New System.Windows.Forms.TextBox() + Me.txtSicherheitEust = New System.Windows.Forms.TextBox() Me.Label13 = New System.Windows.Forms.Label() - Me.cboATR = New System.Windows.Forms.ComboBox() + Me.cboSicherheitATR = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() @@ -116,7 +96,8 @@ Partial Class frmGesamtsicherheitenNEU Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.txtPosFreitext = New System.Windows.Forms.TextBox() - Me.txtFreitextOpen = New System.Windows.Forms.TextBox() + Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox() + Me.lbloffenerSaldo = New System.Windows.Forms.Label() CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -395,43 +376,45 @@ Partial Class frmGesamtsicherheitenNEU Me.lblGestellungNr.TabIndex = 2 Me.lblGestellungNr.Text = "Gesamtsicherheit" ' - 'txtCRNTime + 'txtPosTime ' - Me.txtCRNTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCRNTime.Location = New System.Drawing.Point(1006, 204) - Me.txtCRNTime.Margin = New System.Windows.Forms.Padding(0) - Me.txtCRNTime.Name = "txtCRNTime" - Me.txtCRNTime.Size = New System.Drawing.Size(55, 24) - Me.txtCRNTime.TabIndex = 27 + Me.txtPosTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPosTime.Location = New System.Drawing.Point(1006, 204) + 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 ' - 'txtCRNDate + 'txtPosDate ' - Me.txtCRNDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCRNDate.Location = New System.Drawing.Point(921, 204) - Me.txtCRNDate.Margin = New System.Windows.Forms.Padding(0) - Me.txtCRNDate.Name = "txtCRNDate" - Me.txtCRNDate.Size = New System.Drawing.Size(85, 24) - Me.txtCRNDate.TabIndex = 26 + Me.txtPosDate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append + Me.txtPosDate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource + Me.txtPosDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPosDate.Location = New System.Drawing.Point(921, 204) + 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 ' - 'txtMRNTime + 'txtSicherheitTime ' - Me.txtMRNTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtMRNTime.Location = New System.Drawing.Point(368, 204) - Me.txtMRNTime.Margin = New System.Windows.Forms.Padding(0) - Me.txtMRNTime.Name = "txtMRNTime" - Me.txtMRNTime.Size = New System.Drawing.Size(55, 24) - Me.txtMRNTime.TabIndex = 22 + Me.txtSicherheitTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitTime.Location = New System.Drawing.Point(368, 204) + 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 ' - 'txtMRNDate + 'txtSicherheitDate ' - Me.txtMRNDate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append - Me.txtMRNDate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource - Me.txtMRNDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtMRNDate.Location = New System.Drawing.Point(283, 204) - Me.txtMRNDate.Margin = New System.Windows.Forms.Padding(0) - Me.txtMRNDate.Name = "txtMRNDate" - Me.txtMRNDate.Size = New System.Drawing.Size(85, 24) - Me.txtMRNDate.TabIndex = 21 + Me.txtSicherheitDate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append + Me.txtSicherheitDate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource + Me.txtSicherheitDate.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitDate.Location = New System.Drawing.Point(283, 204) + 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 ' @@ -475,33 +458,33 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPositionenCRN.Size = New System.Drawing.Size(205, 24) Me.txtPositionenCRN.TabIndex = 25 ' - 'txtMRNSicherheitsbetrag + 'txtSicherheitSicherheitsbetrag ' - Me.txtMRNSicherheitsbetrag.Enabled = False - Me.txtMRNSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtMRNSicherheitsbetrag.Location = New System.Drawing.Point(523, 204) - Me.txtMRNSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0) - Me.txtMRNSicherheitsbetrag.Name = "txtMRNSicherheitsbetrag" - Me.txtMRNSicherheitsbetrag.Size = New System.Drawing.Size(100, 24) - Me.txtMRNSicherheitsbetrag.TabIndex = 24 + Me.txtSicherheitSicherheitsbetrag.Enabled = False + Me.txtSicherheitSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitSicherheitsbetrag.Location = New System.Drawing.Point(523, 204) + 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 ' - 'txtMRNWarenwert + 'txtSicherheitWarenwert ' - Me.txtMRNWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtMRNWarenwert.Location = New System.Drawing.Point(423, 204) - Me.txtMRNWarenwert.Margin = New System.Windows.Forms.Padding(0) - Me.txtMRNWarenwert.Name = "txtMRNWarenwert" - Me.txtMRNWarenwert.Size = New System.Drawing.Size(100, 24) - Me.txtMRNWarenwert.TabIndex = 23 + Me.txtSicherheitWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitWarenwert.Location = New System.Drawing.Point(423, 204) + 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 ' - 'txtMRN + 'txtSicherheitATBNr ' - Me.txtMRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtMRN.Location = New System.Drawing.Point(34, 204) - Me.txtMRN.Margin = New System.Windows.Forms.Padding(0) - Me.txtMRN.Name = "txtMRN" - Me.txtMRN.Size = New System.Drawing.Size(205, 24) - Me.txtMRN.TabIndex = 19 + Me.txtSicherheitATBNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitATBNr.Location = New System.Drawing.Point(34, 204) + 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 ' 'btn_resetSearch ' @@ -511,7 +494,7 @@ Partial Class frmGesamtsicherheitenNEU Me.btn_resetSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn_resetSearch.ForeColor = System.Drawing.Color.Black Me.btn_resetSearch.Image = Global.AVISO.My.Resources.Resources.refresh - Me.btn_resetSearch.Location = New System.Drawing.Point(610, 33) + 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 @@ -547,7 +530,7 @@ Partial Class frmGesamtsicherheitenNEU Me.lblSaldo.AutoSize = True Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew - Me.lblSaldo.Location = New System.Drawing.Point(1225, 152) + Me.lblSaldo.Location = New System.Drawing.Point(1025, 108) Me.lblSaldo.Name = "lblSaldo" Me.lblSaldo.Size = New System.Drawing.Size(147, 24) Me.lblSaldo.TabIndex = 5 @@ -556,19 +539,20 @@ 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.lbloffenerSaldo) Me.panOben.Controls.Add(Me.Label20) - Me.panOben.Controls.Add(Me.TextBox1) + Me.panOben.Controls.Add(Me.txtPosNr) Me.panOben.Controls.Add(Me.Panel1) Me.panOben.Controls.Add(Me.btnDeletePos) Me.panOben.Controls.Add(Me.btnDeleteSicherheit) Me.panOben.Controls.Add(Me.btnUpdatePos) Me.panOben.Controls.Add(Me.btnUpdateSicherheit) Me.panOben.Controls.Add(Me.Label15) - Me.panOben.Controls.Add(Me.txtPos) + Me.panOben.Controls.Add(Me.txtAnzahlPos) Me.panOben.Controls.Add(Me.Label14) - Me.panOben.Controls.Add(Me.txtEust) + Me.panOben.Controls.Add(Me.txtSicherheitEust) Me.panOben.Controls.Add(Me.Label13) - Me.panOben.Controls.Add(Me.cboATR) + Me.panOben.Controls.Add(Me.cboSicherheitATR) Me.panOben.Controls.Add(Me.Label7) Me.panOben.Controls.Add(Me.Label8) Me.panOben.Controls.Add(Me.Label9) @@ -582,21 +566,21 @@ Partial Class frmGesamtsicherheitenNEU Me.panOben.Controls.Add(Me.Label2) Me.panOben.Controls.Add(Me.Label1) Me.panOben.Controls.Add(Me.txtPosFreitext) - Me.panOben.Controls.Add(Me.txtFreitextOpen) + Me.panOben.Controls.Add(Me.txtSicherheitFreitext) Me.panOben.Controls.Add(Me.btnAddPos) Me.panOben.Controls.Add(Me.btnAddSicherheit) Me.panOben.Controls.Add(Me.lblGestellungNr) - Me.panOben.Controls.Add(Me.txtCRNTime) - Me.panOben.Controls.Add(Me.txtCRNDate) - Me.panOben.Controls.Add(Me.txtMRNTime) - Me.panOben.Controls.Add(Me.txtMRNDate) + Me.panOben.Controls.Add(Me.txtPosTime) + 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) - Me.panOben.Controls.Add(Me.txtMRNSicherheitsbetrag) - Me.panOben.Controls.Add(Me.txtMRNWarenwert) - Me.panOben.Controls.Add(Me.txtMRN) + Me.panOben.Controls.Add(Me.txtSicherheitSicherheitsbetrag) + Me.panOben.Controls.Add(Me.txtSicherheitWarenwert) + Me.panOben.Controls.Add(Me.txtSicherheitATBNr) Me.panOben.Controls.Add(Me.lblZollsatz) Me.panOben.Controls.Add(Me.lblReferenzwert) Me.panOben.Controls.Add(Me.lblSaldo) @@ -617,319 +601,50 @@ Partial Class frmGesamtsicherheitenNEU Me.Label20.TabIndex = 42 Me.Label20.Text = "Pos" ' - 'TextBox1 + 'txtPosNr ' - Me.TextBox1.Enabled = False - Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox1.Location = New System.Drawing.Point(921, 250) - Me.TextBox1.Margin = New System.Windows.Forms.Padding(0) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(37, 24) - Me.TextBox1.TabIndex = 43 + Me.txtPosNr.Enabled = False + Me.txtPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPosNr.Location = New System.Drawing.Point(921, 250) + 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 ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight - Me.Panel1.Controls.Add(Me.txtDatBis) Me.Panel1.Controls.Add(Me.btnSuche) - Me.Panel1.Controls.Add(Me.Label26) - Me.Panel1.Controls.Add(Me.btnBisTag) - Me.Panel1.Controls.Add(Me.btnVonTag) - Me.Panel1.Controls.Add(Me.btnTag) - Me.Panel1.Controls.Add(Me.txtDatVon) - Me.Panel1.Controls.Add(Me.Label24) - Me.Panel1.Controls.Add(Me.btnJahr) - Me.Panel1.Controls.Add(Me.btnBisJahr) - Me.Panel1.Controls.Add(Me.btnVonJahr) - Me.Panel1.Controls.Add(Me.btnMonat) - Me.Panel1.Controls.Add(Me.btnBisMonat) - Me.Panel1.Controls.Add(Me.btnVonMonat) - Me.Panel1.Controls.Add(Me.DateTimePicker2) - Me.Panel1.Controls.Add(Me.Label25) - Me.Panel1.Controls.Add(Me.DateTimePicker1) - Me.Panel1.Controls.Add(Me.btnSucheStarten) Me.Panel1.Controls.Add(Me.Label23) Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort) Me.Panel1.Controls.Add(Me.Label19) - Me.Panel1.Controls.Add(Me.cbx_Suche_Filiale) - Me.Panel1.Controls.Add(Me.btnNeu) Me.Panel1.Controls.Add(Me.txt_Suche) Me.Panel1.Controls.Add(Me.Label21) - Me.Panel1.Controls.Add(Me.Label22) Me.Panel1.Controls.Add(Me.btn_resetSearch) Me.Panel1.Location = New System.Drawing.Point(0, 44) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1384, 97) + Me.Panel1.Size = New System.Drawing.Size(1384, 61) Me.Panel1.TabIndex = 10 ' - 'txtDatBis - ' - Me.txtDatBis._DateTimeOnly = False - Me.txtDatBis._numbersOnly = False - Me.txtDatBis._numbersOnlyKommastellen = "" - Me.txtDatBis._numbersOnlyTrennzeichen = True - Me.txtDatBis._Prozent = False - Me.txtDatBis._ShortDateNew = False - Me.txtDatBis._ShortDateOnly = True - Me.txtDatBis._TimeOnly = False - Me.txtDatBis._TimeOnly_Seconds = False - Me.txtDatBis._value = "" - Me.txtDatBis._Waehrung = False - Me.txtDatBis._WaehrungZeichen = True - 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(53, 63) - 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 = 36 - ' 'btnSuche ' Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(692, 20) + 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.Text = "Gesamtsicherheit Suche starten" + Me.btnSuche.Text = "Suche starten" Me.btnSuche.UseVisualStyleBackColor = True ' - '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.Location = New System.Drawing.Point(24, 12) - Me.Label26.Name = "Label26" - Me.Label26.Size = New System.Drawing.Size(43, 13) - Me.Label26.TabIndex = 34 - Me.Label26.Text = "Datum" - ' - 'btnBisTag - ' - Me.btnBisTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(284, 7) - 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 = 26 - Me.btnBisTag.Text = ">>" - Me.btnBisTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisTag.UseVisualStyleBackColor = True - ' - 'btnVonTag - ' - Me.btnVonTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(165, 7) - 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 = 24 - Me.btnVonTag.Text = "<<" - Me.btnVonTag.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonTag.UseVisualStyleBackColor = True - ' - 'btnTag - ' - Me.btnTag.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(198, 7) - 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 = 25 - Me.btnTag.Text = "Heute" - Me.btnTag.UseVisualStyleBackColor = True - ' - 'txtDatVon - ' - Me.txtDatVon._DateTimeOnly = False - Me.txtDatVon._numbersOnly = False - Me.txtDatVon._numbersOnlyKommastellen = "" - Me.txtDatVon._numbersOnlyTrennzeichen = True - Me.txtDatVon._Prozent = False - Me.txtDatVon._ShortDateNew = False - Me.txtDatVon._ShortDateOnly = True - Me.txtDatVon._TimeOnly = False - Me.txtDatVon._TimeOnly_Seconds = False - Me.txtDatVon._value = "" - Me.txtDatVon._Waehrung = False - 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(53, 37) - 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 = 20 - ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(24, 65) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(23, 13) - Me.Label24.TabIndex = 23 - Me.Label24.Text = "bis:" - ' - 'btnJahr - ' - Me.btnJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(198, 59) - 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 = 32 - Me.btnJahr.Text = "2016" - Me.btnJahr.UseVisualStyleBackColor = True - ' - 'btnBisJahr - ' - Me.btnBisJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(284, 59) - 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 = 33 - Me.btnBisJahr.Text = ">>" - Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisJahr.UseVisualStyleBackColor = True - ' - 'btnVonJahr - ' - Me.btnVonJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(165, 59) - 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 = 31 - Me.btnVonJahr.Text = "<<" - Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonJahr.UseVisualStyleBackColor = True - ' - 'btnMonat - ' - Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(198, 33) - 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 = 29 - Me.btnMonat.Text = "September" - Me.btnMonat.UseVisualStyleBackColor = True - ' - 'btnBisMonat - ' - Me.btnBisMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(284, 33) - 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 = 30 - Me.btnBisMonat.Text = ">>" - Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisMonat.UseVisualStyleBackColor = True - ' - 'btnVonMonat - ' - Me.btnVonMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(165, 33) - 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 = 28 - Me.btnVonMonat.Text = "<<" - Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonMonat.UseVisualStyleBackColor = True - ' - 'DateTimePicker2 - ' - Me.DateTimePicker2.CustomFormat = "''" - Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker2.Location = New System.Drawing.Point(53, 62) - 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 = 22 - ' - 'Label25 - ' - Me.Label25.AutoSize = True - Me.Label25.Location = New System.Drawing.Point(24, 41) - Me.Label25.Name = "Label25" - Me.Label25.Size = New System.Drawing.Size(28, 13) - Me.Label25.TabIndex = 27 - Me.Label25.Text = "von:" - ' - 'DateTimePicker1 - ' - Me.DateTimePicker1.CustomFormat = "''" - Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker1.Location = New System.Drawing.Point(53, 37) - 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 = 21 - ' - '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 - Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black - Me.btnSucheStarten.Location = New System.Drawing.Point(1262, 60) - Me.btnSucheStarten.Name = "btnSucheStarten" - Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) - Me.btnSucheStarten.TabIndex = 17 - Me.btnSucheStarten.Text = "Suche starten" - Me.btnSucheStarten.UseVisualStyleBackColor = False - Me.btnSucheStarten.Visible = False - ' 'Label23 ' Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label23.AutoSize = True Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label23.ForeColor = System.Drawing.Color.Honeydew - Me.Label23.Location = New System.Drawing.Point(207, 5) + 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 @@ -943,7 +658,7 @@ Partial Class frmGesamtsicherheitenNEU Me.cbx_Suche_Warenort.DropDownWidth = 300 Me.cbx_Suche_Warenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbx_Suche_Warenort.FormattingEnabled = True - Me.cbx_Suche_Warenort.Location = New System.Drawing.Point(345, 20) + Me.cbx_Suche_Warenort.Location = New System.Drawing.Point(660, 20) 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) @@ -953,44 +668,16 @@ Partial Class frmGesamtsicherheitenNEU ' Me.Label19.AutoSize = True Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label19.Location = New System.Drawing.Point(342, 7) + 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.Text = "Warenort:" ' - 'cbx_Suche_Filiale - ' - Me.cbx_Suche_Filiale._allowedValuesFreiText = Nothing - Me.cbx_Suche_Filiale._allowFreiText = False - Me.cbx_Suche_Filiale._value = "" - Me.cbx_Suche_Filiale.DropDownWidth = 300 - Me.cbx_Suche_Filiale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbx_Suche_Filiale.FormattingEnabled = True - Me.cbx_Suche_Filiale.Location = New System.Drawing.Point(493, 21) - Me.cbx_Suche_Filiale.MaxLength = 4 - Me.cbx_Suche_Filiale.Name = "cbx_Suche_Filiale" - Me.cbx_Suche_Filiale.Size = New System.Drawing.Size(95, 21) - Me.cbx_Suche_Filiale.TabIndex = 2 - ' - 'btnNeu - ' - Me.btnNeu.allowBorder = False - Me.btnNeu.BackColor = System.Drawing.Color.Gainsboro - 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(1262, 31) - Me.btnNeu.Name = "btnNeu" - Me.btnNeu.Size = New System.Drawing.Size(75, 23) - Me.btnNeu.TabIndex = 7 - Me.btnNeu.Text = "Neu" - Me.btnNeu.UseVisualStyleBackColor = False - ' 'txt_Suche ' Me.txt_Suche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txt_Suche.Location = New System.Drawing.Point(345, 68) + Me.txt_Suche.Location = New System.Drawing.Point(379, 19) 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) @@ -1000,22 +687,12 @@ Partial Class frmGesamtsicherheitenNEU ' Me.Label21.AutoSize = True Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(342, 52) + 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.Text = "Suche:" ' - '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(490, 5) - Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(44, 13) - Me.Label22.TabIndex = 1 - Me.Label22.Text = "Filiale:" - ' 'btnDeletePos ' Me.btnDeletePos.allowBorder = False @@ -1090,14 +767,14 @@ Partial Class frmGesamtsicherheitenNEU Me.Label15.TabIndex = 9 Me.Label15.Text = "Pos" ' - 'txtPos + 'txtAnzahlPos ' - Me.txtPos.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPos.Location = New System.Drawing.Point(242, 204) - Me.txtPos.Margin = New System.Windows.Forms.Padding(0) - Me.txtPos.Name = "txtPos" - Me.txtPos.Size = New System.Drawing.Size(35, 24) - Me.txtPos.TabIndex = 20 + Me.txtAnzahlPos.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAnzahlPos.Location = New System.Drawing.Point(242, 204) + 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 ' 'Label14 ' @@ -1110,15 +787,15 @@ Partial Class frmGesamtsicherheitenNEU Me.Label14.TabIndex = 33 Me.Label14.Text = "19% EUST" ' - 'txtEust + 'txtSicherheitEust ' - Me.txtEust.Enabled = False - Me.txtEust.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEust.Location = New System.Drawing.Point(197, 250) - Me.txtEust.Margin = New System.Windows.Forms.Padding(0) - Me.txtEust.Name = "txtEust" - Me.txtEust.Size = New System.Drawing.Size(100, 24) - Me.txtEust.TabIndex = 39 + Me.txtSicherheitEust.Enabled = False + Me.txtSicherheitEust.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitEust.Location = New System.Drawing.Point(197, 250) + 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 ' 'Label13 ' @@ -1131,16 +808,16 @@ Partial Class frmGesamtsicherheitenNEU Me.Label13.TabIndex = 32 Me.Label13.Text = "A.TR Ja/Nein" ' - 'cboATR + 'cboSicherheitATR ' - Me.cboATR.Enabled = False - Me.cboATR.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!) - Me.cboATR.FormattingEnabled = True - Me.cboATR.Items.AddRange(New Object() {"JA", "NEIN"}) - Me.cboATR.Location = New System.Drawing.Point(74, 250) - Me.cboATR.Name = "cboATR" - Me.cboATR.Size = New System.Drawing.Size(120, 26) - Me.cboATR.TabIndex = 38 + Me.cboSicherheitATR.Enabled = False + Me.cboSicherheitATR.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!) + Me.cboSicherheitATR.FormattingEnabled = True + Me.cboSicherheitATR.Items.AddRange(New Object() {"JA", "NEIN"}) + 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 ' 'Label7 ' @@ -1271,14 +948,26 @@ Partial Class frmGesamtsicherheitenNEU Me.txtPosFreitext.Size = New System.Drawing.Size(255, 24) Me.txtPosFreitext.TabIndex = 41 ' - 'txtFreitextOpen + 'txtSicherheitFreitext ' - Me.txtFreitextOpen.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtFreitextOpen.Location = New System.Drawing.Point(367, 250) - Me.txtFreitextOpen.Margin = New System.Windows.Forms.Padding(0) - Me.txtFreitextOpen.Name = "txtFreitextOpen" - Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24) - Me.txtFreitextOpen.TabIndex = 40 + Me.txtSicherheitFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSicherheitFreitext.Location = New System.Drawing.Point(367, 250) + 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 + ' + '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: " ' 'frmGesamtsicherheitenNEU ' @@ -1313,28 +1002,28 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents btnAddPos As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btnAddSicherheit As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblGestellungNr As Label - Friend WithEvents txtCRNTime As TextBox - Friend WithEvents txtCRNDate As TextBox - Friend WithEvents txtMRNTime As TextBox - Friend WithEvents txtMRNDate As TextBox + Friend WithEvents txtPosTime As TextBox + 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 - Friend WithEvents txtMRNSicherheitsbetrag As TextBox - Friend WithEvents txtMRNWarenwert As TextBox - Friend WithEvents txtMRN As TextBox + Friend WithEvents txtSicherheitSicherheitsbetrag As TextBox + Friend WithEvents txtSicherheitWarenwert As TextBox + Friend WithEvents txtSicherheitATBNr As TextBox Friend WithEvents btn_resetSearch As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblZollsatz As Label Friend WithEvents lblReferenzwert As Label Friend WithEvents lblSaldo As Label Friend WithEvents panOben As Panel Friend WithEvents txtPosFreitext As TextBox - Friend WithEvents txtFreitextOpen As TextBox + Friend WithEvents txtSicherheitFreitext As TextBox Friend WithEvents Label14 As Label - Friend WithEvents txtEust As TextBox + Friend WithEvents txtSicherheitEust As TextBox Friend WithEvents Label13 As Label - Friend WithEvents cboATR As ComboBox + Friend WithEvents cboSicherheitATR As ComboBox Friend WithEvents Label7 As Label Friend WithEvents Label8 As Label Friend WithEvents Label9 As Label @@ -1348,7 +1037,7 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents Label2 As Label Friend WithEvents Label1 As Label Friend WithEvents Label15 As Label - Friend WithEvents txtPos As TextBox + Friend WithEvents txtAnzahlPos As TextBox Friend WithEvents panOverlay As Panel Friend WithEvents btnSave As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents txtLKWID As TextBox @@ -1369,30 +1058,11 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents Panel1 As Panel Friend WithEvents cbx_Suche_Warenort As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label19 As Label - Friend WithEvents cbx_Suche_Filiale As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents btnNeu As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents txt_Suche As TextBox Friend WithEvents Label21 As Label - Friend WithEvents Label22 As Label - Friend WithEvents btnSucheStarten As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Label23 As Label - Friend WithEvents Label26 As Label - Friend WithEvents btnBisTag As Button - Friend WithEvents btnVonTag As Button - Friend WithEvents btnTag As Button - Friend WithEvents txtDatVon As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label24 As Label - Friend WithEvents btnJahr As Button - Friend WithEvents btnBisJahr As Button - Friend WithEvents btnVonJahr As Button - Friend WithEvents btnMonat As Button - Friend WithEvents btnBisMonat As Button - Friend WithEvents btnVonMonat As Button - Friend WithEvents DateTimePicker2 As DateTimePicker - Friend WithEvents Label25 As Label - Friend WithEvents DateTimePicker1 As DateTimePicker Friend WithEvents btnSuche As Button - Friend WithEvents txtDatBis As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label20 As Label - Friend WithEvents TextBox1 As TextBox + Friend WithEvents txtPosNr As TextBox + Friend WithEvents lbloffenerSaldo As Label End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index e37b04d..2ab3568 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -1,17 +1,15 @@ Imports System.Reflection +Imports System.Web.UI.WebControls.Expressions Imports DocumentFormat.OpenXml.Bibliography Imports DocumentFormat.OpenXml.Presentation Imports DocumentFormat.OpenXml.Spreadsheet +Imports Spire.Pdf.General.Render.Decode Imports VERAG_PROG_ALLGEMEIN Public Class frmGesamtsicherheitenNEU - 'Dim openopened As cSicherheiten - - 'Dim closedopened As cSicherheiten - - Dim currentSicherheit As cSicherheiten + Property currentSicherheit As cSicherheiten Property currentSPos As cGesamtsicherheitsPositionen Property currentGesSichRef As cGesamtsicherheitsReferenz Public Property gessicherheitID As Integer @@ -30,58 +28,52 @@ Public Class frmGesamtsicherheitenNEU Public Abfertigungsnummer As String - Public LKWID As String + Public LKWKZ As String Public warenortID As String - Dim indexGsId As Integer = 0 + Dim indexGsId As Integer + + Dim indexGspPosId As Integer Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) - - Dim srcTAG As Date = CDate(Now.ToShortDateString) - - Dim JAHR As Date = CDate("01.01." & Now.Year) - - Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort) lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N") + Me.Text = "Gesamtsicherheit " & Standort - If setNullToZero(gessicherheitID) = 0 Or Neu = True Then - 'panOben.Enabled = False : panOben.Enabled = False + 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) + + If setNullToZero(gessicherheitID) = "" Or Neu = True Then + + panOben.Enabled = False : panOben.Enabled = False Panel1.Enabled = True - 'panOverlay.Visible = True + 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) cboWarenort.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_Filiale.Items.AddRange(cboFiliale.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) - cbx_Suche_Warenort.Items.AddRange(cboWarenort.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) - If datum = Nothing Then datum = Date.Now + Else LoadDGVSicherheiten() End If LoadStandort() - cboATR.Enabled = currentGesSichRef.gsr_ATR + cboSicherheitATR.Enabled = currentGesSichRef.gsr_ATR Zollsatz = currentGesSichRef.gsr_zollsatz - txtDatVon.Text = Date.Today.ToString("dd.MM.yyyy") - txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") - - btnMonat.Text = MONAT.ToString("MMMM") - btnJahr.Text = JAHR.Year Me.Text = "Gesamtsicherheit " & Standort frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos) End Sub + Public Sub LoadDGVSicherheiten() lblSaldo.Text = "Saldo: € " & currentGesSichRef.gsr_Saldo.ToString() @@ -89,32 +81,33 @@ Public Class frmGesamtsicherheitenNEU 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 addtosqlstring As String = "" - Dim SQLStringMRN 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_LKWID like '%" & txt_Suche.Text & "%' OR" & - " gs_warenort like '%" & cbx_Suche_Warenort.Text & "%') order by [gs_datum]" + '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]" - dgvGesamtsicherheit.SET_SQL(SQLStringMRN, "AVISO", ,) + 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]" + + dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,) dgvGesamtsicherheit.LOAD() - - - If dgvGesamtsicherheit.Columns.Count > 0 Then With dgvGesamtsicherheit .RowHeadersWidth = 10 - .Columns("gs_gsId").Visible = False + .Columns("gs_gsId").Visible = True + .Columns("gs_gsnr").Visible = True .Columns("gs_warenwert").DefaultCellStyle.Format = "c" .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c" .Columns("gs_saldo").DefaultCellStyle.Format = "c" - .Columns("gs_saldo").Visible = False + .Columns("gs_saldo").Visible = True Select Case currentGesSichRef.gsr_ATR Case True .Columns("gs_ATBNr").HeaderText = "ATB" @@ -156,7 +149,9 @@ Public Class frmGesamtsicherheitenNEU currentSicherheit = New cSicherheiten(indexGsId) LoadDGVSicherheitsPos(indexGsId) - loadTitle(indexGsId) + loadTitle() + setSaldo() + If dgvGesamtsicherheit.Enabled = False Then Exit Sub @@ -167,14 +162,14 @@ Public Class frmGesamtsicherheitenNEU If gsId = 0 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] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gsId & "' order by [gsp_gspPosId]" + 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]" dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,) dgvSicherheitsPos.LOAD() If dgvSicherheitsPos.Columns.Count > 0 Then With dgvSicherheitsPos .RowHeadersWidth = 10 - .Columns("gsp_gsId").Visible = False + .Columns("gsp_gsId").Visible = True .Columns("gsp_warenwert").DefaultCellStyle.Format = "c" .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c" '.Columns("gs_saldo").DefaultCellStyle.Format = "c" @@ -186,7 +181,7 @@ Public Class frmGesamtsicherheitenNEU .Columns("gsp_ATCNr").HeaderText = "CRN" End Select .Columns("gsp_ATCNr").Width = 120 - '.Columns("gs_datum").Width = 140 + .Columns("gsp_erstellungsdatum").Width = 140 .Columns("gsp_warenwert").Width = 100 .Columns("gsp_sicherheitsbetrag").Width = 100 .Columns("gsp_freitext").Width = 220 @@ -196,7 +191,18 @@ Public Class frmGesamtsicherheitenNEU End Sub - Sub loadTitle(indexGsId As Integer) + 'Private Sub dgvSicherheitsPos_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSicherheitsPos.SelectionChanged + ' If dgvSicherheitsPos.SelectedRows.Count > 0 Then + + ' indexGspPosId = CInt(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_gspPosId").Value) + ' currentSPos = New cGesamtsicherheitsPositionen(indexGsId, indexGspPosId) + + ' If dgvSicherheitsPos.Enabled = False Then Exit Sub + + ' End If + 'End Sub + + Sub loadTitle() 'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'" lblGestellungNr.Text = "" @@ -208,16 +214,19 @@ Public Class frmGesamtsicherheitenNEU dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) If dt.Rows.Count > 0 Then - Me.LKWID = setNullToZero(dt.Rows(0).Item("gs_LKWID")) + Me.LKWKZ = setNullToZero(dt.Rows(0).Item("gs_LKWKZ")) Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr")) Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr")) Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort")) - - If Me.LKWID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWID & " " - 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 & " " End If + + If Me.LKWKZ.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWKZ & " " + 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 & " " + + + End Sub @@ -228,20 +237,20 @@ Public Class frmGesamtsicherheitenNEU ZollsatzMulti = currentGesSichRef.gsr_zollsatz / 100 End Sub - Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtPosWarenwert.TextChanged + Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtSicherheitWarenwert.TextChanged, txtPosWarenwert.TextChanged Try Select Case sender.name - Case "txtMRNWarenwert" - txtMRNSicherheitsbetrag.Text = (txtMRNWarenwert.Text * ZollsatzMulti).ToString("N") - If currentGesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (currentGesSichRef.gsr_ust / 100) - Case "txtCRNWarenwert" + Case "txtSicherheitWarenwert" + txtSicherheitSicherheitsbetrag.Text = (txtSicherheitWarenwert.Text * ZollsatzMulti).ToString("N") + If currentGesSichRef.gsr_ustEnabled Then txtSicherheitEust.Text = (Double.Parse(txtSicherheitWarenwert.Text) + Double.Parse(txtSicherheitSicherheitsbetrag.Text)) * (currentGesSichRef.gsr_ust / 100) + Case "txtPosWarenwert" txtPosSicherheitsbetrag.Text = (txtPosWarenwert.Text * ZollsatzMulti).ToString("N") End Select Catch End Try End Sub - Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtPos.KeyPress + Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress Select Case Asc(e.KeyChar) Case 48 To 57, 8, 44 ' Zahlen, Backspace und , zulassen @@ -252,7 +261,7 @@ Public Class frmGesamtsicherheitenNEU End Select End Sub - Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtCRNDate.KeyPress, txtCRNTime.KeyPress, txtMRNDate.KeyPress, txtMRNTime.KeyPress + Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtPosTime.KeyPress, txtSicherheitDate.KeyPress, txtSicherheitTime.KeyPress Select Case Asc(e.KeyChar) Case 48 To 57, 8, 46, 58 ' Zahlen, Backspace, . und : zulassen @@ -266,8 +275,8 @@ Public Class frmGesamtsicherheitenNEU Private Sub btnSaveOben_Click(sender As Object, e As EventArgs) Handles btnSaveOben.Click Try - Dim a As Date = Date.ParseExact(txtMRNDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - Dim b As Date = Date.ParseExact(txtMRNTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo) + 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) @@ -276,16 +285,16 @@ Public Class frmGesamtsicherheitenNEU End Try End Sub - Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtMRNDate.GotFocus, txtCRNDate.GotFocus, txtMRNTime.GotFocus, txtCRNTime.GotFocus + Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDate.GotFocus, txtPosDate.GotFocus, txtSicherheitTime.GotFocus, txtPosTime.GotFocus Select Case sender.name - Case "txtMRNDate" - If txtMRNDate.Text.Length < 1 Then txtMRNDate.Text = Date.Today.ToString("dd.MM.yyyy") - Case "txtCRNDate" - If txtCRNDate.Text.Length < 1 Then txtCRNDate.Text = Date.Today.ToString("dd.MM.yyyy") - Case "txtMRNTime" - If txtMRNTime.Text.Length < 1 Then txtMRNTime.Text = Date.Now.ToString("HH:mm") - Case "txtCRNTime" - If txtCRNTime.Text.Length < 1 Then txtCRNTime.Text = Date.Now.ToString("HH:mm") + Case "txtSicherheitDate" + If txtSicherheitDate.Text.Length < 1 Then txtSicherheitDate.Text = Date.Today.ToString("dd.MM.yyyy") + Case "txtPosDate" + If txtPosDate.Text.Length < 1 Then txtPosDate.Text = Date.Today.ToString("dd.MM.yyyy") + Case "txtSicherheitTime" + If txtSicherheitTime.Text.Length < 1 Then txtSicherheitTime.Text = Date.Now.ToString("HH:mm") + Case "txtPosTime" + If txtPosTime.Text.Length < 1 Then txtPosTime.Text = Date.Now.ToString("HH:mm") End Select End Sub @@ -293,25 +302,41 @@ Public Class frmGesamtsicherheitenNEU Try - Dim limit As Integer = Integer.Parse(setNullToZero(txtPos.Text)) + Dim limit As Integer = Integer.Parse(setNullToZero(txtAnzahlPos.Text)) Dim OPEN As New cSicherheiten() With OPEN - .gs_ATBNr = txtMRN.Text - .gs_posNr = Integer.Parse(setNullToZero(txtPos.Text)) - .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) - .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") + .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.txtFreitextOpen.Text + .gs_freitext = Me.txtSicherheitFreitext.Text .gs_saldo = currentGesSichRef.gsr_Saldo - .gs_atr = setNullToZero(cboATR.SelectedItem) + .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() @@ -328,8 +353,9 @@ Public Class frmGesamtsicherheitenNEU .gsp_freitext = "" .gsp_filialenNr = OPEN.gs_filialenNr .gsp_art = "OPEN" - .gsp_abfertigungsNr = OPEN.gs_filialenNr - .gsp_avisoId = OPEN.gs_ATBNr + .gsp_abfertigungsNr = OPEN.gs_abfertigungsnr + .gsp_erstellungsdatum = Me.datum + .gsp_avisoId = "" .gsp_ust = "" .gsp_ATCNr = "" .gsp_MRNNr = "" @@ -337,26 +363,25 @@ Public Class frmGesamtsicherheitenNEU OPENPos.SAVE() - 'If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr() + If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr() - 'Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID) - ' Case "Neu" - ' OPEN.SAVE() + 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 + 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 + End Select Next - AfterButton() @@ -373,24 +398,32 @@ Public Class frmGesamtsicherheitenNEU Exit Sub End If + If (checkWarenwert() = False) Then + MsgBox("Der Warenwert der Positionen übersteigt den Warenwert der Gestellung!") + txtPosWarenwert.Focus() + Exit Sub + End If + Try Dim SicherheitsPos As New cGesamtsicherheitsPositionen() With SicherheitsPos .gsp_gsId = currentSicherheit.gs_gsId .gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsId) + 1 - .gsp_warenwert = 0 - .gsp_sicherheitsbetrag = 0 - .gsp_freitext = "" + .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_abfertigungsNr = "" - .gsp_avisoId = "" + .gsp_abfertigungsNr = currentSicherheit.gs_abfertigungsnr + .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text) .gsp_ust = currentSicherheit.gs_ust - .gsp_ATCNr = "" - .gsp_MRNNr = "" + .gsp_ATCNr = txtPositionenCRN.Text + .gsp_MRNNr = txtPositionenCRN.Text End With + + SicherheitsPos.SAVE() 'If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr() @@ -445,7 +478,7 @@ Public Class frmGesamtsicherheitenNEU For Each contr As Windows.Forms.Control In panOben.Controls If contr.GetType.FullName = "System.Windows.Forms.TextBox" Then contr.Text = "" Next - cboATR.SelectedItem = Nothing + cboSicherheitATR.SelectedItem = Nothing End Sub Public Function checkIfExist(KennnummerStr As String, Optional ByVal lkw As String = "") As String @@ -476,7 +509,7 @@ Public Class frmGesamtsicherheitenNEU - Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click, btnSaveOben.Click + Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click ', btnSaveOben.Click If checkMandatoryFieldsAreFilled() = False Then Exit Sub @@ -494,13 +527,14 @@ Public Class frmGesamtsicherheitenNEU End Try Me.Abfertigungsnummer = txtAbfertNum.Text - Me.LKWID = txtLKWID.Text + Me.LKWKZ = txtLKWID.Text If setNullToZero(Me.gessicherheitID) >= 0 Then - Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "', [gs_LKWID] = '" & Me.LKWID & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' " + 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") LoadDGVSicherheiten() End If + loadTitle() panOben.Enabled = True : panOben.Enabled = True panOverlay.Visible = False @@ -529,13 +563,13 @@ Public Class frmGesamtsicherheitenNEU Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value) - txtMRN.Text = Sicherh.gs_ATBNr - txtPos.Text = Sicherh.gs_posNr - txtMRNWarenwert.Text = Sicherh.gs_warenwert - txtFreitextOpen.Text = Sicherh.gs_freitext - cboATR.SelectedItem = Sicherh.gs_atr - txtMRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy") - txtMRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm") + txtSicherheitATBNr.Text = Sicherh.gs_ATBNr + txtAnzahlPos.Text = Sicherh.gs_posNr + txtSicherheitWarenwert.Text = Sicherh.gs_warenwert + txtSicherheitFreitext.Text = Sicherh.gs_freitext + cboSicherheitATR.SelectedItem = Sicherh.gs_atr + txtSicherheitDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy") + txtSicherheitTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm") currentSicherheit = Sicherh @@ -546,19 +580,20 @@ Public Class frmGesamtsicherheitenNEU Private Sub btnUpdateSicherheit_Click(sender As Object, e As EventArgs) Handles btnUpdateSicherheit.Click With currentSicherheit - .gs_ATBNr = txtMRN.Text - .gs_posNr = Double.Parse(setNullToZero(txtPos.Text)) - .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) - .gs_warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") - .gs_sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") + .gs_ATBNr = txtSicherheitATBNr.Text + .gs_posNr = Double.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 '.MakeDate = Me.MakeDate - .gs_freitext = Me.txtFreitextOpen.Text + .gs_freitext = Me.txtSicherheitFreitext.Text '.saldo = currentGesSichRef.Saldo - .gs_atr = setNullToZero(cboATR.SelectedItem) + .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) End With + checkWarenwert() currentSicherheit.SAVE() btnUpdateSicherheit.Visible = False btnAddSicherheit.Visible = True @@ -570,13 +605,13 @@ Public Class frmGesamtsicherheitenNEU With currentSPos .gsp_art = "CLOSE" - .gsp_gspPosId = txtPos.Text .gsp_freitext = txtPosFreitext.Text - .gsp_sicherheitsbetrag = txtPosSicherheitsbetrag.Text - .gsp_warenwert = txtPosWarenwert.Text + .gsp_sicherheitsbetrag = Double.Parse(txtPosSicherheitsbetrag.Text) + .gsp_warenwert = Double.Parse(txtPosWarenwert.Text) .gsp_ATCNr = txtPositionenCRN.Text End With + checkWarenwert() currentSPos.SAVE() btnAddPos.Visible = True btnUpdatePos.Visible = False @@ -584,15 +619,17 @@ Public Class frmGesamtsicherheitenNEU AfterButton() End Sub - Private Sub dgvGesamtsicherheitPositionen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellContentClick + Private Sub dgvGesamtsicherheitPositionen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick Dim sPos As New cGesamtsicherheitsPositionen(indexGsId, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value) - txtPos.Text = sPos.gsp_gspPosId + txtPosNr.Text = sPos.gsp_gspPosId txtPosFreitext.Text = sPos.gsp_freitext txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag - txtPosWarenwert.Text = sPos.gsp_sicherheitsbetrag + txtPosWarenwert.Text = sPos.gsp_warenwert txtPositionenCRN.Text = sPos.gsp_ATCNr + txtPosDate.Text = sPos.gsp_erstellungsdatum.ToString("dd.MM.yyyy") + txtPosTime.Text = sPos.gsp_erstellungsdatum.ToString("HH:mm") currentSPos = sPos @@ -632,7 +669,7 @@ Public Class frmGesamtsicherheitenNEU 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) txtAbfertNum.Text = Me.Abfertigungsnummer - txtLKWID.Text = Me.LKWID + txtLKWID.Text = Me.LKWKZ panOben.Enabled = False End Sub @@ -657,7 +694,7 @@ Public Class frmGesamtsicherheitenNEU sicherheiten.gs_filialenNr = gessich.FilialNummer sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer - sicherheiten.gs_LKWID = gessich.LKWID + sicherheiten.gs_LKWKZ = gessich.LKWKZ sicherheiten.gs_warenort = gessich.warenortID End Sub @@ -680,106 +717,16 @@ Public Class frmGesamtsicherheitenNEU End Function - 'Kalenderhandling - - - Sub initBtns(MonatJahr) - btnMonat.Text = MONAT.ToString("MMMM") - btnJahr.Text = JAHR.Year - Select Case MonatJahr - Case "Monat" - DateTimePicker1.Value = MONAT - DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1) - Case "Jahr" - - DateTimePicker1.Value = JAHR - DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) - 'End If - Case "Tag" - - DateTimePicker1.Value = srcTAG - DateTimePicker2.Value = srcTAG - If srcTAG = Now.ToShortDateString Then - btnTag.Text = "Heute" - ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then - btnTag.Text = "Gestern" - ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then - btnTag.Text = "Vorgestern" - Else - btnTag.Text = srcTAG.ToString("dd.MM") - End If - - 'End If - Case "" - DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year) - DateTimePicker2.Value = Now - End Select - - End Sub - - - Private Sub btnJahr_Click(sender As Object, e As EventArgs) Handles btnJahr.Click - initBtns("Jahr") - End Sub - - Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click - JAHR = JAHR.AddYears(1) - initBtns("Jahr") - End Sub - - Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click - JAHR = JAHR.AddYears(-1) - initBtns("Jahr") - End Sub - - Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click - initBtns("Monat") - End Sub - - Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click - MONAT = MONAT.AddMonths(1) - initBtns("Monat") - End Sub - - Private Sub btnVonMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click - MONAT = MONAT.AddMonths(-1) - initBtns("Monat") - End Sub - - - Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnTag.Click - initBtns("Tag") - End Sub - - Private Sub Button6_Click(sender As Object, e As EventArgs) Handles btnVonTag.Click - srcTAG = srcTAG.AddDays(-1) - initBtns("Tag") - End Sub - - Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btnBisTag.Click - srcTAG = srcTAG.AddDays(1) - initBtns("Tag") - End Sub - - Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged - txtDatVon._value = CDate(sender.value).ToShortDateString - End Sub - - Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.ValueChanged - txtDatBis._value = CDate(sender.value).ToShortDateString - End Sub Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click Try - Date.Parse(txtDatVon.Text) - Date.Parse(txtDatBis.Text) If Me.Visible Then LoadDGVSicherheiten() Catch ex As Exception MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.") End Try End Sub - Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click + Private Sub btnNeu_Click(sender As Object, e As EventArgs) panOverlay.Visible = True End Sub @@ -799,10 +746,64 @@ Public Class frmGesamtsicherheitenNEU Private Sub clearSearchFields() cbx_Suche_Warenort.changeItem("") - cbx_Suche_Filiale.changeItem("") txt_Suche.Clear() End Sub + Private Function checkWarenwert() As Boolean + + Dim ok As Boolean = True + + Dim offenerWarenwert As Double + Try + + offenerWarenwert = calcOffenenWarenwert() + + If (offenerWarenwert < Double.Parse(txtPosWarenwert.Text)) Then + ok = False + End If + + Catch ex As Exception + MsgBox(ex.Message) + End Try + + + Return ok + + End Function + + + Private Function calcOffenenWarenwert() 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) + Catch ex As Exception + MsgBox(ex.Message) + End Try + + Return diff + + End Function + + Private Sub setSaldo() + + lbloffenerSaldo.Text = "offener Saldo: " + If Me.calcOffenenWarenwert > 0 Then + lbloffenerSaldo.Text &= Me.calcOffenenWarenwert() + Else + lbloffenerSaldo.Text &= "0" + End If + End Sub + + Private Sub rearangePosNr() + + End Sub + + + + End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 27e9a28..c29683e 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4176,7 +4176,7 @@ Public Class frmHauptfenster End Sub Private Sub DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHNEUToolStripMenuItem.Click - Dim frm As New frmGesamtsicherheitenNEU + Dim frm As New frmGesamtsicherheitenMenuNEU frm.Standort = "VERAG AG" frm.Show() End Sub