merge

2025-08-28 15:25:27 +02:00
parent c126b4a064 adc5186648
commit 21a1236ca5
24 changed files with 938 additions and 854 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
@@ -457,10 +457,10 @@ Public Class cIDS

                        'Else
                        .TransactionVolume = isleernothing((currentRow(8)))
-                            .AmminclVAT = isleernothing((currentRow(9)))
-                            .TotalNetAmount = isleernothing((currentRow(10)))
-                            .VATAmount = isleernothing((currentRow(11)))
-                            .avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)
+                        .AmminclVAT = isleernothing((currentRow(9)))
+                        .TotalNetAmount = isleernothing((currentRow(10)))
+                        .VATAmount = isleernothing((currentRow(11)))
+                        .avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)

                        ' End If

@@ -1039,6 +1039,158 @@ Public Class cIDSInvoiceSplittedByCountry
 End Class


+Public Class cIDSDieselpreisRW
+
+    Property ID As Integer
+    Property OutletCountryCode As Object = Nothing
+    Property OutletCode As Object = Nothing
+    Property CustomerCode As Object = Nothing
+    Property ProductTypeCode As Object = Nothing
+    Property Rechenwert As Object = Nothing
+    Property Kz As Object = Nothing
+    Property Zeitstempel As Object = Nothing
+    Property Sachbearbeiter As Object = Nothing
+    Property KategorieNr As Object = Nothing
+
+
+    Public hasEntry = False
+
+    Dim SQL As New SQL
+
+    Sub New()
+
+    End Sub
+
+    Sub New(ID)
+        Me.ID = ID
+        LOADID()
+    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("ID", ID,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OutletCountryCode", OutletCountryCode))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OutletCode", OutletCode))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CustomerCode", CustomerCode))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ProductTypeCode", ProductTypeCode))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rechenwert", Rechenwert))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kz", Kz))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zeitstempel", Zeitstempel))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KategorieNr", KategorieNr))
+
+
+
+        Return list
+    End Function
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tbl_IDS_Rechenwerte WHERE ID=@ID) " &
+                               " BEGIN " & getUpdateCmd() & " END " &
+                               " Else " &
+                               " BEGIN " & getInsertCmd() & " END " &
+                               " commit tran "
+
+        Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+    End Function
+    Public Sub LOADID()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM tbl_IDS_Rechenwerte WHERE ID=@ID  ", conn)
+                    cmd.Parameters.AddWithValue("@ID", ID)
+                    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
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+
+    Public Sub LOAD()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM tbl_IDS_Rechenwerte WHERE ID=@ID", conn)
+                    cmd.Parameters.AddWithValue("@ID", ID)
+
+
+                    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
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "" & i.Text & " = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE tbl_IDS_Rechenwerte SET " & str & " WHERE ID=@ID")
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return ""
+    End Function
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "" & i.Text & ","
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO tbl_IDS_Rechenwerte  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return ""
+    End Function
+
+End Class
+
+



--- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
@@ -876,7 +876,8 @@ Public Class cMDMFunctionsAllgemein
                If dsID > 0 Then
                    'Me.Cursor = Cursors.WaitCursor
                    Dim path As String
-                    cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 4, path)
+                    Dim onlyAsfinat As Boolean = True
+                    cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 4, path,,,,, onlyAsfinat)

                    If nummierung > 0 Then

--- a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb
@@ -42,7 +42,7 @@ Public Class cOfferteList
                                propInfo.SetValue(l, dr.Item(i.Text))
                            End If
                        Next
-                        If loadPos Then l.LOAD_POSITIONEN()
+                        If loadPos Then l.LOAD_POSITIONEN(-1)
                        LIST.Add(l)

                    End While
@@ -92,6 +92,13 @@ Public Class cOfferte
        LOAD(KundenNr, OffertenNr, loadPos)
    End Sub

+    Sub New(KundenNr, OffertenNr, FilialeNr, loadPos)
+        Me.KundenNr = KundenNr
+        Me.OffertenNr = OffertenNr
+        Me.FilialenNr = FilialeNr
+        LOAD(KundenNr, OffertenNr, loadPos)
+    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("KundenNr", KundenNr))
@@ -111,13 +118,14 @@ Public Class cOfferte
        Return list
    End Function

-    Public Sub LOAD(KundenNr, OffertenNr, loadPos)
+    Public Sub LOAD(KundenNr As Integer, OffertenNr As Integer, loadPos As Boolean, Optional FilialenNr As Integer = -1)
        Try
            POSITIONEN.Clear()
            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT * FROM Offerten WHERE KundenNr=@KundenNr AND OffertenNr=@OffertenNr ", conn)
+                Using cmd As New SqlCommand("SELECT * FROM Offerten WHERE KundenNr=@KundenNr AND OffertenNr=@OffertenNr " & IIf(FilialenNr > 0, "  AND FilialenNr=@FilialenNr", ""), conn)
                    cmd.Parameters.AddWithValue("@KundenNr", KundenNr)
                    cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr)
+                    If FilialenNr > 0 Then cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr)
                    Dim dr = cmd.ExecuteReader()
                    If dr.Read Then
                        'Dim l As New cOfferte
@@ -140,13 +148,14 @@ Public Class cOfferte
    End Sub


-    Public Sub LOAD_POSITIONEN()
+    Public Sub LOAD_POSITIONEN(Optional FilialenNr As Integer = -1)
        Try
            POSITIONEN.Clear()
            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT * FROM Offertenpositionen WHERE KundenNr=@KundenNr and OffertenNr=@OffertenNr  ", conn)
+                Using cmd As New SqlCommand("SELECT * FROM Offertenpositionen WHERE KundenNr=@KundenNr and OffertenNr=@OffertenNr " & IIf(FilialenNr > 0, "  AND FilialenNr=@FilialenNr", ""), conn)
                    cmd.Parameters.AddWithValue("@KundenNr", Me.KundenNr)
                    cmd.Parameters.AddWithValue("@OffertenNr", Me.OffertenNr)
+                    If FilialenNr > 0 Then cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr)
                    Dim dr = cmd.ExecuteReader()
                    While dr.Read
                        Dim l As New cOffertPosition