edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-01-14 08:45:52 +01:00
parent dbce3f0ba9 cd45295d63
commit df324faddf
10 changed files with 340 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb
View File

@@ -2,6 +2,7 @@
Imports System.Data.SqlClient
Imports System.Reflection
Imports jdk.nashorn.internal.objects.annotations
Public Class cAufschubKonten
Property brgakto_id As Integer
@@ -173,7 +174,7 @@ 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(Optional dtDate As DataTable = Nothing, Optional Stichtag As Date? = Nothing) As String
Public Function CalcSaldo(Optional dtDate As DataTable = Nothing, Optional Stichtag As Date? = Nothing, Optional showMessage As Boolean = False) As String
Dim StichtagSQLGesamtsicherheit = ""
@@ -186,23 +187,31 @@ Public Class cAufschubKonten
Dim SaldoString As String =
"select
" SELECT
SUM(Betrag) AS GesamtSicherheitsSaldo
FROM (
SELECT
CASE
WHEN gs_art = 'OPEN' THEN gs_sicherheitsbetrag * -1
WHEN gs_art = 'CLOSE' THEN gs_sicherheitsbetrag
END AS Betrag
FROM tblGesamtsicherheit
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
(select SUM(
case
when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
when gs_art = 'Close' then gs_sicherheitsbetrag
end)
as SicherheitsSaldoGS from [tblGesamtsicherheit] Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & ")+
UNION ALL
(select SUM(
case
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 & "'" & StichtagSQLGesamtsicherheit & " And ISNULL(gs_ReferenzAenderung,0) = 0 )" & StichtagSQLGesamtsicherheitsPositionen & ")"
SELECT
CASE
WHEN gsp_art = 'OPEN' THEN gsp_sicherheitsbetrag * -1
WHEN gsp_art = 'CLOSE' THEN gsp_sicherheitsbetrag
END
FROM tblGesamtsicherheitsPositionen
WHERE gsp_gsnr IN (
SELECT gs_gsnr
FROM tblGesamtsicherheit
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 )) x;"
Dim dt As New DataTable
Dim mrn As Double = 0
@@ -214,7 +223,7 @@ Public Class cAufschubKonten
If Stichtag.HasValue Then
brgakto_gs_aktSaldo = getReferenzbetrag(Stichtag.Value) 'aktueller Referenzbetrag + Verwahrungsausgänge - Verwahrungseingänge zum Stichtag!!! -> nicht updaten, nur INFO!!!!
brgakto_gs_aktSaldo += mrn
MsgBox("Saldo zum Stichtag " & Stichtag.Value & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2"))
If showMessage Then MsgBox("Saldo zum Stichtag " & Stichtag.Value & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2"))
Else
brgakto_gs_aktSaldo = getReferenzbetrag(Today) 'aktueller Referenzbetrag + Verwahrungsausgänge - Verwahrungseingänge....
brgakto_gs_aktSaldo += mrn
@@ -233,7 +242,7 @@ Public Class cAufschubKonten
Try
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]='" & brgakto_id & "' and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & 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)