Gesamtsicherheiten GUI Änderungen

2022-12-02 14:38:59 +01:00
parent 455d8dd724
commit 40812e2bd8
4 changed files with 51 additions and 29 deletions
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -314,6 +314,7 @@ Public Class frmEssensbestellungen
        If dt.Rows(0).Item("MenuEssenMo") IsNot Nothing Then
            pbMontag.Visible = True
            Dim ttMontag As New ToolTip()
+            ttMontag.RemoveAll()
            ttMontag.SetToolTip(pbMontag, dt.Rows(0).Item("MenuEssenMo").ToString)
        Else
            pbMontag.Visible = False
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -414,4 +414,8 @@ Public Class frmGesamtsicherheitenMenuNEU

        End If
    End Sub
+
+    Private Sub chkOffen_CheckedChanged_1(sender As Object, e As EventArgs) Handles chkOffen.CheckedChanged
+        If txtDatVon._value <> "" AndAlso txtDatBis._value <> "" Then btnSucheStarten.PerformClick()
+    End Sub
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -89,6 +89,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.lblReferenzwert = New System.Windows.Forms.Label()
        Me.lblSaldo = New System.Windows.Forms.Label()
        Me.panOben = New System.Windows.Forms.Panel()
+        Me.txtGestellInfo = New System.Windows.Forms.TextBox()
        Me.btnSaveDatetime = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.lblId = New System.Windows.Forms.Label()
        Me.txtZollsatzueberschreiben = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -99,6 +100,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Label20 = New System.Windows.Forms.Label()
        Me.txtPosNr = New System.Windows.Forms.TextBox()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.btnNew = New System.Windows.Forms.Button()
        Me.cbx_offene = New System.Windows.Forms.CheckBox()
        Me.btnSuche = New System.Windows.Forms.Button()
        Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -132,7 +134,6 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox()
        Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.btnNew = New System.Windows.Forms.Button()
        Me.ContextMenuStripGesSicherh.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.pnlChangeATCNr.SuspendLayout()
@@ -342,7 +343,7 @@ Partial Class frmGesamtsicherheitenNEU
        '
        'txtlkwIdSearch
        '
-        Me.txtlkwIdSearch._allowFreitext = False
+        Me.txtlkwIdSearch._allowFreitext = True
        Me.txtlkwIdSearch._AllowSetValue = False
        Me.txtlkwIdSearch._allowSpaceAsSplitter = False
        Me.txtlkwIdSearch._autoSizeGross = False
@@ -362,7 +363,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.txtlkwIdSearch.SQL_SELECT = Nothing
        Me.txtlkwIdSearch.SQL_WHERE = Nothing
        Me.txtlkwIdSearch.SQL_WhereParamList = Nothing
-        Me.txtlkwIdSearch.TabIndex = 11
+        Me.txtlkwIdSearch.TabIndex = 7
        Me.txtlkwIdSearch.usrcntl = Nothing
        '
        'Label23
@@ -773,11 +774,11 @@ Partial Class frmGesamtsicherheitenNEU
        Me.lblGestellungNr.AutoSize = True
        Me.lblGestellungNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblGestellungNr.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblGestellungNr.Location = New System.Drawing.Point(23, 17)
+        Me.lblGestellungNr.Location = New System.Drawing.Point(12, 9)
        Me.lblGestellungNr.Name = "lblGestellungNr"
-        Me.lblGestellungNr.Size = New System.Drawing.Size(171, 24)
+        Me.lblGestellungNr.Size = New System.Drawing.Size(177, 24)
        Me.lblGestellungNr.TabIndex = 1
-        Me.lblGestellungNr.Text = "Gesamtsicherheit"
+        Me.lblGestellungNr.Text = "Gesamtsicherheit:"
        '
        'txtPosTime
        '
@@ -914,6 +915,7 @@ Partial Class frmGesamtsicherheitenNEU
        'panOben
        '
        Me.panOben.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.panOben.Controls.Add(Me.txtGestellInfo)
        Me.panOben.Controls.Add(Me.btnSaveDatetime)
        Me.panOben.Controls.Add(Me.lblId)
        Me.panOben.Controls.Add(Me.txtZollsatzueberschreiben)
@@ -971,6 +973,18 @@ Partial Class frmGesamtsicherheitenNEU
        Me.panOben.Size = New System.Drawing.Size(1384, 290)
        Me.panOben.TabIndex = 0
        '
+        'txtGestellInfo
+        '
+        Me.txtGestellInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.txtGestellInfo.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtGestellInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtGestellInfo.ForeColor = System.Drawing.Color.Honeydew
+        Me.txtGestellInfo.Location = New System.Drawing.Point(197, 9)
+        Me.txtGestellInfo.Name = "txtGestellInfo"
+        Me.txtGestellInfo.ReadOnly = True
+        Me.txtGestellInfo.Size = New System.Drawing.Size(863, 22)
+        Me.txtGestellInfo.TabIndex = 50
+        '
        'btnSaveDatetime
        '
        Me.btnSaveDatetime.allowBorder = False
@@ -1106,6 +1120,15 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Panel1.Size = New System.Drawing.Size(1384, 61)
        Me.Panel1.TabIndex = 2
        '
+        'btnNew
+        '
+        Me.btnNew.Location = New System.Drawing.Point(1265, 13)
+        Me.btnNew.Name = "btnNew"
+        Me.btnNew.Size = New System.Drawing.Size(93, 30)
+        Me.btnNew.TabIndex = 50
+        Me.btnNew.Text = "Neu"
+        Me.btnNew.UseVisualStyleBackColor = True
+        '
        'cbx_offene
        '
        Me.cbx_offene.AutoSize = True
@@ -1479,15 +1502,6 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnAddSicherheit.TabIndex = 36
        Me.btnAddSicherheit.UseVisualStyleBackColor = False
        '
-        'btnNew
-        '
-        Me.btnNew.Location = New System.Drawing.Point(1265, 13)
-        Me.btnNew.Name = "btnNew"
-        Me.btnNew.Size = New System.Drawing.Size(93, 30)
-        Me.btnNew.TabIndex = 50
-        Me.btnNew.Text = "Neu"
-        Me.btnNew.UseVisualStyleBackColor = True
-        '
        'frmGesamtsicherheitenNEU
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1626,4 +1640,5 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents Label34 As Label
    Friend WithEvents FlatButton4 As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents btnNew As Button
+    Friend WithEvents txtGestellInfo As TextBox
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -37,7 +37,7 @@ Public Class frmGesamtsicherheitenNEU

    Dim indexGsId As Integer

-    Dim indexGsNr As Integer
+    Dim indexGsNr As Integer = -1

    Dim indexGspPosId As Integer

@@ -95,7 +95,7 @@ Public Class frmGesamtsicherheitenNEU
    Public Sub LoadDGVSicherheiten(Optional withFilterParam As Boolean = False)

        'lblSaldo.Text = "Saldo:     € " & currentGesSichRef.gsr_Saldo.ToString()
-        lblGestellungNr.Text = ""
+        txtGestellInfo.Text = ""
        Dim sqladd1 As String = ""
        If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust"
        If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]"
@@ -308,7 +308,7 @@ Public Class frmGesamtsicherheitenNEU
    Sub loadTitle()
        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"

-        lblGestellungNr.Text = ""
+        txtGestellInfo.Text = ""
        lblId.Text = ""
        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & indexGsNr & "'"

@@ -324,11 +324,11 @@ Public Class frmGesamtsicherheitenNEU
            Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
        End If

-        If Me.avisoID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.avisoID & " "
-        If Me.LKWKZ.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-KZ: " & Me.LKWKZ & " "
-        If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " "
-        If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
-        If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " "
+        If Me.avisoID.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-ID: " & Me.avisoID & " "
+        If Me.LKWKZ.ToString.Length > 0 Then txtGestellInfo.Text &= "LKW-KZ: " & Me.LKWKZ & " "
+        If Me.FilialNummer.ToString.Length > 0 Then txtGestellInfo.Text &= "FilialNr: " & Me.FilialNummer & " "
+        If Me.Abfertigungsnummer.Length > 0 Then txtGestellInfo.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
+        If Me.warenortID.Length > 0 Then txtGestellInfo.Text &= "Warenort: " & Me.warenortID & " "
        If gessicherheitID <> 0 Then lblId.Text &= "GS-Nr: " & gessicherheitID 'currentSicherheit.gs_gsNr


@@ -713,7 +713,7 @@ Public Class frmGesamtsicherheitenNEU
                If obj Is Nothing Or obj Is DBNull.Value Then
                    Return Nothing
                Else
-                    Return Double.Parse(CDbl(obj.value))
+                    Return Double.Parse(CDbl(obj))
                End If

        End Select
@@ -790,6 +790,7 @@ Public Class frmGesamtsicherheitenNEU
        btnUpdatePos.Visible = False
        btnDeletePos.Visible = False
        AfterButton()
+
    End Sub

    Private Sub dgvGesamtsicherheitPositionen_CellCellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellDoubleClick
@@ -841,15 +842,14 @@ Public Class frmGesamtsicherheitenNEU
        End Try
    End Sub

-    Private Sub lblGestellungNr_Click(sender As Object, e As EventArgs) Handles lblGestellungNr.DoubleClick
+    Private Sub lblGestellungNr_Click(sender As Object, e As EventArgs) Handles txtGestellInfo.DoubleClick
        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'  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.Text = Me.avisoID.ToString
+        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
        panOben.Enabled = False
@@ -1424,7 +1424,7 @@ Public Class frmGesamtsicherheitenNEU
    End Sub

    Private Sub txtAbfertNum_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertNum.TextChanged
-        If Not IsNumeric(txtAbfertNum.Text) Then
+        If Not IsNumeric(txtAbfertNum.Text) AndAlso txtAbfertNum.Text <> "" Then
            txtAbfertNum.ForeColor = Color.Red
            btnSave.Enabled = False
            Exit Sub
@@ -1443,4 +1443,6 @@ Public Class frmGesamtsicherheitenNEU
        'frm.btnNeu.PerformClick()

    End Sub
+
+
 End Class