Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

VERAG_PROG_ALLGEMEIN/Classes/cBesuchsbericht.vb

@@ -25,25 +25,25 @@ Public Class cBesuchsbericht
         Property bb_LKW_Kuehltranporte As Boolean = False
     Property bb_LKW_Sondertransporte As Boolean = False
     Property bb_LKW_Sprinter As Boolean = False
-        Property bb_LKW_SiloTank As Boolean = False
-        Property bb_Auftraggeber As Object = Nothing
-        Property bb_Route As Object = Nothing
-        Property bb_DerzeitigerLieferant As Object = Nothing
-    Property bb_Zufrieden As Boolean = Nothing
+    Property bb_LKW_SiloTank As Boolean = False
+    Property bb_Auftraggeber As Object = Nothing
+    Property bb_Route As Object = Nothing
+    Property bb_DerzeitigerLieferant As Object = Nothing
+    Property bb_Zufrieden As Object = Nothing
     Property bb_ZufriedenNEIN As Object = Nothing
     Property bb_Garantie As Object = Nothing
     Property bb_Interesse_Zollabfertigung As Boolean = False
-        Property bb_Interesse_Brexit As Boolean = False
-        Property bb_Interesse_Parkplatz As Boolean = False
-        Property bb_Interesse_LagerUmschlag As Boolean = False
-        Property bb_Interesse_Rola As Boolean = False
-        Property bb_Interesse_YesMoney As Boolean = False
-        Property bb_Interesse_Ferry As Boolean = False
-        Property bb_Vermerk As Object = Nothing
+    Property bb_Interesse_Brexit As Boolean = False
+    Property bb_Interesse_Parkplatz As Boolean = False
+    Property bb_Interesse_LagerUmschlag As Boolean = False
+    Property bb_Interesse_Rola As Boolean = False
+    Property bb_Interesse_YesMoney As Boolean = False
+    Property bb_Interesse_Ferry As Boolean = False
+    Property bb_Vermerk As Object = Nothing
 
-        Public hasEntry = False
+    Public hasEntry = False
 
-        Dim SQL As New SQL
+    Dim SQL As New SQL
 
     Sub New()
         bb_Garantie = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA

VERAG_PROG_ALLGEMEIN/Classes/cKundenVollmachten.vb

@@ -15,6 +15,7 @@ Public Class cKundenVollmachten 'in Arbeit!
     Property kdvm_gueltig_ab As Object = Nothing
     Property kdvm_vermerk As Object = Nothing
     Property kdvm_geloescht As Boolean = False
+    Property kdvm_emailId As Object = Nothing
 
     Public hasEntry = False
 
@@ -47,6 +48,7 @@ Public Class cKundenVollmachten 'in Arbeit!
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_gueltig_ab", kdvm_gueltig_ab))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_vermerk", kdvm_vermerk))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_geloescht", kdvm_geloescht))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_emailId", kdvm_emailId))
 
         Return list
     End Function
@@ -65,6 +67,19 @@ Public Class cKundenVollmachten 'in Arbeit!
         Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
     End Function
 
+    Public Function SAVEVM() As Integer
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenVollmachten  WHERE kdvm_Id=@kdvm_Id) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        kdvm_Id = SQL.doSQLVarListID(kdvm_Id, sqlstr, "FMZOLL", , list)
+        Return kdvm_Id
+    End Function
+
     Public Sub LOAD()
         Try
             hasEntry = False