From 7223ee1e98e281d43d92087ab1bf1044880f66b5 Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Fri, 7 Feb 2025 11:52:04 +0100
Subject: [PATCH] MDM USTVA reorder Position

---
 SDL/Fakturierung/cFakturierung.vb             |  2 +-
 SDL/My Project/AssemblyInfo.vb                |  4 +-
 SDL/USTV/frmMDM_USTVAntrag.vb                 | 38 ++++++++++++++-----
 .../Classes/USTV/cUSTVAntrag.vb               |  3 +-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb
index 75eec072..713f9330 100644
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -2059,7 +2059,7 @@ Public Class cFakturierung
                 Dim anzahl As Double = 0
                 Dim bez As String = ""
 
-                Dim einzepreis = 0
+                einzelpreis = 0
 
                 einzelpreis = IIf(pos.Item("SteuerpflichtigerBetrag") > 0, pos.Item("SteuerpflichtigerBetrag") / checkNull(pos.Item("Anzahl")), pos.Item("SteuerfreierBetrag") / checkNull(pos.Item("Anzahl")))
 
diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb
index 2e60b488..ad94606e 100644
--- a/SDL/My Project/AssemblyInfo.vb	
+++ b/SDL/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.3.5.7")>
-<Assembly: AssemblyFileVersion("1.3.5.7")>
+<Assembly: AssemblyVersion("1.3.5.8")>
+<Assembly: AssemblyFileVersion("1.3.5.8")>
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 43bd9f03..7090037f 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -2,18 +2,9 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Windows.Documents
-Imports com.sun.org.apache.xml.internal.resolver
-Imports com.sun.tools.internal.ws.wsdl.framework
-Imports DocumentFormat.OpenXml.Office2010.Drawing.Charts
 Imports itextsharp.text.pdf
 Imports itextsharp.text.pdf.parser
-Imports java.awt.geom
-Imports java.text.Normalizer
-Imports jdk.nashorn.internal.objects.annotations
-'Imports DocumentFormat.OpenXml.Drawing.Charts
 Imports Microsoft.Office.Interop
-Imports org.BouncyCastle.Pqc.Crypto
-Imports sun.swing
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmMDM_USTVAntrag
@@ -1383,7 +1374,10 @@ Public Class frmMDM_USTVAntrag
 
                 End If
 
-                UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID)
+                If UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) Then
+                    reorderPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID)
+                End If
+
                 init()
 
             End If
@@ -1806,4 +1800,28 @@ Public Class frmMDM_USTVAntrag
 
 
     End Function
+
+    Private Sub reorderPositions(UStVAn_ID As Integer)
+
+        If UStVAn_ID < 0 Then Exit Sub
+
+
+        Dim dtUSTVA As DataTable = SQL.loadDgvBySql("SELECT tblUStVPositionen.UStVPo_ID FROM tblUStVPositionen WHERE tblUStVPositionen.UStVAn_ID=" & UStVAn_ID & " ORDER BY tblUStVPositionen.UStVPo_ID ", "FMZOLL")
+        Dim counter As Integer = 0
+
+        For Each row In dtUSTVA.Rows
+
+            counter = counter + 1
+
+            Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen(UStVAn_ID, row("UStVPo_ID"))
+            If USTV_POS.UStVPo_ID <> counter Then
+                SQL.doSQL("UPDATE tblUStVPositionen SET UStVPo_ID = " & counter & " WHERE UStVAn_ID=" & UStVAn_ID & " AND UStVPo_ID=" & USTV_POS.UStVPo_ID, "FMZOLL")
+            End If
+
+
+
+
+        Next
+
+    End Sub
 End Class
\ No newline at end of file
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
index 6cf64d42..8cb95c7b 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
@@ -356,6 +356,7 @@ Public Class cUStVPositionen
         Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
     End Function
 
+
     Public Function getUpdateCmd() As String
         Try
             Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
@@ -424,7 +425,7 @@ Public Class cUStVPositionen
 
     Public Function DELETE(UStVAn_ID, UStVPo_ID) As Boolean
 
-        Dim sqlstr = " DELETE FROM tblUStVPositionen WITH(updlock,serializable) WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & Me.UStVPo_ID
+        Dim sqlstr = " DELETE FROM tblUStVPositionen WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & Me.UStVPo_ID
         Return SQL.doSQL(sqlstr, "FMZOLL")
 
     End Function