Vorkasse OP Saldo

2024-05-16 22:12:43 +02:00
parent 02b083adb7
commit 39e2ec0743
4 changed files with 164 additions and 18 deletions
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb
@@ -80,6 +80,7 @@ Partial Class frmVorauskasse
        Me.lblErgebnis = New System.Windows.Forms.Label()
        Me.Label37 = New System.Windows.Forms.Label()
        Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxGeldEingang = New System.Windows.Forms.CheckBox()
        Me.pnl.SuspendLayout()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -92,6 +93,7 @@ Partial Class frmVorauskasse
        '
        Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.cbxGeldEingang)
        Me.pnl.Controls.Add(Me.cbxLKWAnkunft)
        Me.pnl.Controls.Add(Me.txtBetrag)
        Me.pnl.Controls.Add(Me.Label7)
@@ -147,10 +149,12 @@ Partial Class frmVorauskasse
        Me.txtBetrag._DateTimeOnly = False
        Me.txtBetrag._numbersOnly = False
        Me.txtBetrag._numbersOnlyKommastellen = ""
+        Me.txtBetrag._numbersOnlyTrennzeichen = True
        Me.txtBetrag._Prozent = False
        Me.txtBetrag._ShortDateNew = False
        Me.txtBetrag._ShortDateOnly = False
        Me.txtBetrag._TimeOnly = False
+        Me.txtBetrag._TimeOnly_Seconds = False
        Me.txtBetrag._value = Nothing
        Me.txtBetrag._Waehrung = True
        Me.txtBetrag._WaehrungZeichen = True
@@ -180,10 +184,12 @@ Partial Class frmVorauskasse
        Me.txtFirma._DateTimeOnly = False
        Me.txtFirma._numbersOnly = False
        Me.txtFirma._numbersOnlyKommastellen = ""
+        Me.txtFirma._numbersOnlyTrennzeichen = True
        Me.txtFirma._Prozent = False
        Me.txtFirma._ShortDateNew = False
        Me.txtFirma._ShortDateOnly = False
        Me.txtFirma._TimeOnly = False
+        Me.txtFirma._TimeOnly_Seconds = False
        Me.txtFirma._value = Nothing
        Me.txtFirma._Waehrung = False
        Me.txtFirma._WaehrungZeichen = True
@@ -212,10 +218,12 @@ Partial Class frmVorauskasse
        Me.MyTextBox1._DateTimeOnly = False
        Me.MyTextBox1._numbersOnly = False
        Me.MyTextBox1._numbersOnlyKommastellen = ""
+        Me.MyTextBox1._numbersOnlyTrennzeichen = True
        Me.MyTextBox1._Prozent = False
        Me.MyTextBox1._ShortDateNew = False
        Me.MyTextBox1._ShortDateOnly = False
        Me.MyTextBox1._TimeOnly = False
+        Me.MyTextBox1._TimeOnly_Seconds = False
        Me.MyTextBox1._value = Nothing
        Me.MyTextBox1._Waehrung = False
        Me.MyTextBox1._WaehrungZeichen = True
@@ -258,10 +266,12 @@ Partial Class frmVorauskasse
        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
        Me.txtAbfertDat._TimeOnly = False
+        Me.txtAbfertDat._TimeOnly_Seconds = False
        Me.txtAbfertDat._value = ""
        Me.txtAbfertDat._Waehrung = False
        Me.txtAbfertDat._WaehrungZeichen = True
@@ -281,10 +291,12 @@ Partial Class frmVorauskasse
        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
        Me.txtAbfertDatBis._TimeOnly = False
+        Me.txtAbfertDatBis._TimeOnly_Seconds = False
        Me.txtAbfertDatBis._value = ""
        Me.txtAbfertDatBis._Waehrung = False
        Me.txtAbfertDatBis._WaehrungZeichen = True
@@ -331,10 +343,12 @@ Partial Class frmVorauskasse
        Me.txtAbfertigungsnummer._DateTimeOnly = False
        Me.txtAbfertigungsnummer._numbersOnly = True
        Me.txtAbfertigungsnummer._numbersOnlyKommastellen = ""
+        Me.txtAbfertigungsnummer._numbersOnlyTrennzeichen = True
        Me.txtAbfertigungsnummer._Prozent = False
        Me.txtAbfertigungsnummer._ShortDateNew = False
        Me.txtAbfertigungsnummer._ShortDateOnly = False
        Me.txtAbfertigungsnummer._TimeOnly = False
+        Me.txtAbfertigungsnummer._TimeOnly_Seconds = False
        Me.txtAbfertigungsnummer._value = ""
        Me.txtAbfertigungsnummer._Waehrung = False
        Me.txtAbfertigungsnummer._WaehrungZeichen = True
@@ -722,10 +736,12 @@ Partial Class frmVorauskasse
        Me.txtAuswahlAbfNr._DateTimeOnly = False
        Me.txtAuswahlAbfNr._numbersOnly = False
        Me.txtAuswahlAbfNr._numbersOnlyKommastellen = ""
+        Me.txtAuswahlAbfNr._numbersOnlyTrennzeichen = True
        Me.txtAuswahlAbfNr._Prozent = False
        Me.txtAuswahlAbfNr._ShortDateNew = False
        Me.txtAuswahlAbfNr._ShortDateOnly = False
        Me.txtAuswahlAbfNr._TimeOnly = False
+        Me.txtAuswahlAbfNr._TimeOnly_Seconds = False
        Me.txtAuswahlAbfNr._value = Nothing
        Me.txtAuswahlAbfNr._Waehrung = False
        Me.txtAuswahlAbfNr._WaehrungZeichen = True
@@ -800,10 +816,12 @@ Partial Class frmVorauskasse
        Me.txtBemerkung._DateTimeOnly = False
        Me.txtBemerkung._numbersOnly = False
        Me.txtBemerkung._numbersOnlyKommastellen = ""
+        Me.txtBemerkung._numbersOnlyTrennzeichen = True
        Me.txtBemerkung._Prozent = False
        Me.txtBemerkung._ShortDateNew = False
        Me.txtBemerkung._ShortDateOnly = False
        Me.txtBemerkung._TimeOnly = False
+        Me.txtBemerkung._TimeOnly_Seconds = False
        Me.txtBemerkung._value = Nothing
        Me.txtBemerkung._Waehrung = False
        Me.txtBemerkung._WaehrungZeichen = True
@@ -892,10 +910,12 @@ Partial Class frmVorauskasse
        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
@@ -912,6 +932,19 @@ Partial Class frmVorauskasse
        Me.txtMaxSrch.Text = "1000"
        Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
+        'cbxGeldEingang
+        '
+        Me.cbxGeldEingang.AutoSize = True
+        Me.cbxGeldEingang.Checked = True
+        Me.cbxGeldEingang.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxGeldEingang.Location = New System.Drawing.Point(787, 131)
+        Me.cbxGeldEingang.Name = "cbxGeldEingang"
+        Me.cbxGeldEingang.Size = New System.Drawing.Size(107, 17)
+        Me.cbxGeldEingang.TabIndex = 72
+        Me.cbxGeldEingang.Text = "Geld eingetroffen"
+        Me.cbxGeldEingang.ThreeState = True
+        Me.cbxGeldEingang.UseVisualStyleBackColor = True
+        '
        'frmVorauskasse
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -993,4 +1026,5 @@ Partial Class frmVorauskasse
    Friend WithEvents Button4 As Button
    Friend WithEvents btnVK_VERAG_VR As Button
    Friend WithEvents cbxLKWAnkunft As CheckBox
+    Friend WithEvents cbxGeldEingang As CheckBox
 End Class
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb
@@ -2,6 +2,9 @@

 Public Class frmVorauskasse

+    Public KundenNr As Integer = -1
+    Public GeldEingang As Object = Nothing
+


    Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1)
@@ -131,6 +134,21 @@ Public Class frmVorauskasse
            DateTimePicker1.Value = CDate(DatumVon)
        End If

+        If KundenNr > 0 Then
+            txtFirma.Text = KundenNr
+            If GeldEingang IsNot Nothing Then
+                If GeldEingang Then
+                    cbxGeldEingang.CheckState = CheckState.Checked
+                Else
+                    cbxGeldEingang.CheckState = CheckState.Unchecked
+                End If
+            End If
+            DateTimePicker1.Value = Now.AddYears(-1)
+            DateTimePicker2.Value = Now
+
+            btnSuche.PerformClick()
+        End If
+
    End Sub


@@ -258,7 +276,12 @@ Public Class frmVorauskasse
        If cboSachbearbeiterQS._value <> "" Then sqlstr &= " AND [vk_QS_SachbearbeiterId] = @PersonalnummerQS "
        If cboSachbearbeiterBH._value <> "" Then sqlstr &= " AND [vk_BH_SachbearbeiterId] = @PersonalnummerBH "
        If MyTextBox1.Text <> "" Then sqlstr &= " AND [vk_LKW] LIKE @LKW "
-        If txtFirma.Text <> "" Then sqlstr &= " AND [vk_Firma] LIKE @Firma "
+        If txtFirma.Text <> "" Then sqlstr &= " AND ([vk_Firma] LIKE @Firma or vk_KdNr=@Firma) "
+
+        Select Case cbxGeldEingang.CheckState
+            Case CheckState.Unchecked : sqlstr &= " AND vk_GeldEingetroffen=0  "
+            Case CheckState.Checked : sqlstr &= " AND vk_GeldEingetroffen=1 "
+        End Select
        If IsNumeric(txtBetrag._value) Then sqlstr &= " AND vk_Betrag = cast(@Betrag as float) "

        Return sqlstr
@@ -573,6 +596,7 @@ Public Class frmVorauskasse
    Private Sub frmVorauskasse_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        If FilialenNr IsNot Nothing Or AbfertigungsNr IsNot Nothing Or DatumVon IsNot Nothing Then btnSuche.PerformClick()
    End Sub
+
 End Class