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

Anpassung Monitoring Zölle

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-05-03 14:31:45 +02:00
parent ced1793aaa
commit 885f6da247
3 changed files with 74 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VERAGMonitoring/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.4.8")> <Assembly: AssemblyVersion("1.0.4.9")>
<Assembly: AssemblyFileVersion("1.0.4.8")> <Assembly: AssemblyFileVersion("1.0.4.9")>

2
VERAGMonitoring/cSqlDb.vb
View File

@@ -215,7 +215,7 @@ Public Class cBrgDb
Dim sql As String = "SELECT [brgak_id] as Id,[brgak_datum] as Datum,[brgak_betrag] as Betrag,[brgak_filename] as Dateiname,[brgak_atc] as ATC " & Dim sql As String = "SELECT [brgak_id] as Id,[brgak_datum] as Datum,[brgak_betrag] as Betrag,[brgak_filename] as Dateiname,[brgak_atc] as ATC " &
" FROM tblBrgAufschub WHERE brgak_brgaktoId = '" & brgKto & "' " & faelligkeitWHERE & where " FROM tblBrgAufschub WHERE brgak_brgaktoId = '" & brgKto & "' " & faelligkeitWHERE & where
' MsgBox(sql)
While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit() While True 'Endlosschleife; wird verlassen durch Return oder Application.Exit()
Try Try
Dim myTable = New DataTable() Dim myTable = New DataTable()

76
VERAGMonitoring/frmMain.vb
View File

@@ -795,9 +795,10 @@ Public Class frmMain
Dim von As Date = DateSerial(Now.Year, Now.Month, 1) Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
Dim vonbrg As Date = von Dim vonbrg As Date = von
Dim vonFaell As Date = von Dim vonFaell As Date = von
Dim vonFaell_1 As Date = von
If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) If Now.Day <= 15 Then vonFaell_1 = von '.AddMonths(-1) ': vonFaell_1 = von
If Now.Day > 16 Then vonFaell = von.AddMonths(1) If Now.Day > 16 Then vonFaell_1 = von ': vonFaell_1 = von.AddMonths(-1)
lblAufschub.ForeColor = Color.Gray lblAufschub.ForeColor = Color.Gray
lblBRG.ForeColor = Color.Gray lblBRG.ForeColor = Color.Gray
@@ -817,18 +818,20 @@ Public Class frmMain
If ART = "ZOLL" Or ART = "EUST" Then If ART = "ZOLL" Or ART = "EUST" Then
Dim betragBrg_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy"))) Dim betragBrg_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
Dim betragBrg_16_1 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")))
Dim betragBrg_26 As Double = 0 Dim betragBrg_26 As Double = 0
If Now.Day <= 26 Then betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.ToString(".MM.yyyy"))) '9 If Now.Day <= 26 Then betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.ToString(".MM.yyyy"))) '9
betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy"))) '9 betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy"))) '9
betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10 betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy"))) '10
betrag = CDbl(betragBrg_16) + CDbl(betragBrg_26) betrag = CDbl(betragBrg_16) + CDbl(betragBrg_16_1) + CDbl(betragBrg_26)
Dim betragBrg_oE_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("16" & vonFaell.ToString(".MM.yyyy"))) Dim betragBrg_oE_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
Dim betragBrg_oE_16_1 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")))
Dim betragBrg_oE_26 As Double = 0 Dim betragBrg_oE_26 As Double = 0
If Now.Day <= 26 Then betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.ToString(".MM.yyyy"))) '9 If Now.Day <= 26 Then betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & vonFaell_1.ToString(".MM.yyyy"))) '9
betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy"))) '9 betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy"))) '9
betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10 betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy"))) '10
betrag_oE = CDbl(betragBrg_oE_16) + CDbl(betragBrg_oE_26) betrag_oE = CDbl(betragBrg_oE_16) + CDbl(betragBrg_oE_16_1) + CDbl(betragBrg_oE_26)
'ElseIf ART = "EUST" Then 'ElseIf ART = "EUST" Then
' Dim betragBrg_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy"))) ' Dim betragBrg_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
@@ -879,24 +882,34 @@ Public Class frmMain
Dim von As Date = DateSerial(Now.Year, Now.Month, 1) Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
Dim vonbrg As Date = von Dim vonbrg As Date = von
' Dim vonFaell As Date = von
'If Now.Day <= 15 Then vonbrg = von.AddMonths(-1)
'If Now.Day > 16 Then vonFaell = von.AddMonths(1)
Dim vonFaell As Date = von Dim vonFaell As Date = von
Dim vonFaell_1 As Date = von
If Now.Day <= 15 Then vonFaell_1 = von '.AddMonths(-1) ': vonFaell_1 = von
If Now.Day > 16 Then vonFaell_1 = von ': vonFaell_1 = von.AddMonths(-1)
If Now.Day <= 15 Then vonbrg = von.AddMonths(-1)
If Now.Day > 16 Then vonFaell = von.AddMonths(1)
Dim cAufschubKonten As New VERAG_PROG_ALLGEMEIN.cAufschubKonten(BRG_ID)
Try Try
Dim dt As DataTable Dim dt As DataTable
If ART = "ZOLL" Or ART = "EUST" Then If ART = "ZOLL" Or ART = "EUST" Then
Dim dt_betragBrg_16 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy"))) Dim dt_betragBrg_16 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
Dim dt_betragBrg_16_1 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")))
Dim dt_betragBrg_26 As New DataTable Dim dt_betragBrg_26 As New DataTable
If Now.Day <= 26 Then dt_betragBrg_26 = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.ToString(".MM.yyyy"))) '9 If Now.Day <= 26 Then dt_betragBrg_26 = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.ToString(".MM.yyyy"))) '9
Dim dt_betragBrg_26_2 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy"))) '9 Dim dt_betragBrg_26_2 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy"))) '9
Dim dt_betragBrg_26_3 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10 Dim dt_betragBrg_26_3 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy"))) '10
dt = dt_betragBrg_16 dt = dt_betragBrg_16
If dt_betragBrg_16_1 IsNot Nothing Then dt.Merge(dt_betragBrg_16_1)
If dt_betragBrg_26 IsNot Nothing Then dt.Merge(dt_betragBrg_26) If dt_betragBrg_26 IsNot Nothing Then dt.Merge(dt_betragBrg_26)
If dt_betragBrg_26_2 IsNot Nothing Then dt.Merge(dt_betragBrg_26_2) If dt_betragBrg_26_2 IsNot Nothing Then dt.Merge(dt_betragBrg_26_2)
If dt_betragBrg_26_3 IsNot Nothing Then dt.Merge(dt_betragBrg_26_3) If dt_betragBrg_26_3 IsNot Nothing Then dt.Merge(dt_betragBrg_26_3)
@@ -1133,7 +1146,7 @@ Public Class frmMain
' lblBrg_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe_summe) & ")" ' lblBrg_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe_summe) & ")"
If cbxBrg_de2_VeragAG.Checked Then lblBrg_de2_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe2_summe) & ")" If cbxBrg_de2_VeragAG.Checked Then lblBrg_de2_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe2_summe) & ")"
lblBrg_at_Imex.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_imex_de_summe) & ")" lblBrg_at_Imex.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_imex_de_summe) & ")"
lblBrg_at_atilla.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe) & ")" lblBrg_at_Atilla.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe) & ")"
lblAufschub_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_aufschub_AG_de_summe) & ")" lblAufschub_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_aufschub_AG_de_summe) & ")"
@@ -1221,7 +1234,7 @@ Public Class frmMain
End Sub End Sub
Private Sub EinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EinstellungenToolStripMenuItem.Click Private Sub EinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EinstellungenToolStripMenuItem.Click
hideMe() hideme()
frmSettings.Show() frmSettings.Show()
frmSettings.BringToFront() frmSettings.BringToFront()
@@ -1316,16 +1329,19 @@ Public Class frmMain
Dim von As Date = DateSerial(Now.Year, Now.Month, 1) Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
Dim vonbrg As Date = von Dim vonbrg As Date = von
Dim vonFaell As Date = von Dim vonFaell As Date = von
If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) Dim vonFaell_1 As Date = von
If Now.Day > 16 Then vonFaell = von.AddMonths(1)
If Now.Day <= 15 Then vonFaell_1 = von '.AddMonths(-1) ': vonFaell_1 = von
If Now.Day > 16 Then vonFaell_1 = von ': vonFaell_1 = von.AddMonths(-1)
frmShowData.Show() frmShowData.Show()
Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN (" Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN ("
faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'" faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ",'" & CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & Now.ToString(".MM.yyyy")).ToShortDateString & "'" If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'" faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'" faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ") " faelligkeitWhere &= ") "
frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_VeragAG) frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_VeragAG)
@@ -1500,17 +1516,19 @@ Public Class frmMain
Dim von As Date = DateSerial(Now.Year, Now.Month, 1) Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
Dim vonbrg As Date = von Dim vonbrg As Date = von
Dim vonFaell As Date = von Dim vonFaell As Date = von
If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) Dim vonFaell_1 As Date = von
If Now.Day > 16 Then vonFaell = von.AddMonths(1)
If Now.Day <= 15 Then vonFaell_1 = von '.AddMonths(-1) ': vonFaell_1 = von
If Now.Day > 16 Then vonFaell_1 = von ': vonFaell_1 = von.AddMonths(-1)
frmShowData.Show() frmShowData.Show()
' frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto(vonbrg.ToShortDateString, Now.ToShortDateString, brg_DE_Imex)
Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN (" Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN ("
faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'" faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ",'" & CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & Now.ToString(".MM.yyyy")).ToShortDateString & "'" If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'" faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'" faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'"
faelligkeitWhere &= ") " faelligkeitWhere &= ") "
frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_Imex) frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_Imex)