Gesamtsicherheiten GUI Änderungen

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