From ff118f70943aa8a861053c4990052e8b2f3efbea Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 23 Jan 2023 09:49:53 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Bugfix=5FWarenort=20(Max=20Anzahl=20an=20Ze?= =?UTF-8?q?ichen=20erh=C3=B6ht).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/UsrCntlEssensbestellungen.vb | 2 ++ Aviso/frmGesamtsicherheitenNEU.vb | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 784ddd6..412d213 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/UsrCntlEssensbestellungen.vb b/Aviso/UsrCntlEssensbestellungen.vb index db5bcb9..5a8e804 100644 --- a/Aviso/UsrCntlEssensbestellungen.vb +++ b/Aviso/UsrCntlEssensbestellungen.vb @@ -437,9 +437,11 @@ Public Class UsrCntlessensbestellungen If warning Then lblWarning.Text = "Bezeichnung für A la carte fehlt" + btnSave.DialogResult = Windows.Forms.DialogResult.None Else lblWarning.Text = "" + btnSave.DialogResult = DialogResult.OK End If diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index dfe3b4d..efd6b05 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -67,7 +67,7 @@ Public Class frmGesamtsicherheitenNEU Me.Text = "Gesamtsicherheit " & Standort - cbx_Suche_Warenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 ORDER BY [wo_reihenfolge]", True, "AVISO", True) + cbx_Suche_Warenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge]", True, "AVISO", True) If setNullToZero(gessicherheitID) = "" Or Neu = True Then @@ -955,9 +955,9 @@ 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 [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) + cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge] ", True, "AVISO", True) cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID) - txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200) + txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, avisoID, CAST(datum As Date) As Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200) txtlkwIdSearch.SET_VALUE(avisoID) txtAbfertNum.Text = Me.Abfertigungsnummer txtLKWKZ.Text = Me.LKWKZ @@ -994,8 +994,8 @@ Public Class frmGesamtsicherheitenNEU Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer Dim posNr As Integer = 0 - 'Dim sqlq As String = "select MAX([gsp_gspPosId]) as MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsnr = " & gs_gsnr - Dim sqlq As String = "select MAX([gs_posNr]) as MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " AND gs_ATBNR = '" & gs_ATBNr & "'" + 'Dim sqlq As String = "Select MAX([gsp_gspPosId]) As MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsnr = " & gs_gsnr + Dim sqlq As String = "Select MAX([gs_posNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_ATBNR = '" & gs_ATBNr & "'" Dim dt As New DataTable dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) From 74c82bd121aa478b225ade8264f4d40b59a02a0a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 23 Jan 2023 09:54:01 +0100 Subject: [PATCH 2/4] Warenort max Anzahl an Zeichen auf 50 gesetzt inkl Exception Handling --- Aviso/frmWarenorte.vb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Aviso/frmWarenorte.vb b/Aviso/frmWarenorte.vb index 0c1126e..724fece 100644 --- a/Aviso/frmWarenorte.vb +++ b/Aviso/frmWarenorte.vb @@ -192,6 +192,13 @@ Public Class frmWarenorte Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value) + If txtWarenort.TextLength > 50 Then + lblWarning.Text = "Warenort darf max 50 Zeichen besitzen!" + Exit Sub + Else + lblWarning.Text = "" + End If + WarenortNew.wo_warenort = txtWarenort.Text WarenortNew.wo_bezeichnung = txtBezeichnung.Text WarenortNew.wo_aktiv = cbxAktiv.Checked @@ -208,12 +215,6 @@ Public Class frmWarenorte WarenortNew.wo_ze = cxZE.Checked WarenortNew.wo_zv = cxZV.Checked - 'If cbxGrenzstelle._value = "" Then - ' lblWarning.Text = "Grenzstelle muss ausgewählt werden!" - ' Exit Sub - 'Else - ' lblWarning.Text = "" - 'End If WarenortNew.SAVE() dgvWarenorteNew.GetOrder() From 114bcc7e0b9e2a8721c1fbf6234b7322018f946b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 24 Jan 2023 08:42:37 +0100 Subject: [PATCH 3/4] GUI-Verbesserungen --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/UsrCntlEssensbestellungen.Designer.vb | 1 - Aviso/UsrCntlEssensbestellungen.vb | 9 +++++---- Aviso/frmEssensbestellungenAdministration.vb | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 412d213..d646ff1 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/UsrCntlEssensbestellungen.Designer.vb b/Aviso/UsrCntlEssensbestellungen.Designer.vb index e26f688..44128f1 100644 --- a/Aviso/UsrCntlEssensbestellungen.Designer.vb +++ b/Aviso/UsrCntlEssensbestellungen.Designer.vb @@ -588,7 +588,6 @@ Partial Class UsrCntlessensbestellungen ' 'btnSave ' - Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnSave.Location = New System.Drawing.Point(595, 349) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(75, 23) diff --git a/Aviso/UsrCntlEssensbestellungen.vb b/Aviso/UsrCntlEssensbestellungen.vb index 5a8e804..95ccb05 100644 --- a/Aviso/UsrCntlEssensbestellungen.vb +++ b/Aviso/UsrCntlEssensbestellungen.vb @@ -11,6 +11,7 @@ Public Class UsrCntlessensbestellungen Dim preisProMahlzeit As Double = 3 Dim menu As String = "Menü" Dim alacarte As String = "A La Carte" + Dim outdated As Boolean = True @@ -208,12 +209,12 @@ Public Class UsrCntlessensbestellungen If TypeOf gb Is GroupBox Then For Each c As Control In gb.Controls - If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then + If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c If rb.Checked Then countMenus = countMenus + 1 End If - If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then + If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c If rb.Checked Then countlaCarte = countlaCarte + 1 End If @@ -374,6 +375,7 @@ Public Class UsrCntlessensbestellungen If essen.SAVE() Then + btnSave.DialogResult = DialogResult.OK End If @@ -437,11 +439,10 @@ Public Class UsrCntlessensbestellungen If warning Then lblWarning.Text = "Bezeichnung für A la carte fehlt" - btnSave.DialogResult = Windows.Forms.DialogResult.None + 'btnSave.DialogResult = DialogResult.None Else lblWarning.Text = "" - btnSave.DialogResult = DialogResult.OK End If diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index f9ecb54..d2001f8 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -248,6 +248,8 @@ Public Class frmEssensbestellungenAdministration Private Sub BearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BearbeitenToolStripMenuItem.Click + If dgvBestellungen.SelectedRows.Count < 1 Then Exit Sub + Dim bestellung As New cEssensbestellung(dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value, dgvBestellungen.SelectedRows(0).Cells("eb_mitid").Value) Using UserControl1 As UsrCntlessensbestellungen = New UsrCntlessensbestellungen(bestellung) From ba000ef639eea2aceb29962ab222eaebb0abf64a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 24 Jan 2023 16:15:55 +0100 Subject: [PATCH 4/4] Essensbestellungen --- Aviso/My Project/AssemblyInfo.vb | 4 +- ...sensbestellungenAdministration.Designer.vb | 80 +++++++++---------- Aviso/frmEssensbestellungenAdministration.vb | 13 ++- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index d646ff1..68c82c4 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/frmEssensbestellungenAdministration.Designer.vb b/Aviso/frmEssensbestellungenAdministration.Designer.vb index 189b9be..ca1ab03 100644 --- a/Aviso/frmEssensbestellungenAdministration.Designer.vb +++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb @@ -28,6 +28,8 @@ Partial Class frmEssensbestellungenAdministration Me.Label4 = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtMarkierteDS = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label11 = New System.Windows.Forms.Label() Me.btnNew = New System.Windows.Forms.Button() Me.cbKW = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label6 = New System.Windows.Forms.Label() @@ -73,8 +75,6 @@ Partial Class frmEssensbestellungenAdministration Me.lblWarning = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label9 = New System.Windows.Forms.Label() - Me.Label11 = New System.Windows.Forms.Label() - Me.txtMarkierteDS = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlTop.SuspendLayout() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -149,6 +149,42 @@ Partial Class frmEssensbestellungenAdministration Me.Panel1.Size = New System.Drawing.Size(1242, 85) Me.Panel1.TabIndex = 2 ' + 'txtMarkierteDS + ' + Me.txtMarkierteDS._DateTimeOnly = False + Me.txtMarkierteDS._numbersOnly = False + Me.txtMarkierteDS._numbersOnlyKommastellen = "" + Me.txtMarkierteDS._numbersOnlyTrennzeichen = False + Me.txtMarkierteDS._Prozent = False + Me.txtMarkierteDS._ShortDateNew = False + Me.txtMarkierteDS._ShortDateOnly = False + Me.txtMarkierteDS._TimeOnly = False + Me.txtMarkierteDS._TimeOnly_Seconds = False + Me.txtMarkierteDS._value = "" + Me.txtMarkierteDS._Waehrung = True + Me.txtMarkierteDS._WaehrungZeichen = True + Me.txtMarkierteDS.ForeColor = System.Drawing.Color.Black + Me.txtMarkierteDS.Location = New System.Drawing.Point(1035, 62) + Me.txtMarkierteDS.MaxLineLength = -1 + Me.txtMarkierteDS.MaxLines_Warning = "" + Me.txtMarkierteDS.MaxLines_Warning_Label = Nothing + Me.txtMarkierteDS.Name = "txtMarkierteDS" + Me.txtMarkierteDS.ReadOnly = True + Me.txtMarkierteDS.Size = New System.Drawing.Size(68, 20) + Me.txtMarkierteDS.TabIndex = 65 + Me.txtMarkierteDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(1032, 46) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(125, 13) + Me.Label11.TabIndex = 66 + Me.Label11.Text = "Betrag markierte DS:" + Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'btnNew ' Me.btnNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -173,7 +209,7 @@ Partial Class frmEssensbestellungenAdministration Me.cbKW.FormattingEnabled = True Me.cbKW.Location = New System.Drawing.Point(311, 29) Me.cbKW.Name = "cbKW" - Me.cbKW.Size = New System.Drawing.Size(80, 22) + Me.cbKW.Size = New System.Drawing.Size(99, 22) Me.cbKW.TabIndex = 53 ' 'Label6 @@ -528,7 +564,7 @@ Partial Class frmEssensbestellungenAdministration ' Me.AbgerechnetToolStripMenuItem.Name = "AbgerechnetToolStripMenuItem" Me.AbgerechnetToolStripMenuItem.Size = New System.Drawing.Size(282, 22) - Me.AbgerechnetToolStripMenuItem.Text = "abgerechnet" + Me.AbgerechnetToolStripMenuItem.Text = "abrechnen" ' 'BearbeitenToolStripMenuItem ' @@ -700,42 +736,6 @@ Partial Class frmEssensbestellungenAdministration Me.Label9.Text = "Gesamtbetrag" Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'Label11 - ' - Me.Label11.AutoSize = True - Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(1032, 46) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(125, 13) - Me.Label11.TabIndex = 66 - Me.Label11.Text = "Betrag markierte DS:" - Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'txtMarkierteDS - ' - Me.txtMarkierteDS._DateTimeOnly = False - Me.txtMarkierteDS._numbersOnly = False - Me.txtMarkierteDS._numbersOnlyKommastellen = "" - Me.txtMarkierteDS._numbersOnlyTrennzeichen = False - Me.txtMarkierteDS._Prozent = False - Me.txtMarkierteDS._ShortDateNew = False - Me.txtMarkierteDS._ShortDateOnly = False - Me.txtMarkierteDS._TimeOnly = False - Me.txtMarkierteDS._TimeOnly_Seconds = False - Me.txtMarkierteDS._value = "" - Me.txtMarkierteDS._Waehrung = True - Me.txtMarkierteDS._WaehrungZeichen = True - Me.txtMarkierteDS.ForeColor = System.Drawing.Color.Black - Me.txtMarkierteDS.Location = New System.Drawing.Point(1035, 62) - Me.txtMarkierteDS.MaxLineLength = -1 - Me.txtMarkierteDS.MaxLines_Warning = "" - Me.txtMarkierteDS.MaxLines_Warning_Label = Nothing - Me.txtMarkierteDS.Name = "txtMarkierteDS" - Me.txtMarkierteDS.ReadOnly = True - Me.txtMarkierteDS.Size = New System.Drawing.Size(68, 20) - Me.txtMarkierteDS.TabIndex = 65 - Me.txtMarkierteDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'frmEssensbestellungenAdministration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index d2001f8..d08f2a5 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -11,7 +11,7 @@ Public Class frmEssensbestellungenAdministration Private Sub frmEssensbestellungenAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load lblWarning.Text = "" txtBestellDat.Text = Date.Parse("01.01.2001") - txtBestellDatBis.Text = Now.ToShortDateString + txtBestellDatBis.Text = Today.AddDays(7).ToShortDateString btnMonat.Text = MONAT.ToString("MMMM") btnJahr.Text = JAHR.Year @@ -27,7 +27,7 @@ Public Class frmEssensbestellungenAdministration cboAbteilung.fillWithSQL("SELECT DISTINCT(eb_abteilung) FROM [tblEssensbestellungen]", False, "AVISO", True) cboAbteilung.changeItem("") - cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True) + cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True) cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True) @@ -99,6 +99,11 @@ Public Class frmEssensbestellungenAdministration For Each row As DataGridViewRow In dgvBestellungen.Rows + + If Not IsDBNull(row.Cells("eb_gesendet").Value) Then + If row.Cells("eb_gesendet").Value Then row.DefaultCellStyle.BackColor = Color.LightYellow + End If + If Not IsDBNull(row.Cells("eb_storniert").Value) Then If row.Cells("eb_storniert").Value Then row.DefaultCellStyle.BackColor = Color.IndianRed @@ -273,7 +278,7 @@ Public Class frmEssensbestellungenAdministration If dgvBestellungen.SelectedRows.Count = 0 Then Exit Sub Select Case sender.Text - Case "abgerechnen" + Case "abrechnen" Select Case dgvBestellungen.SelectedRows.Count Case 1 If vbYes = MsgBox("Möchten Sie die Essensbestellung '" & dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value & " von Mitarbeiter " & dgvBestellungen.SelectedRows(0).Cells("eb_mitname").Value & " abrechnen", vbYesNoCancel) Then @@ -336,7 +341,7 @@ Public Class frmEssensbestellungenAdministration End Select - + loadBestellungen() End Sub Private Sub bestellungenStornieren(stornieren As Boolean)