From 8b5ee27229eb931d80f96c76d960005678e56056 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 19 Dec 2022 14:05:43 +0100 Subject: [PATCH] Kundenverwaltung -> Ambar-Auswertung Speditionsbuch -> Flender Bocholt-Auswertung --- SDL/SDL.vbproj | 3 + .../usrCntlSpeditionsBuchSuche.Designer.vb | 196 ++++++++++-------- .../usrCntlSpeditionsBuchSuche.resx | 5 +- .../usrCntlSpeditionsBuchSuche.vb | 68 ++++++ .../frmKundenSucheUebersicht.Designer.vb | 56 ++++- SDL/kunden/frmKundenSucheUebersicht.vb | 28 +++ SDL/kunden/usrCntlKundenuebersicht.vb | 6 +- 7 files changed, 269 insertions(+), 93 deletions(-) diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 26fba405..ba8ee61d 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -3862,6 +3862,9 @@ Always + + Always + Always diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index a218d361..5054777a 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche)) Me.TabPage1 = New System.Windows.Forms.TabPage() Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -162,6 +162,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label3 = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.cbxEIDR = New System.Windows.Forms.CheckBox() Me.cbxCMR = New System.Windows.Forms.CheckBox() Me.Label41 = New System.Windows.Forms.Label() @@ -193,7 +194,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() - Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -247,6 +248,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAvisoId._DateTimeOnly = False Me.txtAvisoId._numbersOnly = False Me.txtAvisoId._numbersOnlyKommastellen = "" + Me.txtAvisoId._numbersOnlyTrennzeichen = True Me.txtAvisoId._Prozent = False Me.txtAvisoId._ShortDateNew = False Me.txtAvisoId._ShortDateOnly = False @@ -317,6 +319,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAuftraggeberKdnr._DateTimeOnly = False Me.txtAuftraggeberKdnr._numbersOnly = False Me.txtAuftraggeberKdnr._numbersOnlyKommastellen = "" + Me.txtAuftraggeberKdnr._numbersOnlyTrennzeichen = True Me.txtAuftraggeberKdnr._Prozent = False Me.txtAuftraggeberKdnr._ShortDateNew = False Me.txtAuftraggeberKdnr._ShortDateOnly = False @@ -342,6 +345,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtCRN._DateTimeOnly = False Me.txtCRN._numbersOnly = False Me.txtCRN._numbersOnlyKommastellen = "" + Me.txtCRN._numbersOnlyTrennzeichen = True Me.txtCRN._Prozent = False Me.txtCRN._ShortDateNew = False Me.txtCRN._ShortDateOnly = False @@ -365,6 +369,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtBelegNr._DateTimeOnly = False Me.txtBelegNr._numbersOnly = False Me.txtBelegNr._numbersOnlyKommastellen = "" + Me.txtBelegNr._numbersOnlyTrennzeichen = True Me.txtBelegNr._Prozent = False Me.txtBelegNr._ShortDateNew = False Me.txtBelegNr._ShortDateOnly = False @@ -421,6 +426,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtPackstücke._DateTimeOnly = False Me.txtPackstücke._numbersOnly = False Me.txtPackstücke._numbersOnlyKommastellen = "" + Me.txtPackstücke._numbersOnlyTrennzeichen = True Me.txtPackstücke._Prozent = False Me.txtPackstücke._ShortDateNew = False Me.txtPackstücke._ShortDateOnly = False @@ -512,6 +518,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAvisiererKdNr._DateTimeOnly = False Me.txtAvisiererKdNr._numbersOnly = False Me.txtAvisiererKdNr._numbersOnlyKommastellen = "" + Me.txtAvisiererKdNr._numbersOnlyTrennzeichen = True Me.txtAvisiererKdNr._Prozent = False Me.txtAvisiererKdNr._ShortDateNew = False Me.txtAvisiererKdNr._ShortDateOnly = False @@ -616,6 +623,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtFiskalEndempfaenger._DateTimeOnly = False Me.txtFiskalEndempfaenger._numbersOnly = False Me.txtFiskalEndempfaenger._numbersOnlyKommastellen = "" + Me.txtFiskalEndempfaenger._numbersOnlyTrennzeichen = True Me.txtFiskalEndempfaenger._Prozent = False Me.txtFiskalEndempfaenger._ShortDateNew = False Me.txtFiskalEndempfaenger._ShortDateOnly = False @@ -644,35 +652,35 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DataGridView.AllowUserToDeleteRows = False Me.DataGridView.AllowUserToOrderColumns = True Me.DataGridView.AllowUserToResizeRows = 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)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch - 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)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8 Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill Me.DataGridView.Location = New System.Drawing.Point(450, 0) Me.DataGridView.Name = "DataGridView" - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.DataGridView.Size = New System.Drawing.Size(770, 227) Me.DataGridView.TabIndex = 0 ' @@ -699,35 +707,35 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW.AllowUserToOrderColumns = True Me.dgvLKW.AllowUserToResizeRows = False Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + 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)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5 + 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)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left Me.dgvLKW.Location = New System.Drawing.Point(0, 0) Me.dgvLKW.Name = "dgvLKW" - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.dgvLKW.Size = New System.Drawing.Size(450, 227) Me.dgvLKW.TabIndex = 35 Me.dgvLKW.Visible = False @@ -858,14 +866,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1}) Me.MenuStrip1.Location = New System.Drawing.Point(601, 128) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(163, 27) + Me.MenuStrip1.Size = New System.Drawing.Size(283, 27) Me.MenuStrip1.TabIndex = 89 Me.MenuStrip1.Text = "Kundenauswertungen" ' 'KundenauswertungenToolStripMenuItem1 ' Me.KundenauswertungenToolStripMenuItem1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem, Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem}) + Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem, Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem, Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem}) Me.KundenauswertungenToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 10.0!) Me.KundenauswertungenToolStripMenuItem1.ForeColor = System.Drawing.Color.White Me.KundenauswertungenToolStripMenuItem1.Name = "KundenauswertungenToolStripMenuItem1" @@ -876,14 +884,16 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" - Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(290, 30) + Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)" + Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False ' 'ZFThyrnauZeitraumAuswählenToolStripMenuItem ' Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem" - Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(290, 30) + Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)" + Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Visible = False ' 'cboHandlingssatz ' @@ -996,6 +1006,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtUeberschr._DateTimeOnly = False Me.txtUeberschr._numbersOnly = False Me.txtUeberschr._numbersOnlyKommastellen = "" + Me.txtUeberschr._numbersOnlyTrennzeichen = True Me.txtUeberschr._Prozent = False Me.txtUeberschr._ShortDateNew = False Me.txtUeberschr._ShortDateOnly = False @@ -1071,6 +1082,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtMax._DateTimeOnly = False Me.txtMax._numbersOnly = True Me.txtMax._numbersOnlyKommastellen = "" + Me.txtMax._numbersOnlyTrennzeichen = True Me.txtMax._Prozent = False Me.txtMax._ShortDateNew = False Me.txtMax._ShortDateOnly = False @@ -1384,6 +1396,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtMaxSrch._DateTimeOnly = False Me.txtMaxSrch._numbersOnly = True Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._numbersOnlyTrennzeichen = True Me.txtMaxSrch._Prozent = False Me.txtMaxSrch._ShortDateNew = False Me.txtMaxSrch._ShortDateOnly = False @@ -1599,6 +1612,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAbfertDat._DateTimeOnly = False Me.txtAbfertDat._numbersOnly = False Me.txtAbfertDat._numbersOnlyKommastellen = "" + Me.txtAbfertDat._numbersOnlyTrennzeichen = True Me.txtAbfertDat._Prozent = False Me.txtAbfertDat._ShortDateNew = True Me.txtAbfertDat._ShortDateOnly = False @@ -1623,6 +1637,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAbfertDatBis._DateTimeOnly = False Me.txtAbfertDatBis._numbersOnly = False Me.txtAbfertDatBis._numbersOnlyKommastellen = "" + Me.txtAbfertDatBis._numbersOnlyTrennzeichen = True Me.txtAbfertDatBis._Prozent = False Me.txtAbfertDatBis._ShortDateNew = True Me.txtAbfertDatBis._ShortDateOnly = False @@ -1675,6 +1690,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtUnterNr._DateTimeOnly = False Me.txtUnterNr._numbersOnly = False Me.txtUnterNr._numbersOnlyKommastellen = "" + Me.txtUnterNr._numbersOnlyTrennzeichen = True Me.txtUnterNr._Prozent = False Me.txtUnterNr._ShortDateNew = False Me.txtUnterNr._ShortDateOnly = False @@ -1698,6 +1714,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAbfertigungsnummerBis._DateTimeOnly = False Me.txtAbfertigungsnummerBis._numbersOnly = False Me.txtAbfertigungsnummerBis._numbersOnlyKommastellen = "" + Me.txtAbfertigungsnummerBis._numbersOnlyTrennzeichen = True Me.txtAbfertigungsnummerBis._Prozent = False Me.txtAbfertigungsnummerBis._ShortDateNew = False Me.txtAbfertigungsnummerBis._ShortDateOnly = False @@ -1722,6 +1739,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAbfertigungsnummer._DateTimeOnly = False Me.txtAbfertigungsnummer._numbersOnly = False Me.txtAbfertigungsnummer._numbersOnlyKommastellen = "" + Me.txtAbfertigungsnummer._numbersOnlyTrennzeichen = True Me.txtAbfertigungsnummer._Prozent = False Me.txtAbfertigungsnummer._ShortDateNew = False Me.txtAbfertigungsnummer._ShortDateOnly = False @@ -2167,6 +2185,33 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DateTimePicker1.Size = New System.Drawing.Size(115, 20) Me.DateTimePicker1.TabIndex = 2 ' + 'txtBestimmungszollstelle + ' + Me.txtBestimmungszollstelle._allowFreitext = False + Me.txtBestimmungszollstelle._AllowSetValue = False + Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtBestimmungszollstelle._autoSizeGross = False + Me.txtBestimmungszollstelle._hideIfListEmpty = True + Me.txtBestimmungszollstelle._value = Nothing + Me.txtBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtBestimmungszollstelle.dgvpos = "LEFT" + Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtBestimmungszollstelle.key_visible = False + Me.txtBestimmungszollstelle.KEYPARAM = Nothing + Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(627, 192) + Me.txtBestimmungszollstelle.MaxLength = 50 + Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" + Me.txtBestimmungszollstelle.searchActive = True + Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(106, 20) + Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtBestimmungszollstelle.TabIndex = 55 + Me.txtBestimmungszollstelle.usrcntl = Nothing + Me.txtBestimmungszollstelle.Visible = False + ' 'cbxEIDR ' Me.cbxEIDR.AutoSize = True @@ -2209,6 +2254,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtKdAuftragsNr._DateTimeOnly = False Me.txtKdAuftragsNr._numbersOnly = False Me.txtKdAuftragsNr._numbersOnlyKommastellen = "" + Me.txtKdAuftragsNr._numbersOnlyTrennzeichen = True Me.txtKdAuftragsNr._Prozent = False Me.txtKdAuftragsNr._ShortDateNew = False Me.txtKdAuftragsNr._ShortDateOnly = False @@ -2269,6 +2315,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MyTextBox14._DateTimeOnly = False Me.MyTextBox14._numbersOnly = False Me.MyTextBox14._numbersOnlyKommastellen = "" + Me.MyTextBox14._numbersOnlyTrennzeichen = True Me.MyTextBox14._Prozent = False Me.MyTextBox14._ShortDateNew = False Me.MyTextBox14._ShortDateOnly = False @@ -2351,6 +2398,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAbsenderKdnr._DateTimeOnly = False Me.txtAbsenderKdnr._numbersOnly = False Me.txtAbsenderKdnr._numbersOnlyKommastellen = "" + Me.txtAbsenderKdnr._numbersOnlyTrennzeichen = True Me.txtAbsenderKdnr._Prozent = False Me.txtAbsenderKdnr._ShortDateNew = False Me.txtAbsenderKdnr._ShortDateOnly = False @@ -2417,6 +2465,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtEmpfaengerKdnr._DateTimeOnly = False Me.txtEmpfaengerKdnr._numbersOnly = False Me.txtEmpfaengerKdnr._numbersOnlyKommastellen = "" + Me.txtEmpfaengerKdnr._numbersOnlyTrennzeichen = True Me.txtEmpfaengerKdnr._Prozent = False Me.txtEmpfaengerKdnr._ShortDateNew = False Me.txtEmpfaengerKdnr._ShortDateOnly = False @@ -2469,6 +2518,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtFrachtfuehrerKdnr._DateTimeOnly = False Me.txtFrachtfuehrerKdnr._numbersOnly = False Me.txtFrachtfuehrerKdnr._numbersOnlyKommastellen = "" + Me.txtFrachtfuehrerKdnr._numbersOnlyTrennzeichen = True Me.txtFrachtfuehrerKdnr._Prozent = False Me.txtFrachtfuehrerKdnr._ShortDateNew = False Me.txtFrachtfuehrerKdnr._ShortDateOnly = False @@ -2494,6 +2544,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtEndempfaengerKdnr._DateTimeOnly = False Me.txtEndempfaengerKdnr._numbersOnly = False Me.txtEndempfaengerKdnr._numbersOnlyKommastellen = "" + Me.txtEndempfaengerKdnr._numbersOnlyTrennzeichen = True Me.txtEndempfaengerKdnr._Prozent = False Me.txtEndempfaengerKdnr._ShortDateNew = False Me.txtEndempfaengerKdnr._ShortDateOnly = False @@ -2528,6 +2579,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtErfassungsnNr._DateTimeOnly = False Me.txtErfassungsnNr._numbersOnly = False Me.txtErfassungsnNr._numbersOnlyKommastellen = "" + Me.txtErfassungsnNr._numbersOnlyTrennzeichen = True Me.txtErfassungsnNr._Prozent = False Me.txtErfassungsnNr._ShortDateNew = False Me.txtErfassungsnNr._ShortDateOnly = False @@ -2656,32 +2708,13 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' - 'txtBestimmungszollstelle + 'FlenderBocholtZeitraumAuswählenToolStripMenuItem ' - Me.txtBestimmungszollstelle._allowFreitext = False - Me.txtBestimmungszollstelle._AllowSetValue = False - Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False - Me.txtBestimmungszollstelle._autoSizeGross = False - Me.txtBestimmungszollstelle._hideIfListEmpty = True - Me.txtBestimmungszollstelle._value = Nothing - Me.txtBestimmungszollstelle.conn_art = "FMZOLL" - Me.txtBestimmungszollstelle.dgvpos = "LEFT" - Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing - Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing - Me.txtBestimmungszollstelle.key_visible = False - Me.txtBestimmungszollstelle.KEYPARAM = Nothing - Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(627, 192) - Me.txtBestimmungszollstelle.MaxLength = 50 - Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" - Me.txtBestimmungszollstelle.searchActive = True - Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(106, 20) - Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing - Me.txtBestimmungszollstelle.SQL_SELECT = Nothing - Me.txtBestimmungszollstelle.SQL_WHERE = Nothing - Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing - Me.txtBestimmungszollstelle.TabIndex = 55 - Me.txtBestimmungszollstelle.usrcntl = Nothing - Me.txtBestimmungszollstelle.Visible = False + Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Name = "FlenderBocholtZeitraumAuswählenToolStripMenuItem" + Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) + Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)" + Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Visible = False ' 'usrCntlSpeditionsBuchSuche ' @@ -2891,4 +2924,5 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents Button22 As Button Friend WithEvents Button23 As Button Friend WithEvents txtBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx index 83802881..3076e447 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx @@ -126,9 +126,6 @@ 431, 17 - - 431, 17 - @@ -177,7 +174,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDQAACw0B7QfALAAAB3VJREFUSEu9VntQ1NUe + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAB3VJREFUSEu9VntQ1NUe /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index dae94daf..6feb7826 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -1,6 +1,7 @@ Imports System.Data.SqlClient Imports System.Globalization + Public Class usrCntlSpeditionsBuchSuche Dim SQL As New SQL @@ -536,6 +537,8 @@ Public Class usrCntlSpeditionsBuchSuche txtAbfertDatBis._value = dat_bis.ToShortDateString cbxOderEmpfanger.Checked = True End If + + initToolStripMenu() End Sub Function getValues() As String Dim s As String = "" @@ -2263,4 +2266,69 @@ Public Class usrCntlSpeditionsBuchSuche Next txtBestimmungszollstelle.Visible = True End Sub + + Private Sub initToolStripMenu() + For Each c As ToolStripMenuItem In KundenauswertungenToolStripMenuItem1.DropDownItems + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then + If c.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" Or c.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem" Then + c.Visible = True + End If + + End If + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then + If c.Name = "FlenderBocholtZeitraumAuswählenToolStripMenuItem" Then + c.Visible = True + End If + End If + + + + Next + End Sub + + Private Sub FlenderBocholtZeitraumAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FlenderBocholtZeitraumAuswählenToolStripMenuItem.Click + lblKdAusFortschritt.Text = "lädt..." + Me.Cursor = Cursors.WaitCursor + Try + + Dim dt As DataTable = SQL.loadDgvBySql("SELECT [Speditionsbuch].[FilialenNr] + ,[Speditionsbuch].[AbfertigungsNr] + ,CAST([Abfertigungsdatum] as DATE) [Abfertigungsdatum] + ,isnull([BelegNr],'') ATC + ,isnull([sndhdg_nr],'') ATA + ,[LKW Kennzeichen] + ,[Absender] + ,[Empfänger] + ,[Vermittler] + ,[Frachtführer] + ,[Avisierer] + ,[Packstücke] + ,isnull([Abfertigungsarten].AbfertigungsbezeichnungLang,[Abfertigungsarten].Abfertigungsbezeichnung) Abfertigungsart + ,[Abfertigungsanzahl] + ,CASE WHEN Aviso.[Grenzstelle]='???' THEN Aviso.[Zollstelle] ELSE Aviso.[Grenzstelle] END [Grenzstelle] + + FROM [VERAG].[dbo].[Speditionsbuch] INNER JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".[AVISO].dbo.tblSendungen ON SendungID=[tblSnd_SendungID] + INNER JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".[AVISO].dbo.Aviso ON [Speditionsbuch].AvisoID=Aviso.AvisoID + INNER JOIN Abfertigungsarten ON Abfertigungsarten.Abfertigungsart=[Speditionsbuch].Abfertigungsart + LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".[AVISO].dbo.[tblSendHandling] ON [tblSnd_SendungID]=[sndhdg_sendId] + + where Empfänger LIKE '%Flender%' and [Speditionsbuch].FilialenNr=5601 + and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' and '" & txtAbfertDatBis.Text & "' + order by [Speditionsbuch].Abfertigungsart , Abfertigungsdatum", "FMZOLL") + + Dim Path = "" + If dt IsNot Nothing And dt.Rows.Count > 0 Then + + cProgramFunctions.genExcelFromDT_NEW(dt) + + End If + lblKdAusFortschritt.Text = "fertig" + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + lblKdAusFortschritt.Text = "Fehler" + End Try + Me.Cursor = Cursors.Default + End Sub End Class diff --git a/SDL/kunden/frmKundenSucheUebersicht.Designer.vb b/SDL/kunden/frmKundenSucheUebersicht.Designer.vb index 13fa4738..986bc205 100644 --- a/SDL/kunden/frmKundenSucheUebersicht.Designer.vb +++ b/SDL/kunden/frmKundenSucheUebersicht.Designer.vb @@ -64,6 +64,7 @@ Partial Class frmKundenSucheUebersicht Me.Label22 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.pnlTop = New System.Windows.Forms.Panel() + Me.btnExcelAmbar = New System.Windows.Forms.Button() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -162,12 +163,15 @@ Partial Class frmKundenSucheUebersicht Me.txtOrt._DateTimeOnly = False Me.txtOrt._numbersOnly = False Me.txtOrt._numbersOnlyKommastellen = "" + Me.txtOrt._numbersOnlyTrennzeichen = True Me.txtOrt._Prozent = False Me.txtOrt._ShortDateNew = False Me.txtOrt._ShortDateOnly = False Me.txtOrt._TimeOnly = False + Me.txtOrt._TimeOnly_Seconds = False Me.txtOrt._value = Nothing Me.txtOrt._Waehrung = False + Me.txtOrt._WaehrungZeichen = True Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOrt.ForeColor = System.Drawing.Color.Black Me.txtOrt.Location = New System.Drawing.Point(189, 109) @@ -183,12 +187,15 @@ Partial Class frmKundenSucheUebersicht Me.txtPlz._DateTimeOnly = False Me.txtPlz._numbersOnly = False Me.txtPlz._numbersOnlyKommastellen = "" + Me.txtPlz._numbersOnlyTrennzeichen = True Me.txtPlz._Prozent = False Me.txtPlz._ShortDateNew = False Me.txtPlz._ShortDateOnly = False Me.txtPlz._TimeOnly = False + Me.txtPlz._TimeOnly_Seconds = False Me.txtPlz._value = Nothing Me.txtPlz._Waehrung = False + Me.txtPlz._WaehrungZeichen = True Me.txtPlz.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtPlz.ForeColor = System.Drawing.Color.Black Me.txtPlz.Location = New System.Drawing.Point(125, 109) @@ -214,12 +221,15 @@ Partial Class frmKundenSucheUebersicht Me.txtLand._DateTimeOnly = False Me.txtLand._numbersOnly = False Me.txtLand._numbersOnlyKommastellen = "" + Me.txtLand._numbersOnlyTrennzeichen = True Me.txtLand._Prozent = False Me.txtLand._ShortDateNew = False Me.txtLand._ShortDateOnly = False Me.txtLand._TimeOnly = False + Me.txtLand._TimeOnly_Seconds = False Me.txtLand._value = Nothing Me.txtLand._Waehrung = False + Me.txtLand._WaehrungZeichen = True Me.txtLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLand.ForeColor = System.Drawing.Color.Black Me.txtLand.Location = New System.Drawing.Point(88, 109) @@ -245,12 +255,15 @@ Partial Class frmKundenSucheUebersicht Me.txtStrasse._DateTimeOnly = False Me.txtStrasse._numbersOnly = False Me.txtStrasse._numbersOnlyKommastellen = "" + Me.txtStrasse._numbersOnlyTrennzeichen = True Me.txtStrasse._Prozent = False Me.txtStrasse._ShortDateNew = False Me.txtStrasse._ShortDateOnly = False Me.txtStrasse._TimeOnly = False + Me.txtStrasse._TimeOnly_Seconds = False Me.txtStrasse._value = Nothing Me.txtStrasse._Waehrung = False + Me.txtStrasse._WaehrungZeichen = True Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtStrasse.ForeColor = System.Drawing.Color.Black Me.txtStrasse.Location = New System.Drawing.Point(88, 90) @@ -276,12 +289,15 @@ Partial Class frmKundenSucheUebersicht Me.txtName._DateTimeOnly = False Me.txtName._numbersOnly = False Me.txtName._numbersOnlyKommastellen = "" + Me.txtName._numbersOnlyTrennzeichen = True Me.txtName._Prozent = False Me.txtName._ShortDateNew = False Me.txtName._ShortDateOnly = False Me.txtName._TimeOnly = False + Me.txtName._TimeOnly_Seconds = False Me.txtName._value = Nothing Me.txtName._Waehrung = False + Me.txtName._WaehrungZeichen = True Me.txtName.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtName.ForeColor = System.Drawing.Color.Black Me.txtName.Location = New System.Drawing.Point(88, 71) @@ -297,12 +313,15 @@ Partial Class frmKundenSucheUebersicht Me.txtOrdnungsbegriff._DateTimeOnly = False Me.txtOrdnungsbegriff._numbersOnly = False Me.txtOrdnungsbegriff._numbersOnlyKommastellen = "" + Me.txtOrdnungsbegriff._numbersOnlyTrennzeichen = True Me.txtOrdnungsbegriff._Prozent = False Me.txtOrdnungsbegriff._ShortDateNew = False Me.txtOrdnungsbegriff._ShortDateOnly = False Me.txtOrdnungsbegriff._TimeOnly = False + Me.txtOrdnungsbegriff._TimeOnly_Seconds = False Me.txtOrdnungsbegriff._value = Nothing Me.txtOrdnungsbegriff._Waehrung = False + Me.txtOrdnungsbegriff._WaehrungZeichen = True Me.txtOrdnungsbegriff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOrdnungsbegriff.ForeColor = System.Drawing.Color.Black Me.txtOrdnungsbegriff.Location = New System.Drawing.Point(15, 30) @@ -346,12 +365,15 @@ Partial Class frmKundenSucheUebersicht Me.txtKdNr_bis._DateTimeOnly = False Me.txtKdNr_bis._numbersOnly = False Me.txtKdNr_bis._numbersOnlyKommastellen = "" + Me.txtKdNr_bis._numbersOnlyTrennzeichen = True Me.txtKdNr_bis._Prozent = False Me.txtKdNr_bis._ShortDateNew = False Me.txtKdNr_bis._ShortDateOnly = False Me.txtKdNr_bis._TimeOnly = False + Me.txtKdNr_bis._TimeOnly_Seconds = False Me.txtKdNr_bis._value = Nothing Me.txtKdNr_bis._Waehrung = False + Me.txtKdNr_bis._WaehrungZeichen = True Me.txtKdNr_bis.Enabled = False Me.txtKdNr_bis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtKdNr_bis.ForeColor = System.Drawing.Color.Black @@ -368,12 +390,15 @@ Partial Class frmKundenSucheUebersicht Me.txtKdNr_von._DateTimeOnly = False Me.txtKdNr_von._numbersOnly = False Me.txtKdNr_von._numbersOnlyKommastellen = "" + Me.txtKdNr_von._numbersOnlyTrennzeichen = True Me.txtKdNr_von._Prozent = False Me.txtKdNr_von._ShortDateNew = False Me.txtKdNr_von._ShortDateOnly = False Me.txtKdNr_von._TimeOnly = False + Me.txtKdNr_von._TimeOnly_Seconds = False Me.txtKdNr_von._value = Nothing Me.txtKdNr_von._Waehrung = False + Me.txtKdNr_von._WaehrungZeichen = True Me.txtKdNr_von.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtKdNr_von.ForeColor = System.Drawing.Color.Black Me.txtKdNr_von.Location = New System.Drawing.Point(439, 30) @@ -388,7 +413,7 @@ Partial Class frmKundenSucheUebersicht ' 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.Image = Global.SDL.My.Resources.search + Me.btnSuche.Image = Global.SDL.My.Resources.Resources.search Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSuche.Location = New System.Drawing.Point(1015, 6) Me.btnSuche.Name = "btnSuche" @@ -404,7 +429,7 @@ Partial Class frmKundenSucheUebersicht Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) Me.Button4.ForeColor = System.Drawing.Color.White - Me.Button4.Image = Global.SDL.My.Resources.pfeil_unten + Me.Button4.Image = Global.SDL.My.Resources.Resources.pfeil_unten Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button4.Location = New System.Drawing.Point(1015, 57) Me.Button4.Margin = New System.Windows.Forms.Padding(0) @@ -493,6 +518,7 @@ Partial Class frmKundenSucheUebersicht 'pnlOpt ' Me.pnlOpt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlOpt.Controls.Add(Me.btnExcelAmbar) Me.pnlOpt.Controls.Add(Me.Label37) Me.pnlOpt.Controls.Add(Me.txtMaxSrch) Me.pnlOpt.Controls.Add(Me.pnlBerichte) @@ -520,12 +546,15 @@ Partial Class frmKundenSucheUebersicht Me.txtMaxSrch._DateTimeOnly = False Me.txtMaxSrch._numbersOnly = True Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._numbersOnlyTrennzeichen = True Me.txtMaxSrch._Prozent = False Me.txtMaxSrch._ShortDateNew = False Me.txtMaxSrch._ShortDateOnly = False Me.txtMaxSrch._TimeOnly = False + Me.txtMaxSrch._TimeOnly_Seconds = False Me.txtMaxSrch._value = "" Me.txtMaxSrch._Waehrung = False + Me.txtMaxSrch._WaehrungZeichen = True Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black Me.txtMaxSrch.Location = New System.Drawing.Point(1164, 22) @@ -570,7 +599,7 @@ Partial Class frmKundenSucheUebersicht 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Image = Global.SDL.My.Resources.plus + Me.Button1.Image = Global.SDL.My.Resources.Resources.plus Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button1.Location = New System.Drawing.Point(14, 24) Me.Button1.Margin = New System.Windows.Forms.Padding(0) @@ -585,7 +614,7 @@ Partial Class frmKundenSucheUebersicht 'btnExcel ' Me.btnExcel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Excel_logo + Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnExcel.Location = New System.Drawing.Point(1117, 47) @@ -597,7 +626,7 @@ Partial Class frmKundenSucheUebersicht 'FlatButton7 ' Me.FlatButton7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.FlatButton7.BackgroundImage = Global.SDL.My.Resources.refresh + Me.FlatButton7.BackgroundImage = Global.SDL.My.Resources.Resources.refresh Me.FlatButton7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.FlatButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -650,6 +679,22 @@ Partial Class frmKundenSucheUebersicht Me.pnlTop.Size = New System.Drawing.Size(1211, 48) Me.pnlTop.TabIndex = 0 ' + 'btnExcelAmbar + ' + Me.btnExcelAmbar.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btnExcelAmbar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnExcelAmbar.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnExcelAmbar.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnExcelAmbar.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnExcelAmbar.Location = New System.Drawing.Point(942, 47) + Me.btnExcelAmbar.Name = "btnExcelAmbar" + Me.btnExcelAmbar.Size = New System.Drawing.Size(142, 34) + Me.btnExcelAmbar.TabIndex = 7 + Me.btnExcelAmbar.Text = "verzollt bei Ambar" + Me.btnExcelAmbar.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnExcelAmbar.UseVisualStyleBackColor = True + Me.btnExcelAmbar.Visible = False + ' 'frmKundenSucheUebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -723,4 +768,5 @@ Partial Class frmKundenSucheUebersicht Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents Label37 As System.Windows.Forms.Label Friend WithEvents txtMaxSrch As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents btnExcelAmbar As Button End Class diff --git a/SDL/kunden/frmKundenSucheUebersicht.vb b/SDL/kunden/frmKundenSucheUebersicht.vb index 211f742a..3c01f191 100644 --- a/SDL/kunden/frmKundenSucheUebersicht.vb +++ b/SDL/kunden/frmKundenSucheUebersicht.vb @@ -139,6 +139,11 @@ Public Class frmKundenSucheUebersicht pnlBerichte.Visible = True End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then + btnExcelAmbar.Visible = True + End If + + End Sub @@ -263,4 +268,27 @@ Public Class frmKundenSucheUebersicht txtKdNr_bis.Enabled = (txtKdNr_von.Text <> "") If txtKdNr_von.Text = "" Then txtKdNr_bis.Text = "" End Sub + + Private Sub btnExcelAmbar_Click(sender As Object, e As EventArgs) Handles btnExcelAmbar.Click + + Me.Cursor = Cursors.WaitCursor + Try + + Dim dt As DataTable = SQL.loadDgvBySql("select AdressenNr,[Name 1],PLZ, Ort,Straße,LandKz,kde_verzolltBei FROM adressen INNER JOIN tblKundenErweitert ON AdressenNr=kde_KundenNr + where AdressenNr between 3000000 and 3999999 + And kde_verzolltBei LIKE '%AMBAR%'", "FMZOLL") + + If dt IsNot Nothing And dt.Rows.Count > 0 Then + + cProgramFunctions.genExcelFromDT_NEW(dt) + + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + + End Try + + + End Sub End Class \ No newline at end of file diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 6d305dc4..4d46f1e1 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -572,13 +572,13 @@ Public Class usrCntlKundenuebersicht lblBonitaetRisikostufe.ForeColor = Color.White Case "B", "2" lblBonitaetRisikostufe.BackColor = Color.LightGreen - lblBonitaetRisikostufe.ForeColor = Color.White + lblBonitaetRisikostufe.ForeColor = Color.Black Case "C", "3" lblBonitaetRisikostufe.BackColor = Color.Yellow - lblBonitaetRisikostufe.ForeColor = Color.White + lblBonitaetRisikostufe.ForeColor = Color.Black Case "D", "4" lblBonitaetRisikostufe.BackColor = Color.Orange - lblBonitaetRisikostufe.ForeColor = Color.White + lblBonitaetRisikostufe.ForeColor = Color.Black Case "E", "5" lblBonitaetRisikostufe.BackColor = Color.Red lblBonitaetRisikostufe.ForeColor = Color.White