Änderungen Rechnungsnummernveragbe, Fiskalkunden, Creditsafe-API Fehlerausgabe verbessert, Gesamtsicherheitem (Feature für Refrerenzbetragänderungen)

VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb

@@ -29,6 +29,7 @@ Public Class cAufschubKonten
     Sub New(brgakto_gs_standort As String)
         Me.brgakto_gs_standort = brgakto_gs_standort
         LOADStandort()
+        brgakto_betrag = getReferenzbetrag(Today)
     End Sub
 
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -172,7 +173,8 @@ Public Class cAufschubKonten
         Return SQL.doSQL("Update [tblBrgAufschubKonten] Set brgakto_gs_aktSaldo = CAST(REPLACE('" & brgakto_gs_aktSaldo & "' ,',','.')AS decimal(18,2)) WHERE brgakto_gs_standort = '" & brgakto_gs_standort & "'", "ADMIN")
     End Function
 
-    Public Function CalcSaldo() As String
+    Public Function CalcSaldo(Optional dtDate As DataTable = Nothing) As String
+
         Dim SaldoString As String =
             "select
 
@@ -189,18 +191,32 @@ Public Class cAufschubKonten
     	                when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
     	                when gsp_art = 'Close' then gsp_sicherheitsbetrag
                     end) 
-					as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & brgakto_gs_standort & "' ))"
+					as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & brgakto_gs_standort & "' And ISNULL(gs_ReferenzAenderung,0) = 0 ))"
 
         Dim dt As New DataTable
-        Dim mrn As Double = 0
-        dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
-        If dt.Rows(0).Item(0).ToString.Length > 0 Then
-            mrn = dt.Rows(0).Item(0)
-        End If
+            Dim mrn As Double = 0
+            dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
+            If dt.Rows(0).Item(0).ToString.Length > 0 Then
+                mrn = dt.Rows(0).Item(0)
+            End If
 
-        brgakto_gs_aktSaldo = brgakto_betrag + mrn
+        brgakto_gs_aktSaldo = getReferenzbetrag(Today) + mrn
         updateSaldo()
+
+
         Return brgakto_gs_aktSaldo
     End Function
 
+    Public Function getReferenzbetrag(nowDate As Date) As Double
+
+        Try
+
+            Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]='" & brgakto_id & "' and brgarefb_gs_aktiv = 1 And [brgarefb_gueltig_ab] <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
+
+        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 Function
+
 End Class