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

VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb

@@ -2182,6 +2182,25 @@ Public Class cVermerkeDAL
             cmd.Parameters.AddWithValue("@VermerkID", VermerkID)
             cmd.Parameters.AddWithValue("@VermerkIDAufgehoben", VermerkIDAufgehoben)
 
+            Try
+                cmd.ExecuteNonQuery()
+                SpeichernVermerkID_AAS_Aufgehoben(VermerkID)
+                Return True
+            Catch ex As SqlException
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            End Try
+        End Using
+        conn.Close()
+        Return False
+    End Function
+
+    Public Function SpeichernVermerkID_AAS_Aufgehoben(VermerkID) As Boolean
+        Dim SQLstr As String = " UPDATE [tblAvisoBenachrichtigungen] SET ab_Status = 1 , ab_Bestaetigt_MaId = @ab_Bestaetigt_MaId , ab_Bestaetigt_Datum=GETDATE() WHERE ab_VermerkID=@ab_VermerkID AND ab_Status = 0  "
+        Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnection()
+        Using cmd As New SqlCommand(SQLstr, conn)
+            cmd.Parameters.AddWithValue("@ab_Bestaetigt_MaId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
+            cmd.Parameters.AddWithValue("@ab_VermerkID", VermerkID)
+
             Try
                 cmd.ExecuteNonQuery()
                 Return True

VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb

@@ -27,6 +27,7 @@ Public Class cAvisoBenachrichtigungen
     Property ab_Vermerk As Object = Nothing
     Property ab_ReminderVermerkID As Object = Nothing
     Property ab_ReminderVermerkCode As Object = Nothing
+    Property ab_VermerkID As Object = Nothing
 
 
 
@@ -47,7 +48,7 @@ Public Class cAvisoBenachrichtigungen
         LOAD()
     End Sub
 
-    Public Shared Function INSERT_BENACHRICHTIGUNG(ab_AvisoID As Integer, ab_SendungID As Object, ab_BenachrichtigungCode As Integer, Optional ab_TO_Art As Object = Nothing, Optional ab_TO_Code As Object = Nothing, Optional ab_Beschreibung As String = "", Optional ab_Prioritaet As Integer = 0, Optional ab_collAnhId As String = "", Optional ab_Vermerk As String = "", Optional [ab_ReminderVermerkID] As Object = Nothing, Optional [ab_ReminderVermerkCode] As Object = Nothing, Optional FirmaTmp As Object = Nothing) As Boolean
+    Public Shared Function INSERT_BENACHRICHTIGUNG(ab_AvisoID As Integer, ab_SendungID As Object, ab_BenachrichtigungCode As Integer, Optional ab_TO_Art As Object = Nothing, Optional ab_TO_Code As Object = Nothing, Optional ab_Beschreibung As String = "", Optional ab_Prioritaet As Integer = 0, Optional ab_collAnhId As String = "", Optional ab_Vermerk As String = "", Optional [ab_ReminderVermerkID] As Object = Nothing, Optional [ab_ReminderVermerkCode] As Object = Nothing, Optional FirmaTmp As Object = Nothing, Optional ab_VermerkID As Object = Nothing) As Boolean
         Dim AB As New cAvisoBenachrichtigungen
 
 
@@ -74,6 +75,7 @@ Public Class cAvisoBenachrichtigungen
         AB.ab_MitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
         AB.ab_ReminderVermerkID = ab_ReminderVermerkID
         AB.ab_ReminderVermerkCode = ab_ReminderVermerkCode
+        AB.ab_VermerkID = ab_VermerkID
 
 
         AB.ab_Firma = If(FirmaTmp, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
@@ -137,6 +139,7 @@ Public Class cAvisoBenachrichtigungen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ab_Vermerk", ab_Vermerk))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ab_ReminderVermerkCode", ab_ReminderVermerkCode))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ab_ReminderVermerkID", ab_ReminderVermerkID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ab_VermerkID", ab_VermerkID))
 
 
         Return list