Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

2025-12-19 09:11:17 +01:00
parent 29eb8afbe6 3aead83940
commit da90ef7420
29 changed files with 1249 additions and 384 deletions
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -296,14 +296,14 @@ Public Class MyTextBox
            pruefungHandled = True
            Try
                If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then
-                    Me._value = CLng(sender.text)
+                    Me._value = CDbl(sender.text)
                ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then
-                    sender.text = CLng(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
-                    Me._value = CLng(sender.text)
+                    sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
+                    Me._value = CDbl(sender.text)
                    '  Else
                    '     sender.text = CDbl(sender.text)
                ElseIf IsNumeric(sender.text) Then
-                    Me._value = CLng(sender.text)
+                    Me._value = CDbl(sender.text)
                Else
                    Me._value = ""
                End If
@@ -591,13 +591,13 @@ Public Class MyTextBox
            ElseIf _numbersOnly Then

                If Not _numbersOnlyTrennzeichen And IsNumeric(v) Then
-                    Propvalue = CLng(v)
+                    Propvalue = CDbl(v)
                    Me.Text = v
                ElseIf IsNumeric(Me._numbersOnlyKommastellen) And IsNumeric(v) Then
-                    Propvalue = CLng(v)
-                    Me.Text = CLng(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
+                    Propvalue = CDbl(v)
+                    Me.Text = CDbl(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
                ElseIf IsNumeric(v) Then
-                    Propvalue = CLng(v)
+                    Propvalue = CDbl(v)
                    Me.Text = v
                Else
                    Propvalue = ""
@@ -635,11 +635,11 @@ Public Class MyTextBox
            Try
                'String.Format("{0:N2}", CDbl(sender.text))
                If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then
-                    sender.text = CLng(sender.text)
+                    sender.text = CDbl(sender.text)
                ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then
-                    sender.text = CLng(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
+                    sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture)
                Else
-                    sender.text = CLng(sender.text)
+                    sender.text = CDbl(sender.text)
                End If
                e.Cancel = False
            Catch ex As Exception
@@ -652,7 +652,7 @@ Public Class MyTextBox
        If _Waehrung Then
            Try
                'String.Format("{0:N2}", CDbl(sender.text))
-                CLng(sender.text).ToString(If(_WaehrungZeichen, "C2", "N2"))
+                CDbl(sender.text).ToString(If(_WaehrungZeichen, "C2", "N2"))
                e.Cancel = False
            Catch ex As Exception
                errDescription = "Die Eingabe muss eine Zahl sein! (z.B. 123,45)"
--- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
@@ -278,6 +278,18 @@ Public Class cUSTVAntrag
        Return -1
    End Function

+    Public Function getMaxPosinterneNr() As Integer
+        Try
+            Dim maxPosNr = -1
+
+            Return SQL.getValueTxtBySql("SELECT isnull(max([UStVPo_interneNr]),0)+1 FROM [tblUStVPositionen] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return -1
+    End Function
+
    Public Function getMaxPosNrErst() As Integer
        Try
            Dim maxPosNr = -1
@@ -290,6 +302,18 @@ Public Class cUSTVAntrag
        Return -1
    End Function

+    Public Function getMaxinternePosNrErst() As Integer
+        Try
+            Dim maxPosNr = -1
+
+            Return SQL.getValueTxtBySql("SELECT isnull(max([UStVEr_interneNr]),0)+1 FROM [tblUStVErstattung] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return -1
+    End Function
+


    Public Function DELETE() As Boolean
@@ -323,6 +347,8 @@ Public Class cUStVPositionen
    Property UStVPo_LeistenderId As Integer ' 
    Property UStVPo_VZ As Boolean = False
    Property UStVPo_VZ_RKID As Object = Nothing '
+    Property UStVPo_interneNr As Integer
+

    Dim SQL As New SQL

@@ -439,6 +465,7 @@ Public Class cUStVPositionen
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_LeistenderId", UStVPo_LeistenderId))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_VZ", UStVPo_VZ))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_VZ_RKID", UStVPo_VZ_RKID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_interneNr", UStVPo_interneNr))
        Return list
    End Function

@@ -496,6 +523,7 @@ Public Class cUStVErstattungPositionen
    Property UStVEr_Sachbearbeiter As Object = Nothing
    Property UStVEr_Zeitstempel As Object = Nothing
    Property UStVEr_daId As Object = Nothing
+    Property UStVEr_interneNr As Integer

    Public hasEntry = False

@@ -521,6 +549,7 @@ Public Class cUStVErstattungPositionen
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Sachbearbeiter", UStVEr_Sachbearbeiter))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Zeitstempel", UStVEr_Zeitstempel))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_daId", UStVEr_daId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_interneNr", UStVEr_interneNr))
        Return list
    End Function

@@ -646,6 +675,18 @@ Public Class cUStVErstattungPositionen
        Return -1
    End Function

+    Public Function getMaxInternePosNr() As Integer
+        Try
+            Dim maxPosNr = -1
+
+            Return SQL.getValueTxtBySql("SELECT isnull(max([UStVEr_interneNr]),0)+1 FROM [tblUStVErstattung] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return -1
+    End Function
+


 End Class
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
@@ -105,6 +105,8 @@ Public Class cKundenErweitert
    Property kde_betreuer As Object = Nothing
    Property kde_ATEZ_LogicustID As Object = Nothing
    Property kde_ATEZ_GreenpulseID As Object = Nothing
+    Property kde_SEG_Summe As Object = Nothing
+    Property kde_SEG_Datum As Object = Nothing


    Dim SQL As New SQL
@@ -216,6 +218,8 @@ Public Class cKundenErweitert
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_betreuer", kde_betreuer))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_ATEZ_LogicustID", kde_ATEZ_LogicustID))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_ATEZ_GreenpulseID", kde_ATEZ_GreenpulseID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Summe", kde_SEG_Summe))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Datum", kde_SEG_Datum))

        Return list
    End Function
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
@@ -770,6 +770,7 @@ Public Class cVorkosten
    Property LeistungsNr As Integer
    Property LeistungsBez As Object = Nothing
    Property Preis As Double = 0
+    Property Bezeichnung As Object = Nothing

    '  Property Abfertigungsbezeichnung As String = "-"
    Dim SQL As New SQL
@@ -786,6 +787,16 @@ Public Class cVorkosten
        Me.Preis = Preis
    End Sub

+    Sub New(FilialenNr, AbfertigungsNr, UnterNr, LeistungsNr, LeistungsBez, Preis, Bezeichnung)
+        Me.FilialenNr = FilialenNr
+        Me.AbfertigungsNr = AbfertigungsNr
+        Me.UnterNr = UnterNr
+        Me.LeistungsNr = LeistungsNr
+        Me.LeistungsBez = LeistungsBez
+        Me.Preis = Preis
+        Me.Bezeichnung = Bezeichnung
+    End Sub
+
    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNr", FilialenNr))
@@ -794,6 +805,7 @@ Public Class cVorkosten
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LeistungsNr", LeistungsNr))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LeistungsBez", LeistungsBez))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Preis", Preis))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bezeichnung", Bezeichnung))
        Return list
    End Function

--- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
+++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
@@ -40,6 +40,13 @@ Public Class cSicherheiten
        LOAD()
    End Sub

+    Sub New(gs_gsID, gs_posNr, gs_posSubNr)
+        Me.gs_gsId = gs_gsID
+        Me.gs_posNr = gs_posNr
+        Me.gs_posSubNr = gs_posSubNr
+        LOADSubNr()
+    End Sub
+
    Sub New(gs_gsNr)
        Me.gs_gsNr = gs_gsNr
        LOADGSNR()
@@ -49,7 +56,7 @@ Public Class cSicherheiten

    End Sub

-    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+    Function getParameterList(Optional WithoutPosSubNr As Boolean = False) As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsId", gs_gsId,, True))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ATBNr", gs_ATBNr))
@@ -76,7 +83,7 @@ Public Class cSicherheiten
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zuletztgeandert", gs_zuletztgeandert))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_MRNNr", gs_MRNNr))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr))
+        If Not WithoutPosSubNr Then list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr))

        Return list
    End Function
@@ -110,19 +117,21 @@ Public Class cSicherheiten



-    Public Function UPDATEWithNewPosNr() As Integer
+    Public Function UPDATEWithNewPosNr(Optional ingorePosSubNr As Boolean = False) As Integer

-        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(ingorePosSubNr)

-        Dim sqlstr = " BEGIN " & getUpdateCmd() & " END "
+        Dim sqlstr = " BEGIN " & getUpdateCmd(ingorePosSubNr) & " END "

-        gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , List)
+        gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , list)
        Return gs_gsId
    End Function




+
+
    Public Sub LOAD()
        Try
            hasEntry = False
@@ -152,6 +161,36 @@ Public Class cSicherheiten
        End Try
    End Sub

+    Public Sub LOADSubNr()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+                Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId AND gs_posNr=@gs_posNr AND gs_posSubNr=@gs_posSubNr  ", conn)
+                    cmd.Parameters.AddWithValue("@gs_gsID", gs_gsId)
+                    cmd.Parameters.AddWithValue("@gs_posNr", gs_posNr)
+                    cmd.Parameters.AddWithValue("@gs_posSubNr", gs_posSubNr)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+

    Public Sub LOADGSNR()
        Try
@@ -184,9 +223,9 @@ Public Class cSicherheiten



-    Public Function getUpdateCmd() As String
+    Public Function getUpdateCmd(Optional ingorePosSubNr As Boolean = False) As String
        Try
-            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(ingorePosSubNr)

            Dim str As String = ""
            For Each i In list
--- a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb
@@ -27,13 +27,13 @@ Partial Class frmDatumsabfrage
        Me.components = New System.ComponentModel.Container()
        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
        Me.pnlKunde = New System.Windows.Forms.Panel()
+        Me.cbxKunden = New System.Windows.Forms.CheckBox()
        Me.cboKundenkreis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.dtp_date = New System.Windows.Forms.DateTimePicker()
        Me.btnClose = New System.Windows.Forms.Button()
        Me.btn = New System.Windows.Forms.Button()
        Me.lbl = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
-        Me.cbxKunden = New System.Windows.Forms.CheckBox()
        Me.MyPanel1.SuspendLayout()
        Me.pnlKunde.SuspendLayout()
        Me.SuspendLayout()
@@ -51,7 +51,7 @@ Partial Class frmDatumsabfrage
        Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.MyPanel1.Location = New System.Drawing.Point(0, 0)
        Me.MyPanel1.Name = "MyPanel1"
-        Me.MyPanel1.Size = New System.Drawing.Size(264, 84)
+        Me.MyPanel1.Size = New System.Drawing.Size(286, 84)
        Me.MyPanel1.TabIndex = 3
        '
        'pnlKunde
@@ -64,6 +64,15 @@ Partial Class frmDatumsabfrage
        Me.pnlKunde.TabIndex = 26
        Me.pnlKunde.Visible = False
        '
+        'cbxKunden
+        '
+        Me.cbxKunden.AutoSize = True
+        Me.cbxKunden.Location = New System.Drawing.Point(12, 9)
+        Me.cbxKunden.Name = "cbxKunden"
+        Me.cbxKunden.Size = New System.Drawing.Size(15, 14)
+        Me.cbxKunden.TabIndex = 5
+        Me.cbxKunden.UseVisualStyleBackColor = True
+        '
        'cboKundenkreis
        '
        Me.cboKundenkreis._allowedValuesFreiText = Nothing
@@ -99,7 +108,7 @@ Partial Class frmDatumsabfrage
        Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold)
        Me.btnClose.ForeColor = System.Drawing.Color.White
-        Me.btnClose.Location = New System.Drawing.Point(231, 0)
+        Me.btnClose.Location = New System.Drawing.Point(253, 0)
        Me.btnClose.Name = "btnClose"
        Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
        Me.btnClose.Size = New System.Drawing.Size(31, 20)
@@ -111,7 +120,7 @@ Partial Class frmDatumsabfrage
        '
        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.btn.Location = New System.Drawing.Point(197, 48)
+        Me.btn.Location = New System.Drawing.Point(219, 52)
        Me.btn.Margin = New System.Windows.Forms.Padding(0)
        Me.btn.Name = "btn"
        Me.btn.Size = New System.Drawing.Size(57, 22)
@@ -136,20 +145,11 @@ Partial Class frmDatumsabfrage
        Me.Label1.Size = New System.Drawing.Size(132, 18)
        Me.Label1.TabIndex = 6
        '
-        'cbxKunden
-        '
-        Me.cbxKunden.AutoSize = True
-        Me.cbxKunden.Location = New System.Drawing.Point(12, 9)
-        Me.cbxKunden.Name = "cbxKunden"
-        Me.cbxKunden.Size = New System.Drawing.Size(15, 14)
-        Me.cbxKunden.TabIndex = 5
-        Me.cbxKunden.UseVisualStyleBackColor = True
-        '
        'frmDatumsabfrage
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(264, 84)
+        Me.ClientSize = New System.Drawing.Size(286, 84)
        Me.Controls.Add(Me.MyPanel1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
        Me.Name = "frmDatumsabfrage"