This commit is contained in:
2021-11-18 14:59:04 +01:00
parent 05280436a4
commit 98378dd496
51 changed files with 4647 additions and 763 deletions

View File

@@ -414,8 +414,11 @@ Public Class cBrgDb
If dr.Item("brgusr_allowBelaustungAufheben") = True Then
frmMain.brgusr_allowBelaustungAufheben = True
End If
If dr.Item("brgusr_AdminUser") = True Then
frmMain.brgusr_AdminUser = True
End If
frmMain.firma = dr.Item("brgusr_firma").ToString
frmMain.firma = dr.Item("brgusr_firma").ToString 'FIRMA GESETZT!
Return True
End If
@@ -429,17 +432,18 @@ Public Class cBrgDb
Public Function insertBrgAufschubEinzahlung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean
Public Function insertBrgAufschubEinzahlung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_faelligkeitsdatum) As Boolean
Try
Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " &
" (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" &
" (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'einzahlung') ", conn)
" (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art,brgak_faelligkeitsdatum) VALUES" &
" (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'einzahlung',@brgak_faelligkeitsdatum) ", conn)
cmd.Parameters.AddWithValue("@brgak_datum", brgak_datum)
cmd.Parameters.AddWithValue("@brgak_betrag", brgak_betrag)
cmd.Parameters.AddWithValue("@brgak_brgaktoId", brgak_brgaktoId)
cmd.Parameters.AddWithValue("@brgak_filename", brgak_filename)
cmd.Parameters.AddWithValue("@brgak_atc", brgak_atc)
cmd.Parameters.AddWithValue("@brgak_faelligkeitsdatum", brgak_faelligkeitsdatum)
Try
cmd.ExecuteNonQuery()
@@ -535,8 +539,8 @@ Public Class cBrgDb
Public Function getBrgSumFromFMZOLL_Zabis(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String
Dim tmp_sub As String = getBrgSumFromFMZOLL_Zabis_SUBEN(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Dim tmp_sbg As String = getBrgSumFromFMZOLL_Zabis_SALZBURG(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Dim tmp_sub As String = 0 'getBrgSumFromFMZOLL_Zabis_SUBEN(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Dim tmp_sbg As String = 0 ' getBrgSumFromFMZOLL_Zabis_SALZBURG(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Dim tmp_DY As String = getBrgSumFrom_DAKOSY(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
'Dim tmp_nctsTR As String = getBrgSumFrom_NCTS_TR(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Return CDbl(tmp_sub) + CDbl(tmp_sbg) + CDbl(tmp_DY) ' + CDbl(tmp_nctsTR)
@@ -768,6 +772,39 @@ Public Class cBrgDb
Return Nothing
End Function
Public Function getBrgFromBrgKto(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal brgKto As String, Optional where As String = "", Optional EinzahlungsbetraegeMitrechnen As Boolean = True, Optional faelligkeitsTAG As String = "", Optional faelligkeit As Object = Nothing) As DataTable
Dim einzahlung = ""
If Not EinzahlungsbetraegeMitrechnen Then
einzahlung = " AND [brgak_art] NOT IN ('einzahlung') "
End If
Dim sql As String = ""
If faelligkeit Is Nothing Then
Dim faelligkeitWhere As String = ""
If faelligkeitsTAG <> "" Then
If faelligkeitsTAG = "16" Then
faelligkeitWhere = " And (DATEPART(day,[brgak_faelligkeitsdatum] )=" & faelligkeitsTAG & " Or [brgak_faelligkeitsdatum] Is null) "
Else
faelligkeitWhere = " And DATEPART(day,[brgak_faelligkeitsdatum] )=" & faelligkeitsTAG & " "
End If
End If
sql = "SELECT * " &
" FROM tblBrgAufschub WHERE ( brgak_datum BETWEEN '" & datumVon & " 00:00:00' AND '" & datumBis & " 23:59:59') AND brgak_brgaktoId = '" & brgKto & "' " & where & einzahlung & faelligkeitWhere
Else
sql = "SELECT * " &
" FROM tblBrgAufschub WHERE brgak_faelligkeitsdatum='" & CDate(faelligkeit).ToShortDateString & "' AND brgak_brgaktoId = '" & brgKto & "' " & where & einzahlung
End If
Dim ADMINSQL As New VERAG_PROG_ALLGEMEIN.SQL
Return ADMINSQL.loadDgvBySql(sql, "ADMIN")
End Function
Public Function getBrgSumFromZolaris(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal kto As String, ByVal aufgehobenAbziehen As Boolean, Optional where As String = "") As String
Try
Dim sql As String =