Anpassung Monitoring Zölle
This commit is contained in:
@@ -795,9 +795,10 @@ Public Class frmMain
|
||||
Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
|
||||
Dim vonbrg 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 > 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)
|
||||
|
||||
lblAufschub.ForeColor = Color.Gray
|
||||
lblBRG.ForeColor = Color.Gray
|
||||
@@ -817,18 +818,20 @@ Public Class frmMain
|
||||
|
||||
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_1 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")))
|
||||
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
|
||||
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" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10
|
||||
betrag = CDbl(betragBrg_16) + CDbl(betragBrg_26)
|
||||
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" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy"))) '9
|
||||
betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy"))) '10
|
||||
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_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
|
||||
If Now.Day <= 26 Then betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.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" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10
|
||||
betrag_oE = CDbl(betragBrg_oE_16) + CDbl(betragBrg_oE_26)
|
||||
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" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy"))) '9
|
||||
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_16_1) + CDbl(betragBrg_oE_26)
|
||||
|
||||
'ElseIf ART = "EUST" Then
|
||||
' 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 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_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
|
||||
Dim dt As DataTable
|
||||
|
||||
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_1 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")))
|
||||
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
|
||||
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_3 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10
|
||||
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" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy"))) '9
|
||||
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
|
||||
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_2 IsNot Nothing Then dt.Merge(dt_betragBrg_26_2)
|
||||
If dt_betragBrg_26_3 IsNot Nothing Then dt.Merge(dt_betragBrg_26_3)
|
||||
@@ -990,7 +1003,7 @@ Public Class frmMain
|
||||
Me.lblAufschubBrg_at_VeragCS.ForeColor = Color.Gray
|
||||
End Sub
|
||||
'threadsicherer Aufruf
|
||||
|
||||
|
||||
Delegate Sub setAlarmCallback(brgsch As String, kontoNr As String, lbl_wert As Label, warn1 As Double, warn2 As Double, summe As Double, lblStatus As Label)
|
||||
Private Sub setAlarm(brgsch As String, kontoNr As String, lbl_wert As Label, warn1 As Double, warn2 As Double, summe As Double, lblStatus As Label)
|
||||
If Me.InvokeRequired Then
|
||||
@@ -1133,7 +1146,7 @@ Public Class frmMain
|
||||
' 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) & ")"
|
||||
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) & ")"
|
||||
@@ -1221,7 +1234,7 @@ Public Class frmMain
|
||||
End Sub
|
||||
|
||||
Private Sub EinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EinstellungenToolStripMenuItem.Click
|
||||
hideMe()
|
||||
hideme()
|
||||
|
||||
frmSettings.Show()
|
||||
frmSettings.BringToFront()
|
||||
@@ -1313,22 +1326,25 @@ Public Class frmMain
|
||||
If cbxAufschub_de_VeragAG.Checked Then
|
||||
|
||||
Dim brg_DE_VeragAG As String = "1"
|
||||
Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
|
||||
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)
|
||||
frmShowData.Show()
|
||||
Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
|
||||
Dim vonbrg As Date = von
|
||||
Dim vonFaell As Date = von
|
||||
Dim vonFaell_1 As Date = von
|
||||
|
||||
Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN ("
|
||||
faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
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()
|
||||
|
||||
If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & Now.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ") "
|
||||
Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN ("
|
||||
faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
|
||||
frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_VeragAG)
|
||||
If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ") "
|
||||
|
||||
frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_VeragAG)
|
||||
' frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto(vonbrg.ToShortDateString, Now.ToShortDateString, brg_DE_VeragAG)
|
||||
|
||||
frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount
|
||||
@@ -1352,7 +1368,7 @@ Public Class frmMain
|
||||
If cbxBrg_at_VeragAG.Checked Then
|
||||
Dim brg_AT As String = "05AT510000G000FP7"
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now)
|
||||
frmShowData.Show()
|
||||
frmShowData.Show()
|
||||
|
||||
End If
|
||||
' frmShowDataDouble.dgv1.DataSource = BRG.loadDgvBySqlFromBrgKtoAtlas(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT)
|
||||
@@ -1364,8 +1380,8 @@ Public Class frmMain
|
||||
If cbxBrg_at_Imex.Checked Then
|
||||
|
||||
Dim brg_AT As String = "16AT520000G000VA6"
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now)
|
||||
frmShowData.Show()
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now)
|
||||
frmShowData.Show()
|
||||
|
||||
End If
|
||||
' frmShowDataDouble.dgv1.DataSource = BRG.loadDgvBySqlFromBrgKtoAtlas(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT)
|
||||
@@ -1377,8 +1393,8 @@ Public Class frmMain
|
||||
If cbxBrg_at_VeragAG.Checked Then
|
||||
|
||||
Dim brg_AT As String = "05AT510000G000FP7"
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now)
|
||||
frmShowData.Show()
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now)
|
||||
frmShowData.Show()
|
||||
|
||||
End If
|
||||
' frmShowDataDouble.Show()
|
||||
@@ -1390,8 +1406,8 @@ Public Class frmMain
|
||||
If cbxBrg_at_Imex.Checked Then
|
||||
|
||||
Dim brg_AT As String = "16AT520000G000VA6"
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now)
|
||||
frmShowData.Show()
|
||||
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now)
|
||||
frmShowData.Show()
|
||||
|
||||
End If
|
||||
|
||||
@@ -1497,23 +1513,25 @@ Public Class frmMain
|
||||
If cbxAufschub_de_Imex.Checked Then
|
||||
|
||||
Dim brg_DE_Imex As String = "8"
|
||||
Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
|
||||
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)
|
||||
frmShowData.Show()
|
||||
' frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto(vonbrg.ToShortDateString, Now.ToShortDateString, brg_DE_Imex)
|
||||
Dim von As Date = DateSerial(Now.Year, Now.Month, 1)
|
||||
Dim vonbrg As Date = von
|
||||
Dim vonFaell As Date = von
|
||||
Dim vonFaell_1 As Date = von
|
||||
|
||||
Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN ("
|
||||
faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
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()
|
||||
|
||||
If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & Now.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ") "
|
||||
Dim faelligkeitWhere = " AND brgak_faelligkeitsdatum IN ("
|
||||
faelligkeitWhere &= "'" & CDate("16" & vonFaell.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("16" & vonFaell.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
|
||||
frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_Imex)
|
||||
If Now.Day <= 26 Then faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(1).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ",'" & CDate("26" & vonFaell_1.AddMonths(2).ToString(".MM.yyyy")).ToShortDateString & "'"
|
||||
faelligkeitWhere &= ") "
|
||||
|
||||
frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_Imex)
|
||||
|
||||
frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user