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

Performanceverbesserungen Offene Antraege!!!

Browse Source
This commit is contained in:
d.breimaier
2025-12-05 15:15:01 +01:00
parent 5d721f4193
commit b728f3f0d7
3 changed files with 95 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/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.5.0.1")> <Assembly: AssemblyVersion("1.5.0.2")>
<Assembly: AssemblyFileVersion("1.5.0.1")> <Assembly: AssemblyFileVersion("1.5.0.2")>

188
SDL/USTV/frmUSTVoffeneAntraege.vb
View File

@@ -1,5 +1,5 @@
Imports System.Windows.Documents Imports System.Windows.Documents
Imports DocumentFormat.OpenXml.Drawing.Diagrams Imports VERAG_PROG_ALLGEMEIN
Public Class frmUSTVoffeneAntraege Public Class frmUSTVoffeneAntraege
@@ -95,7 +95,49 @@ Public Class frmUSTVoffeneAntraege
End Sub End Sub
Private Sub setPDFICON(dgv As DataGridView, dgvCellNameMWST As String, dgvCellNameDSID As String, ByRef sumMWST As Double)
Dim c As New DataGridViewImageColumn
c.Name = "clmnPDF" : c.HeaderText = "RE"
' c.Image = Nothing
c.DefaultCellStyle.NullValue = Nothing
c.ImageLayout = DataGridViewImageCellLayout.Zoom
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
'c.DefaultCellStyle.Tag = "Therefore anzeigen"
If Not dgv.Columns.Contains("clmnPDF") Then dgv.Columns.Add(c)
Dim pdfImg As Image = My.Resources.pdf
For Each r As DataGridViewRow In dgv.Rows
If Not r.IsNewRow Then
' Wert lokal zwischenspeichern (vermeidet DGV-Overhead)
Dim mwstObj = r.Cells(dgvCellNameMWST).Value
Dim daIdObj = r.Cells(dgvCellNameDSID).Value
' Summe berechnen
Dim mwst As Double
If Double.TryParse(Convert.ToString(mwstObj), mwst) Then
sumMWST += mwst
End If
' PDF setzen
If daIdObj IsNot Nothing AndAlso
Not IsDBNull(daIdObj) AndAlso
Convert.ToInt32(daIdObj) > 0 Then
r.Cells("clmnPDF").Value = pdfImg
End If
End If
Next
End Sub
Sub initDgv_PLOSE(anz As Integer, Optional kdnr As Integer = -1) Sub initDgv_PLOSE(anz As Integer, Optional kdnr As Integer = -1)
With MyDatagridview1 With MyDatagridview1
.Columns.Clear() .Columns.Clear()
@@ -145,29 +187,13 @@ Public Class frmUSTVoffeneAntraege
.Columns("plose_MWSTBetrag").HeaderText = "MWST" .Columns("plose_MWSTBetrag").HeaderText = "MWST"
.Columns("daId").Visible = False .Columns("daId").Visible = False
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
Dim sumMwSt As Double = 0 Dim sumMwSt As Double = 0
Dim c As New DataGridViewImageColumn setPDFICON(MyDatagridview1, "plose_MWSTBetrag", "daId", sumMwSt)
c.Name = "clmnPDF" : c.HeaderText = "RE"
' c.Image = Nothing
c.DefaultCellStyle.NullValue = Nothing
c.ImageLayout = DataGridViewImageCellLayout.Zoom
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
'c.DefaultCellStyle.Tag = "Therefore anzeigen"
If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
For Each r As DataGridViewRow In .Rows
sumMwSt += If(IsNumeric(r.Cells("plose_MWSTBetrag").Value), CDbl(r.Cells("plose_MWSTBetrag").Value), 0)
If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
Next
txtAnzahl.Text = .Rows.Count txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt txtMWST.Text = sumMwSt
@@ -194,10 +220,15 @@ Public Class frmUSTVoffeneAntraege
.Columns.Clear() .Columns.Clear()
'Exit Sub 'Exit Sub
'MsgBox(.sql) 'MsgBox(.sql)
Dim sqlstring = "Select " & top & " [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], [rmc_betragMWST],rmc_daid as daId FROM [tblRMCImport] Dim sqlstring = "Select " & top & " [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], [rmc_betragMWST],rmc_daid as daId FROM [tblRMCImport]
INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr]
where cast(rmc_reDatum As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 " & sqlwhere & where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum < '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 AND [rmc_betragMWST] <> 0 " & sqlwhere
"group by rmc_reDatum, rmc_kdNr,[rmc_kdName], [rmc_landKZ],[rmc_reNr], [rmc_waehrung], [rmc_betragMWST], rmc_daid having [rmc_betragMWST] <> 0"
sqlstring &= " UNION ALL Select " & top & " [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], [rmc_betragMWST],rmc_daid as daId FROM [tblRMCImport]
INNER JOIN Adressen on weitereWölflKundenNr=[rmc_kdNr]
where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum < '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 AND [rmc_betragMWST] <> 0 " & sqlwhere
.SET_SQL(sqlstring, "FMZOLL") .SET_SQL(sqlstring, "FMZOLL")
.LOAD() .LOAD()
@@ -212,27 +243,13 @@ Public Class frmUSTVoffeneAntraege
.Columns("rmc_waehrung").HeaderText = "Währung" .Columns("rmc_waehrung").HeaderText = "Währung"
.Columns("daId").Visible = False .Columns("daId").Visible = False
.Columns("rmc_kdName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("rmc_kdName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
Dim sumMwSt As Double = 0 Dim sumMwSt As Double = 0
Dim c As New DataGridViewImageColumn setPDFICON(MyDatagridview1, "rmc_betragMWST", "daId", sumMwSt)
c.Name = "clmnPDF" : c.HeaderText = "RE"
' c.Image = Nothing
c.DefaultCellStyle.NullValue = Nothing
c.ImageLayout = DataGridViewImageCellLayout.Zoom
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
'c.DefaultCellStyle.Tag = "Therefore anzeigen"
If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
For Each r As DataGridViewRow In .Rows
sumMwSt += If(IsNumeric(r.Cells("rmc_betragMWST").Value), CDbl(r.Cells("rmc_betragMWST").Value), 0)
If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
Next
txtAnzahl.Text = .Rows.Count txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt txtMWST.Text = sumMwSt
@@ -273,7 +290,7 @@ Public Class frmUSTVoffeneAntraege
.Columns("total_vat_amount_euro").HeaderText = "MWSt Euro" .Columns("total_vat_amount_euro").HeaderText = "MWSt Euro"
.Columns("daId").Visible = False .Columns("daId").Visible = False
.Columns("customer_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("customer_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
@@ -289,12 +306,14 @@ Public Class frmUSTVoffeneAntraege
If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c) If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
For Each r As DataGridViewRow In .Rows 'For Each r As DataGridViewRow In .Rows
sumMwSt += If(IsNumeric(r.Cells("total_vat_amount_euro").Value), CDbl(r.Cells("total_vat_amount_euro").Value), 0) ' sumMwSt += If(IsNumeric(r.Cells("total_vat_amount_euro").Value), CDbl(r.Cells("total_vat_amount_euro").Value), 0)
If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf ' If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
Next 'Next
setPDFICON(MyDatagridview1, "total_vat_amount_euro", "daId", sumMwSt)
txtAnzahl.Text = .Rows.Count txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt txtMWST.Text = sumMwSt
@@ -340,23 +359,12 @@ Public Class frmUSTVoffeneAntraege
.Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro" .Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro"
.Columns("daId").Visible = False .Columns("daId").Visible = False
.Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
Dim sumMwSt As Double = 0 Dim sumMwSt As Double = 0
Dim c As New DataGridViewImageColumn setPDFICON(MyDatagridview1, "Gesamtbetrag_Umsatzsteuer_in_Darstellwährung", "daId", sumMwSt)
c.Name = "clmnPDF" : c.HeaderText = "RE"
' c.Image = Nothing
c.DefaultCellStyle.NullValue = Nothing
c.ImageLayout = DataGridViewImageCellLayout.Zoom
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
'c.DefaultCellStyle.Tag = "Therefore anzeigen"
.Columns.Add(c)
For Each r As DataGridViewRow In .Rows
sumMwSt += If(IsNumeric(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), CDbl(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), 0)
If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
Next
txtAnzahl.Text = .Rows.Count txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt txtMWST.Text = sumMwSt
End With End With
@@ -419,27 +427,13 @@ Public Class frmUSTVoffeneAntraege
.Columns("Steuerbetrag").HeaderText = "MWSt Euro" .Columns("Steuerbetrag").HeaderText = "MWSt Euro"
.Columns("daId").Visible = False .Columns("daId").Visible = False
.Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
Dim sumMwSt As Double = 0 Dim sumMwSt As Double = 0
Dim c As New DataGridViewImageColumn setPDFICON(MyDatagridview1, "Steuerbetrag", "daId", sumMwSt)
c.Name = "clmnPDF" : c.HeaderText = "RE"
' c.Image = Nothing
c.DefaultCellStyle.NullValue = Nothing
c.ImageLayout = DataGridViewImageCellLayout.Zoom
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
'c.DefaultCellStyle.Tag = "Therefore anzeigen"
If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
For Each r As DataGridViewRow In .Rows
sumMwSt += If(IsNumeric(r.Cells("Steuerbetrag").Value), CDbl(r.Cells("Steuerbetrag").Value), 0)
If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
Next
txtAnzahl.Text = .Rows.Count txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt txtMWST.Text = sumMwSt
@@ -482,29 +476,12 @@ Public Class frmUSTVoffeneAntraege
.Columns("Rechnungsnummer").HeaderText = "RE-Nr" .Columns("Rechnungsnummer").HeaderText = "RE-Nr"
.Columns("SteuerbetragLokal").HeaderText = "MWSt Euro" .Columns("SteuerbetragLokal").HeaderText = "MWSt Euro"
.Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
Dim sumMwSt As Double = 0 Dim sumMwSt As Double = 0
Dim c As New DataGridViewImageColumn
c.Name = "clmnPDF" : c.HeaderText = "RE"
' c.Image = Nothing
c.DefaultCellStyle.NullValue = Nothing
c.ImageLayout = DataGridViewImageCellLayout.Zoom
c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
'c.DefaultCellStyle.Tag = "Therefore anzeigen"
If Not .Columns.Contains("clmnPDF") Then .Columns.Add(c)
For Each r As DataGridViewRow In .Rows
sumMwSt += If(IsNumeric(r.Cells("SteuerbetragLokal").Value), CDbl(r.Cells("SteuerbetragLokal").Value), 0)
'If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then
DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
Next
txtAnzahl.Text = .Rows.Count txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt txtMWST.Text = sumMwSt
@@ -758,11 +735,26 @@ Public Class frmUSTVoffeneAntraege
[rmc_reDatum] AS Rechnungsdatum, [rmc_reDatum] AS Rechnungsdatum,
[rmc_betragMWST] as MWST [rmc_betragMWST] as MWST
FROM [tblRMCImport] FROM [tblRMCImport]
INNER JOIN Adressen on WölflKundenNr= [rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN Adressen on WölflKundenNr= [rmc_kdNr]
where cast(rmc_reDatum As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum < '" & dat_Sum_Bis.Value & "'
And UStVAn_ID is null " & sqlwhereRMC & " And UStVAn_ID is null " & sqlwhereRMC & "
group by Adressen.AdressenNr,Adressen.[Name 1],Adressen.LandKz, [rmc_landKZ],[rmc_reNr], rmc_reDatum, [rmc_betragMWST] AND [rmc_betragMWST] <> 0
having [rmc_betragMWST] <> 0
UNION ALL
Select " & top & "
'RMC' as Lieferant,
Adressen.AdressenNr as KdNr,
Adressen.[Name 1] as Kundenname,
Adressen.LandKz as Kundenland,
[rmc_landKZ] as Einreichland,
[rmc_reDatum] AS Rechnungsdatum,
[rmc_betragMWST] as MWST
FROM [tblRMCImport]
INNER JOIN Adressen on weitereWölflKundenNr=[rmc_kdNr]
where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum < '" & dat_Sum_Bis.Value & "'
And UStVAn_ID is null " & sqlwhereRMC & "
AND [rmc_betragMWST] <> 0
UNION ALL UNION ALL
@@ -862,7 +854,7 @@ Public Class frmUSTVoffeneAntraege
.Columns("Einreichland").HeaderText = "Einreichland" .Columns("Einreichland").HeaderText = "Einreichland"
.Columns("eingereicht").HeaderText = "einger." .Columns("eingereicht").HeaderText = "einger."
.Columns("Kundenname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Kundenname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
End If End If
@@ -952,6 +944,10 @@ Public Class frmUSTVoffeneAntraege
setdtKundeMWST(IIf(cbxAlleoffenen.Checked, -1, kdNr)) setdtKundeMWST(IIf(cbxAlleoffenen.Checked, -1, kdNr))
MyDatagridview1.SuspendLayout()
MyDatagridview1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None
Select Case LIEFERANT.ToString.ToLower Select Case LIEFERANT.ToString.ToLower
Case "plose" : initDgv_PLOSE(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr)) Case "plose" : initDgv_PLOSE(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
Case "rmc" : initDgv_RMC(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr)) Case "rmc" : initDgv_RMC(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
@@ -961,6 +957,8 @@ Public Class frmUSTVoffeneAntraege
Case "verag" : initDgv_VERAG(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr)) Case "verag" : initDgv_VERAG(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
Case "alle" : initDgv_gesamt(txtmaxAnz.Text, cbxNichtEroeffneteAntraege.Checked, IIf(cbxAlleoffenen.Checked, -1, kdNr)) Case "alle" : initDgv_gesamt(txtmaxAnz.Text, cbxNichtEroeffneteAntraege.Checked, IIf(cbxAlleoffenen.Checked, -1, kdNr))
End Select End Select
MyDatagridview1.ResumeLayout()
End Sub End Sub
Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click

1
SDL/mdm/usrcntlFremdrechnungen.vb
View File

@@ -1268,7 +1268,6 @@ Public Class usrcntlFremdrechnungen
DS.OPEN_SINGLE() DS.OPEN_SINGLE()
End If End If
Case Else Case Else