diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 02e7766..5b157f0 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 7dd3b23..a79f827 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -29,14 +29,21 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.ListeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DetaillisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ReferenzlisteZollamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RLZollamtBereinigtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SaldoZumStichtagToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() + 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() @@ -47,27 +54,22 @@ Partial Class frmGesamtsicherheitenMenuNEU 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.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label1 = New System.Windows.Forms.Label() + Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtSuchbegriff = New System.Windows.Forms.TextBox() Me.chkOffen = New System.Windows.Forms.CheckBox() + Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblSaldo = New System.Windows.Forms.Label() Me.lblZollsatz = New System.Windows.Forms.Label() Me.lblReferenzwert = New System.Windows.Forms.Label() Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -78,45 +80,70 @@ Partial Class frmGesamtsicherheitenMenuNEU ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(203, 114) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 114) ' 'ExportCSVToolStripMenuItem ' - Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem}) + Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem, Me.RLZollamtBereinigtToolStripMenuItem}) Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem" - Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(201, 22) Me.ExportCSVToolStripMenuItem.Text = "Export CSV" ' 'ListeToolStripMenuItem ' Me.ListeToolStripMenuItem.Name = "ListeToolStripMenuItem" - Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(186, 22) + Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(183, 22) Me.ListeToolStripMenuItem.Text = "Liste" ' 'DetaillisteToolStripMenuItem ' Me.DetaillisteToolStripMenuItem.Name = "DetaillisteToolStripMenuItem" - Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(186, 22) + Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(183, 22) Me.DetaillisteToolStripMenuItem.Text = "Detailliste" ' 'ReferenzlisteZollamtToolStripMenuItem ' Me.ReferenzlisteZollamtToolStripMenuItem.Name = "ReferenzlisteZollamtToolStripMenuItem" - Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(186, 22) - Me.ReferenzlisteZollamtToolStripMenuItem.Text = "Referenzliste-Zollamt" + Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(183, 22) + Me.ReferenzlisteZollamtToolStripMenuItem.Text = "RL-Zollamt" + ' + 'RLZollamtBereinigtToolStripMenuItem + ' + Me.RLZollamtBereinigtToolStripMenuItem.Name = "RLZollamtBereinigtToolStripMenuItem" + Me.RLZollamtBereinigtToolStripMenuItem.Size = New System.Drawing.Size(183, 22) + Me.RLZollamtBereinigtToolStripMenuItem.Text = "RL-Zollamt bereinigt" ' 'SaldenNeuBerechnenToolStripMenuItem ' Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem" - Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(201, 22) Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen" ' 'SaldoZumStichtagToolStripMenuItem ' Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem" - Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(201, 22) Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag" ' + 'PrüfungAusPlausibilitätToolStripMenuItem + ' + Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem, Me.MehrfacheATBNrToolStripMenuItem}) + Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem" + Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(201, 22) + Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung auf Plausibilität" + ' + 'AusgangEingangToolStripMenuItem + ' + Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem" + Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang" + ' + 'SicherheitsbetragToolStripMenuItem + ' + Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem" + Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag" + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -168,6 +195,46 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.PictureBox5.TabIndex = 132 Me.PictureBox5.TabStop = False ' + 'btnOpenOver85Days + ' + Me.btnOpenOver85Days.allowBorder = False + Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White + Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 + Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black + Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210) + Me.btnOpenOver85Days.Name = "btnOpenOver85Days" + Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) + Me.btnOpenOver85Days.TabIndex = 32 + Me.btnOpenOver85Days.Text = "Über 85 Tage offen" + Me.btnOpenOver85Days.UseVisualStyleBackColor = False + Me.btnOpenOver85Days.Visible = False + ' + 'txtDatBis + ' + Me.txtDatBis._DateTimeOnly = False + 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.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(62, 170) + Me.txtDatBis.MaxLength = 10 + Me.txtDatBis.MaxLineLength = -1 + Me.txtDatBis.MaxLines_Warning = "" + Me.txtDatBis.MaxLines_Warning_Label = Nothing + Me.txtDatBis.Name = "txtDatBis" + Me.txtDatBis.Size = New System.Drawing.Size(63, 20) + Me.txtDatBis.TabIndex = 25 + ' 'Label26 ' Me.Label26.AutoSize = True @@ -226,6 +293,31 @@ Partial Class frmGesamtsicherheitenMenuNEU 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(62, 146) + Me.txtDatVon.MaxLength = 10 + Me.txtDatVon.MaxLineLength = -1 + Me.txtDatVon.MaxLines_Warning = "" + Me.txtDatVon.MaxLines_Warning_Label = Nothing + Me.txtDatVon.Name = "txtDatVon" + Me.txtDatVon.Size = New System.Drawing.Size(63, 20) + Me.txtDatVon.TabIndex = 18 + ' 'Label24 ' Me.Label24.AutoSize = True @@ -362,6 +454,18 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20) Me.DateTimePicker1.TabIndex = 17 ' + 'cbxWarenort + ' + Me.cbxWarenort._allowedValuesFreiText = Nothing + Me.cbxWarenort._allowFreiText = False + Me.cbxWarenort._value = "" + Me.cbxWarenort.DropDownWidth = 500 + Me.cbxWarenort.FormattingEnabled = True + Me.cbxWarenort.Location = New System.Drawing.Point(132, 69) + Me.cbxWarenort.Name = "cbxWarenort" + Me.cbxWarenort.Size = New System.Drawing.Size(81, 21) + Me.cbxWarenort.TabIndex = 8 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -373,6 +477,18 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label4.TabIndex = 5 Me.Label4.Text = "Warenort:" ' + 'cbxStandort + ' + Me.cbxStandort._allowedValuesFreiText = Nothing + Me.cbxStandort._allowFreiText = False + Me.cbxStandort._value = "" + Me.cbxStandort.DropDownWidth = 200 + Me.cbxStandort.FormattingEnabled = True + Me.cbxStandort.Location = New System.Drawing.Point(32, 69) + Me.cbxStandort.Name = "cbxStandort" + Me.cbxStandort.Size = New System.Drawing.Size(81, 21) + Me.cbxStandort.TabIndex = 7 + ' 'lblFiliale ' Me.lblFiliale.AutoSize = True @@ -384,6 +500,20 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblFiliale.TabIndex = 4 Me.lblFiliale.Text = "Filiale:" ' + 'btnSucheStarten + ' + Me.btnSucheStarten.allowBorder = False + 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(32, 254) + Me.btnSucheStarten.Name = "btnSucheStarten" + Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) + Me.btnSucheStarten.TabIndex = 33 + Me.btnSucheStarten.Text = "Suche starten" + Me.btnSucheStarten.UseVisualStyleBackColor = False + ' 'Label1 ' Me.Label1.AutoSize = True @@ -395,6 +525,20 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label1.TabIndex = 0 Me.Label1.Text = "Suche:" ' + 'btnResetFilter + ' + Me.btnResetFilter.allowBorder = False + Me.btnResetFilter.BackColor = System.Drawing.Color.White + Me.btnResetFilter.FlatAppearance.BorderSize = 0 + Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnResetFilter.ForeColor = System.Drawing.Color.Black + Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh + Me.btnResetFilter.Location = New System.Drawing.Point(283, 21) + Me.btnResetFilter.Name = "btnResetFilter" + Me.btnResetFilter.Size = New System.Drawing.Size(62, 33) + Me.btnResetFilter.TabIndex = 3 + Me.btnResetFilter.UseVisualStyleBackColor = False + ' 'txtSuchbegriff ' Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28) @@ -415,6 +559,21 @@ Partial Class frmGesamtsicherheitenMenuNEU 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(571, 253) + Me.btnNeu.Name = "btnNeu" + Me.btnNeu.Size = New System.Drawing.Size(75, 23) + Me.btnNeu.TabIndex = 34 + Me.btnNeu.Text = "Neu" + Me.btnNeu.UseVisualStyleBackColor = False + ' 'lblSaldo ' Me.lblSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right @@ -481,157 +640,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.Size = New System.Drawing.Size(658, 394) Me.dgvListe.TabIndex = 1 ' - 'btnOpenOver85Days + 'MehrfacheATBNrToolStripMenuItem ' - Me.btnOpenOver85Days.allowBorder = False - Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White - Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 - Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black - Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210) - Me.btnOpenOver85Days.Name = "btnOpenOver85Days" - Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) - Me.btnOpenOver85Days.TabIndex = 32 - Me.btnOpenOver85Days.Text = "Über 85 Tage offen" - Me.btnOpenOver85Days.UseVisualStyleBackColor = False - Me.btnOpenOver85Days.Visible = False - ' - 'txtDatBis - ' - Me.txtDatBis._DateTimeOnly = False - 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(62, 170) - Me.txtDatBis.MaxLength = 10 - Me.txtDatBis.MaxLineLength = -1 - Me.txtDatBis.MaxLines_Warning = "" - Me.txtDatBis.MaxLines_Warning_Label = Nothing - Me.txtDatBis.Name = "txtDatBis" - Me.txtDatBis.Size = New System.Drawing.Size(63, 20) - Me.txtDatBis.TabIndex = 25 - ' - '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(62, 146) - Me.txtDatVon.MaxLength = 10 - Me.txtDatVon.MaxLineLength = -1 - Me.txtDatVon.MaxLines_Warning = "" - Me.txtDatVon.MaxLines_Warning_Label = Nothing - Me.txtDatVon.Name = "txtDatVon" - Me.txtDatVon.Size = New System.Drawing.Size(63, 20) - Me.txtDatVon.TabIndex = 18 - ' - 'cbxWarenort - ' - Me.cbxWarenort._allowedValuesFreiText = Nothing - Me.cbxWarenort._allowFreiText = False - Me.cbxWarenort._value = "" - Me.cbxWarenort.DropDownWidth = 500 - Me.cbxWarenort.FormattingEnabled = True - Me.cbxWarenort.Location = New System.Drawing.Point(132, 69) - Me.cbxWarenort.Name = "cbxWarenort" - Me.cbxWarenort.Size = New System.Drawing.Size(81, 21) - Me.cbxWarenort.TabIndex = 8 - ' - 'cbxStandort - ' - Me.cbxStandort._allowedValuesFreiText = Nothing - Me.cbxStandort._allowFreiText = False - Me.cbxStandort._value = "" - Me.cbxStandort.DropDownWidth = 200 - Me.cbxStandort.FormattingEnabled = True - Me.cbxStandort.Location = New System.Drawing.Point(32, 69) - Me.cbxStandort.Name = "cbxStandort" - Me.cbxStandort.Size = New System.Drawing.Size(81, 21) - Me.cbxStandort.TabIndex = 7 - ' - 'btnSucheStarten - ' - Me.btnSucheStarten.allowBorder = False - 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(32, 254) - Me.btnSucheStarten.Name = "btnSucheStarten" - Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) - Me.btnSucheStarten.TabIndex = 33 - Me.btnSucheStarten.Text = "Suche starten" - Me.btnSucheStarten.UseVisualStyleBackColor = False - ' - 'btnResetFilter - ' - Me.btnResetFilter.allowBorder = False - Me.btnResetFilter.BackColor = System.Drawing.Color.White - Me.btnResetFilter.FlatAppearance.BorderSize = 0 - Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnResetFilter.ForeColor = System.Drawing.Color.Black - Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh - Me.btnResetFilter.Location = New System.Drawing.Point(283, 21) - Me.btnResetFilter.Name = "btnResetFilter" - Me.btnResetFilter.Size = New System.Drawing.Size(62, 33) - Me.btnResetFilter.TabIndex = 3 - Me.btnResetFilter.UseVisualStyleBackColor = False - ' - '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(571, 253) - Me.btnNeu.Name = "btnNeu" - Me.btnNeu.Size = New System.Drawing.Size(75, 23) - Me.btnNeu.TabIndex = 34 - Me.btnNeu.Text = "Neu" - Me.btnNeu.UseVisualStyleBackColor = False - ' - 'PrüfungAusPlausibilitätToolStripMenuItem - ' - Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem}) - Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem" - Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(202, 22) - Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung aus Plausibilität" - ' - 'AusgangEingangToolStripMenuItem - ' - Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem" - Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang" - ' - 'SicherheitsbetragToolStripMenuItem - ' - Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem" - Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag" + Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem" + Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr" ' 'frmGesamtsicherheitenMenuNEU ' @@ -700,4 +713,6 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents PrüfungAusPlausibilitätToolStripMenuItem As ToolStripMenuItem Friend WithEvents AusgangEingangToolStripMenuItem As ToolStripMenuItem Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem + Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index d8c1c6b..d7d2561 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -500,7 +500,7 @@ Public Class frmGesamtsicherheitenMenuNEU End Sub - Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click + Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click, RLZollamtBereinigtToolStripMenuItem.Click If dgvListe.Rows.Count = 0 Then MsgBox("keine Daten vorhanden!") @@ -519,6 +519,9 @@ Public Class frmGesamtsicherheitenMenuNEU Dim detailINfo As Boolean = True + Dim zollliste_bereinigt As Boolean = False + + 'Dim nurErstellungsdatumNotAenderungsdatum As Boolean = False 'If vbYes = MsgBox("Sollen nur Datensaetze angegeben werden, deren Erstellungsdatum/Änderungsdatum vom Gestellungsdatum abweicht?", vbYesNoCancel) Then ' nurErstellungsdatumNotAenderungsdatum = True @@ -526,19 +529,20 @@ Public Class frmGesamtsicherheitenMenuNEU If sender.ToString = "Detailliste" Then frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) - ElseIf sender.ToString = "Referenzliste-Zollamt" Then + ElseIf sender.ToString = "RL-Zollamt" OrElse sender.ToString = "RL-Zollamt bereinigt" Then + zollliste_bereinigt = IIf(sender.ToString = "RL-Zollamt bereinigt", True, False) If Not vbYes = MsgBox("Sollen interne Detailinfos mitangegeben werden?", vbYesNoCancel) Then detailINfo = False End If - frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) + frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, zollliste_bereinigt) Else MsgBox("Funktion nicht definiert!") Exit Sub End If - SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten) + If Not zollliste_bereinigt Then SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten) End Sub @@ -664,4 +668,34 @@ JOIN End If End Sub + + Private Sub MehrfacheATBNrToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MehrfacheATBNrToolStripMenuItem.Click + + + Dim SQLPlausPruefung = " select Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum from (select gs_ATBNr, gs_standort, cast(MIN(gs_datum) as Date) as Datum from tblGesamtsicherheit + where gs_standort = '" & Standort & "' AND cast(gs_datum as Date) <= '" & Date.Parse(txtDatBis.Text) & "' + group by gs_ATBNr, gs_posNr, gs_standort + Having count(*) > 1 + ) as Temp + group by Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum + order by temp.Datum" + + + + Dim dt As New DataTable + dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True) + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (mehrfache ATB-Einträge pro ATB-Nr)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.") + SDL.cProgramFunctions.genExcelFromDT_NEW(dt) + + Else + + MsgBox("keine fehlerhaften Eingaben vorhanden!") + + End If + + End Sub End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 02aa0a6..c5a7c10 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -1,4 +1,5 @@ -Imports VERAG_PROG_ALLGEMEIN +Imports GrapeCity.Enterprise.Data.Expressions.Tools +Imports VERAG_PROG_ALLGEMEIN Public Class frmGesamtsicherheitenNEU @@ -226,34 +227,34 @@ Public Class frmGesamtsicherheitenNEU End Sub - Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False) + Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional ausfVonBisEingeschraenkt As Boolean = False) Me.Cursor = Cursors.WaitCursor Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort) - Dim gsnr As String - Dim counter = 0 - For Each n In list - gsnr &= n.ToString() - counter = counter + 1 - If (list.Count <> 0 And counter <> list.Count) Then - gsnr &= "," - End If + 'Dim gsnr As String + 'Dim counter = 0 + 'For Each n In list + ' gsnr &= n.ToString() + ' counter = counter + 1 + ' If (list.Count <> 0 And counter <> list.Count) Then + ' gsnr &= "," + ' End If - Next + 'Next - Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " - From [tblGesamtsicherheit] - Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 - UNION - Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & - " From [tblGesamtsicherheitsPositionen] - where [gsp_gsnr] In (" & gsnr & ") - and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") & - "order by Temp.Datum, Temp.Uhrzeit " + 'Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " + ' From [tblGesamtsicherheit] + ' Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 + ' UNION + ' Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & + ' " From [tblGesamtsicherheitsPositionen] + ' where [gsp_gsnr] In (" & gsnr & ") + ' and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") & + ' "order by Temp.Datum, Temp.Uhrzeit " @@ -263,17 +264,17 @@ Public Class frmGesamtsicherheitenNEU [gs_gsnr] In ( SELECT [gs_gsnr] FROM tblGesamtsicherheit - WHERE gs_standort = '" & standort & "'AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' ) + WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' ) and isnull(gs_sicherheitsbetrag,0) <> 0 and gs_datum is not null UNION Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] Where gsp_gsnr In ( - SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' + SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' ) and isnull(gsp_sicherheitsbetrag,0) <> 0 - and gsp_datum is not null + and gsp_datum is not null AND cast(gsp_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gsp_datum as Date) <= '" & datumBis.ToShortDateString & "' ) as Temp order by Temp.Datum, Temp.Uhrzeit " dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new, "AVISO", 100, True) @@ -317,8 +318,79 @@ Public Class frmGesamtsicherheitenNEU dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count) + If ausfVonBisEingeschraenkt Then + + Dim indexOffirstEntry As Integer = -1 + Dim indexOflastEntry As Integer = -1 + Dim startSaldo As Double = -1 + Dim endSaldo As Double = -1 + If ausfVonBisEingeschraenkt Then + For Each r As DataRow In dtSicherheiten.Rows + If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then + If indexOffirstEntry < 0 Then + indexOffirstEntry = dtSicherheiten.Rows.IndexOf(r) + startSaldo = r.Item("Saldo") - r.Item("Sicherheitbetrag_Calc") + End If + End If + + If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then + + If CDate(r.Item("Datum")) > datumBis Then + + If indexOflastEntry < 0 Then + indexOflastEntry = dtSicherheiten.Rows.IndexOf(r) - 1 + endSaldo = r.Item("Saldo") + (r.Item("Sicherheitbetrag_Calc") * -1) + End If + Else + + + indexOflastEntry = dtSicherheiten.Rows.IndexOf(r) + endSaldo = r.Item("Saldo") + + End If + + + End If + Next + End If + + Dim sicherheiten_cleared As DataTable = dtSicherheiten.Clone() + Dim counter As Integer = 1 + + For Each row_insert As DataRow In dtSicherheiten.Rows + Dim idx As Integer = dtSicherheiten.Rows.IndexOf(row_insert) + + If idx >= indexOffirstEntry AndAlso idx <= indexOflastEntry Then + Dim newRow As DataRow = sicherheiten_cleared.NewRow() + newRow.ItemArray = row_insert.ItemArray.Clone() + sicherheiten_cleared.Rows.Add(newRow) + + counter += 1 + End If + Next + + Dim drFirst_new = sicherheiten_cleared.NewRow + drFirst_new.Item("Nr") = 0 + drFirst_new.Item("Typ") = "Uebertrag vom" + drFirst_new.Item("Datum") = CDate(datumVon).ToShortDateString + drFirst_new.Item("Saldo") = CDbl(startSaldo) + + sicherheiten_cleared.Rows.InsertAt(drFirst_new, 0) + + Dim drLast_new = sicherheiten_cleared.NewRow + + drLast_new.Item("Nr") = 0 + drLast_new.Item("Typ") = "Saldo zum" + drLast_new.Item("Datum") = CDate(datumBis).ToShortDateString + drLast_new.Item("Saldo") = CDbl(endSaldo) + + sicherheiten_cleared.Rows.InsertAt(drLast_new, sicherheiten_cleared.Rows.Count) + + If sicherheiten_cleared.Rows.Count > 2 Then SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared) + + + End If - 'dtSicherheiten.Columns.Remove("Sicherheitbetrag_Calc") Me.Cursor = Cursors.Default