ustva VZ

2025-04-11 12:13:42 +02:00
parent 4fa46772e1
commit 329621d2d8
2 changed files with 97 additions and 3 deletions
--- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
@@ -48,6 +48,7 @@ Partial Class frmMDM_USTVAntrag
        Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblLand = New System.Windows.Forms.Label()
        Me.Panel8 = New System.Windows.Forms.Panel()
+        Me.btnAbfertigungsNrVergeben = New System.Windows.Forms.Button()
        Me.Label14 = New System.Windows.Forms.Label()
        Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.lblMWSTAntrag = New System.Windows.Forms.Label()
@@ -116,6 +117,8 @@ Partial Class frmMDM_USTVAntrag
        Me.Button3 = New System.Windows.Forms.Button()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.Label15 = New System.Windows.Forms.Label()
+        Me.txtVZam = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.pnlBottom.SuspendLayout()
        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -456,6 +459,9 @@ Partial Class frmMDM_USTVAntrag
        '
        Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel8.Controls.Add(Me.Label15)
+        Me.Panel8.Controls.Add(Me.txtVZam)
+        Me.Panel8.Controls.Add(Me.btnAbfertigungsNrVergeben)
        Me.Panel8.Controls.Add(Me.Label14)
        Me.Panel8.Controls.Add(Me.txtEingereichtAm)
        Me.Panel8.Controls.Add(Me.lblMWSTAntrag)
@@ -485,6 +491,19 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel8.Size = New System.Drawing.Size(973, 87)
        Me.Panel8.TabIndex = 19
        '
+        'btnAbfertigungsNrVergeben
+        '
+        Me.btnAbfertigungsNrVergeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAbfertigungsNrVergeben.ForeColor = System.Drawing.Color.Black
+        Me.btnAbfertigungsNrVergeben.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnAbfertigungsNrVergeben.Location = New System.Drawing.Point(654, 31)
+        Me.btnAbfertigungsNrVergeben.Name = "btnAbfertigungsNrVergeben"
+        Me.btnAbfertigungsNrVergeben.Size = New System.Drawing.Size(146, 27)
+        Me.btnAbfertigungsNrVergeben.TabIndex = 50
+        Me.btnAbfertigungsNrVergeben.Text = "AbfertigungsNr vergeben"
+        Me.btnAbfertigungsNrVergeben.UseVisualStyleBackColor = True
+        Me.btnAbfertigungsNrVergeben.Visible = False
+        '
        'Label14
        '
        Me.Label14.AutoSize = True
@@ -618,7 +637,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Label9.Cursor = System.Windows.Forms.Cursors.Hand
        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label9.ForeColor = System.Drawing.Color.Black
-        Me.Label9.Location = New System.Drawing.Point(815, 37)
+        Me.Label9.Location = New System.Drawing.Point(826, 35)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(30, 17)
        Me.Label9.TabIndex = 19
@@ -671,7 +690,7 @@ Partial Class frmMDM_USTVAntrag
        Me.txtAbfNr.MaxLines_Warning = ""
        Me.txtAbfNr.MaxLines_Warning_Label = Nothing
        Me.txtAbfNr.Name = "txtAbfNr"
-        Me.txtAbfNr.Size = New System.Drawing.Size(146, 23)
+        Me.txtAbfNr.Size = New System.Drawing.Size(117, 23)
        Me.txtAbfNr.TabIndex = 18
        '
        'Label8
@@ -1465,6 +1484,44 @@ Partial Class frmMDM_USTVAntrag
        Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
        '
+        'Label15
+        '
+        Me.Label15.AutoSize = True
+        Me.Label15.BackColor = System.Drawing.Color.Transparent
+        Me.Label15.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label15.ForeColor = System.Drawing.Color.Black
+        Me.Label15.Location = New System.Drawing.Point(800, 64)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(53, 17)
+        Me.Label15.TabIndex = 51
+        Me.Label15.Text = "VZ am:"
+        '
+        'txtVZam
+        '
+        Me.txtVZam._DateTimeOnly = False
+        Me.txtVZam._numbersOnly = True
+        Me.txtVZam._numbersOnlyKommastellen = ""
+        Me.txtVZam._numbersOnlyTrennzeichen = False
+        Me.txtVZam._Prozent = False
+        Me.txtVZam._ShortDateNew = True
+        Me.txtVZam._ShortDateOnly = True
+        Me.txtVZam._TimeOnly = False
+        Me.txtVZam._TimeOnly_Seconds = False
+        Me.txtVZam._value = ""
+        Me.txtVZam._Waehrung = False
+        Me.txtVZam._WaehrungZeichen = False
+        Me.txtVZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.txtVZam.ForeColor = System.Drawing.Color.Black
+        Me.txtVZam.Location = New System.Drawing.Point(865, 60)
+        Me.txtVZam.MaxLength = 10
+        Me.txtVZam.MaxLineLength = -1
+        Me.txtVZam.MaxLines_Warning = ""
+        Me.txtVZam.MaxLines_Warning_Label = Nothing
+        Me.txtVZam.Name = "txtVZam"
+        Me.txtVZam.Size = New System.Drawing.Size(100, 23)
+        Me.txtVZam.TabIndex = 52
+        '
        'frmMDM_USTVAntrag
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1599,4 +1656,7 @@ Partial Class frmMDM_USTVAntrag
    Friend WithEvents picExcel As PictureBox
    Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Label27 As Label
+    Friend WithEvents btnAbfertigungsNrVergeben As Button
+    Friend WithEvents Label15 As Label
+    Friend WithEvents txtVZam As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -296,6 +296,7 @@ Public Class frmMDM_USTVAntrag
        txt3470.Text = If(USTV_ANTRAG.UStVAn_3470, "")

        txtVZ.Text = If(USTV_ANTRAG.UStVAn_VZBetrag, "")
+        txtVZam.Text = If(USTV_ANTRAG.UStVAn_VZDatum, "")
        txtBezugsNr.Text = If(USTV_ANTRAG.UStVAn_BezugsNr, "")
        txtAbfNr.Text = If(USTV_ANTRAG.AbfertigungsNr, "")
        txtEingereichtAm.Text = If(USTV_ANTRAG.UStVAn_AntragEingereichtAm, "")
@@ -318,6 +319,7 @@ Public Class frmMDM_USTVAntrag
            USTV_ANTRAG.UStVAn_AntragArt = cboAntragArt._value
            USTV_ANTRAG.UStVAn_StatusText = rtbStatusText.Text

+            USTV_ANTRAG.FilialenNr = cbxFiliale._value
            USTV_ANTRAG.FilialenNr = cbxFiliale._value

            If txt3470.Text <> "" AndAlso IsNumeric(txt3470.Text) Then
@@ -332,6 +334,13 @@ Public Class frmMDM_USTVAntrag
                USTV_ANTRAG.UStVAn_VZBetrag = Nothing
            End If

+            If txtVZam.Text <> "" AndAlso IsDate(txtVZam.Text) Then
+                USTV_ANTRAG.UStVAn_VZDatum = CDate(txtVZ.Text)
+            Else
+                USTV_ANTRAG.UStVAn_VZDatum = Nothing
+            End If
+
+
            USTV_ANTRAG.UStVAn_BezugsNr = txtBezugsNr.Text
            USTV_ANTRAG.AbfertigungsNr = txtAbfNr.Text

@@ -523,6 +532,8 @@ Public Class frmMDM_USTVAntrag

        setinfofields()

+        If VERAG_PROG_ALLGEMEIN.cAllgemein.AUTO_ABF_NR Then btnAbfertigungsNrVergeben.Visible = True
+


    End Sub
@@ -1370,6 +1381,9 @@ Public Class frmMDM_USTVAntrag
    End Sub

    Private Sub frmMDM_USTVAntrag_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+
+        If IsNumeric(txtAbfNr.Text) AndAlso CInt(txtAbfNr.Text) > 0 Then btnAbfertigungsNrVergeben.Visible = False
+
        Me.Top = 0
        Me.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height
    End Sub
@@ -1534,7 +1548,7 @@ Public Class frmMDM_USTVAntrag

            End If

-                UstCntlUSTV_AntragPosition1.Enabled = False
+            UstCntlUSTV_AntragPosition1.Enabled = False

        End If
    End Sub
@@ -2446,6 +2460,26 @@ Public Class frmMDM_USTVAntrag

    End Sub

+    Private Sub txtAbfNr_TextChanged(sender As Object, e As EventArgs) Handles txtAbfNr.TextChanged
+
+        If IsNumeric(txtAbfNr.Text) AndAlso CInt(txtAbfNr.Text) > 10000 AndAlso USTV_ANTRAG.AbfertigungsNr <> txtAbfNr.Text AndAlso Not btnAbfertigungsNrVergeben.Visible Then
+            Dim spedBuch As New cSpeditionsbuch(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, 0)
+            If spedBuch.hasEntry Then MsgBox("Es existiert bereits ein Speditionsbucheintrag mit dieser Nr!") : Exit Sub
+        End If
+
+    End Sub
+
+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnAbfertigungsNrVergeben.Click
+
+        If Not IsNumeric(cbxFiliale._value) OrElse CInt(cbxFiliale._value) <= 0 Then
+            MsgBox("Bitte Filiale auswählen!") : Exit Sub
+        End If
+        txtAbfNr.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(cbxFiliale._value, Now.Year)
+        cbxFiliale.Enabled = False
+        btnAbfertigungsNrVergeben.Visible = False
+
+    End Sub
+
    Private Sub calcSumme()

        Dim countSumme As Double = 0