Gesamtsicherheiten

2022-12-16 16:48:23 +01:00
parent 2c1de3334b
commit f476d9168d
3 changed files with 83 additions and 22 deletions
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.8.3.4")>
-<Assembly: AssemblyFileVersion("3.8.3.4")>
+<Assembly: AssemblyVersion("3.8.3.5")>
+<Assembly: AssemblyFileVersion("3.8.3.5")>
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -92,6 +92,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.lbloffenerWarenwert = New System.Windows.Forms.Label()
        Me.txtGestellInfo = New System.Windows.Forms.TextBox()
        Me.btnSaveDatetime = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.lblId = New System.Windows.Forms.Label()
@@ -137,7 +138,8 @@ 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.lbloffenerWarenwert = New System.Windows.Forms.Label()
+        Me.txtWarenwertContext = New System.Windows.Forms.TextBox()
+        Me.lblWarenwertContext = New System.Windows.Forms.Label()
        Me.ContextMenuStripGesSicherh.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.pnlChangeATCNr.SuspendLayout()
@@ -181,6 +183,8 @@ Partial Class frmGesamtsicherheitenNEU
        'pnlChangeATCNr
        '
        Me.pnlChangeATCNr.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlChangeATCNr.Controls.Add(Me.txtWarenwertContext)
+        Me.pnlChangeATCNr.Controls.Add(Me.lblWarenwertContext)
        Me.pnlChangeATCNr.Controls.Add(Me.txtUhrzeitaendern)
        Me.pnlChangeATCNr.Controls.Add(Me.txtDatumaendern)
        Me.pnlChangeATCNr.Controls.Add(Me.Label26)
@@ -191,7 +195,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.pnlChangeATCNr.Controls.Add(Me.FlatButton4)
        Me.pnlChangeATCNr.Location = New System.Drawing.Point(1051, 42)
        Me.pnlChangeATCNr.Name = "pnlChangeATCNr"
-        Me.pnlChangeATCNr.Size = New System.Drawing.Size(292, 135)
+        Me.pnlChangeATCNr.Size = New System.Drawing.Size(292, 162)
        Me.pnlChangeATCNr.TabIndex = 13
        Me.pnlChangeATCNr.Visible = False
        '
@@ -240,7 +244,7 @@ Partial Class frmGesamtsicherheitenNEU
        Me.FlatButton3.FlatAppearance.BorderSize = 0
        Me.FlatButton3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton3.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton3.Location = New System.Drawing.Point(210, 109)
+        Me.FlatButton3.Location = New System.Drawing.Point(210, 136)
        Me.FlatButton3.Name = "FlatButton3"
        Me.FlatButton3.Size = New System.Drawing.Size(75, 23)
        Me.FlatButton3.TabIndex = 9
@@ -1009,6 +1013,18 @@ Partial Class frmGesamtsicherheitenNEU
        Me.panOben.Size = New System.Drawing.Size(1384, 290)
        Me.panOben.TabIndex = 0
        '
+        'lbloffenerWarenwert
+        '
+        Me.lbloffenerWarenwert.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.lbloffenerWarenwert.AutoSize = True
+        Me.lbloffenerWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lbloffenerWarenwert.ForeColor = System.Drawing.Color.Red
+        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(93, 111)
+        Me.lbloffenerWarenwert.Name = "lbloffenerWarenwert"
+        Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24)
+        Me.lbloffenerWarenwert.TabIndex = 51
+        Me.lbloffenerWarenwert.Text = "offener Warenwert: €"
+        '
        'txtGestellInfo
        '
        Me.txtGestellInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
@@ -1538,17 +1554,24 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnAddSicherheit.TabIndex = 36
        Me.btnAddSicherheit.UseVisualStyleBackColor = False
        '
-        'lbloffenerWarenwert
+        'txtWarenwertContext
        '
-        Me.lbloffenerWarenwert.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.lbloffenerWarenwert.AutoSize = True
-        Me.lbloffenerWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lbloffenerWarenwert.ForeColor = System.Drawing.Color.Red
-        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(93, 111)
-        Me.lbloffenerWarenwert.Name = "lbloffenerWarenwert"
-        Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24)
-        Me.lbloffenerWarenwert.TabIndex = 51
-        Me.lbloffenerWarenwert.Text = "offener Warenwert: €"
+        Me.txtWarenwertContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtWarenwertContext.Location = New System.Drawing.Point(95, 104)
+        Me.txtWarenwertContext.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtWarenwertContext.Name = "txtWarenwertContext"
+        Me.txtWarenwertContext.Size = New System.Drawing.Size(180, 24)
+        Me.txtWarenwertContext.TabIndex = 12
+        '
+        'lblWarenwertContext
+        '
+        Me.lblWarenwertContext.AutoSize = True
+        Me.lblWarenwertContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblWarenwertContext.Location = New System.Drawing.Point(10, 104)
+        Me.lblWarenwertContext.Name = "lblWarenwertContext"
+        Me.lblWarenwertContext.Size = New System.Drawing.Size(86, 20)
+        Me.lblWarenwertContext.TabIndex = 13
+        Me.lblWarenwertContext.Text = "Warenwert"
        '
        'frmGesamtsicherheitenNEU
        '
@@ -1693,4 +1716,6 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents Label26 As Label
    Friend WithEvents txtUhrzeitaendern As TextBox
    Friend WithEvents lbloffenerWarenwert As Label
+    Friend WithEvents txtWarenwertContext As TextBox
+    Friend WithEvents lblWarenwertContext As Label
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -107,7 +107,7 @@ Public Class frmGesamtsicherheitenNEU
            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'"
        End If

-        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & "order by gs_gsId"
+        Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"

        dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
        dgvGesamtsicherheit.LOAD()
@@ -258,7 +258,7 @@ Public Class frmGesamtsicherheitenNEU

        Dim SQLStringCRN As String =
            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],  [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
-                "From [tblGesamtsicherheitsPositionen] where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gsp_gsId]"
+                "From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"

        dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
        dgvSicherheitsPos.LOAD()
@@ -398,7 +398,7 @@ Public Class frmGesamtsicherheitenNEU
        End Select
    End Sub

-    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtPosTime.KeyPress, txtSicherheitDate.KeyPress, txtSicherheitTime.KeyPress, txtDatumaendern.KeyPress, txtUhrzeitaendern.KeyPress
+    Private Sub Date_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtSicherheitDate.KeyPress, txtDatumaendern.KeyPress
        Select Case Asc(e.KeyChar)
            Case 48 To 57, 8, 46, 58

@@ -410,6 +410,25 @@ Public Class frmGesamtsicherheitenNEU
        End Select
    End Sub

+    Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress
+        Select Case Asc(e.KeyChar)
+            Case 48 To 57, 8, 46, 58
+                ' Zahlen, Backspace, . und : zulassen
+
+            Case Else
+                ' alle anderen Eingaben unterdrücken
+                e.Handled = True
+        End Select
+
+        txtPosTime.Text = Replace(txtPosTime.Text, ".", ":")
+        txtPosTime.Select(txtPosTime.Text.Length + 1, 1)
+        txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ".", ":")
+        txtSicherheitTime.Select(txtPosTime.Text.Length + 1, 1)
+        txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ".", ":")
+        txtUhrzeitaendern.Select(txtPosTime.Text.Length + 1, 1)
+
+    End Sub
+

    Private Sub txtMRNDate_GotFocus(sender As Object, e As EventArgs) Handles txtSicherheitDate.GotFocus, txtPosDate.GotFocus, txtSicherheitTime.GotFocus, txtPosTime.GotFocus, txtUhrzeitaendern.GotFocus, txtDatumaendern.GotFocus
        Select Case sender.name
@@ -1343,7 +1362,7 @@ Public Class frmGesamtsicherheitenNEU
        Dim ATBNr As String
        Dim mutlitpleATBNr As Boolean = False

-        ATBNr = dgvGesamtsicherheit.SelectedRows(0).Cells("gs_ATBNr").Value.ToString
+        ATBNr = dgvGesamtsicherheit.SelectedRows(dgvGesamtsicherheit.SelectedRows.Count - 1).Cells("gs_ATBNr").Value.ToString

        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then

@@ -1370,10 +1389,13 @@ Public Class frmGesamtsicherheitenNEU
        Dim tempDatum As String
        Dim TempUhrzeit As String
        Dim mutlitpleATCNr As Boolean = False
+        Dim Warenwert As Double
+
+        ATCNr = dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_ATCNr").Value.ToString
+        tempDatum = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("dd.MM.yyyy"), "")
+        TempUhrzeit = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_datum").Value).ToString("HH:mm"), "")
+        Warenwert = If(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value IsNot DBNull.Value, CDbl(dgvSicherheitsPos.SelectedRows(dgvSicherheitsPos.SelectedRows.Count - 1).Cells("gsp_warenwert").Value), "")

-        ATCNr = dgvSicherheitsPos.SelectedRows(0).Cells("gsp_ATCNr").Value.ToString
-        tempDatum = If(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value).ToString("dd.MM.yyyy"), "")
-        TempUhrzeit = If(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value IsNot DBNull.Value, CDate(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_datum").Value).ToString("HH:mm"), "")

        If dgvSicherheitsPos.SelectedRows.Count > 0 Then

@@ -1393,6 +1415,7 @@ Public Class frmGesamtsicherheitenNEU
        txtATCaendern.Text = ATCNr
        txtDatumaendern.Text = tempDatum
        txtUhrzeitaendern.Text = TempUhrzeit
+        txtWarenwertContext.Text = Warenwert.ToString
        pnlChangeATCNr.Visible = True


@@ -1446,11 +1469,24 @@ Public Class frmGesamtsicherheitenNEU
            Exit Sub
        End If

+        If txtWarenwertContext.Text = "" Or Not IsNumeric(txtWarenwertContext().Text) Then
+            MsgBox("Bitte Warenwert angeben!")
+            Exit Sub
+        End If
+
+
        If dgvSicherheitsPos.SelectedRows.Count > 0 Then

+
            For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows

                Dim SicherhPos As New cGesamtsicherheitsPositionen(row.Cells("gsp_gsId").Value, row.Cells("gsp_gspPosId").Value)
+
+                If row.Index = 0 Then
+                    SicherhPos.gsp_warenwert = txtWarenwertContext
+                End If
+
+
                SicherhPos.gsp_ATCNr = txtATCaendern.Text
                SicherhPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtDatumaendern.Text, txtUhrzeitaendern.Text)
                SicherhPos.SAVE()