div. Änderungen

This commit is contained in:
2026-03-18 10:19:52 +01:00
parent 72a2def23b
commit b143e5bf13
23 changed files with 1254 additions and 501 deletions

View File

@@ -129,6 +129,7 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.Label72 = New System.Windows.Forms.Label()
Me.GroupBox21 = New System.Windows.Forms.GroupBox()
Me.cbxRechnungsdetails = New System.Windows.Forms.CheckBox()
Me.txtJahr_rechnungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.PictureBox8 = New System.Windows.Forms.PictureBox()
Me.Label70 = New System.Windows.Forms.Label()
@@ -187,8 +188,9 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage5 = New System.Windows.Forms.TabPage()
Me.Label56 = New System.Windows.Forms.Label()
Me.GroupBox17 = New System.Windows.Forms.GroupBox()
Me.cboASFINAG_DATUM = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxAbrecnungszeitraum_ASFINAG = New System.Windows.Forms.CheckBox()
Me.cbxExcel = New System.Windows.Forms.CheckBox()
Me.Label55 = New System.Windows.Forms.Label()
Me.Button16 = New System.Windows.Forms.Button()
Me.Label53 = New System.Windows.Forms.Label()
Me.GroupBox16 = New System.Windows.Forms.GroupBox()
@@ -209,7 +211,6 @@ Partial Class usrCntlMDMAuswertungen
Me.btnContractdaten = New System.Windows.Forms.Button()
Me.Button15 = New System.Windows.Forms.Button()
Me.pnl = New System.Windows.Forms.Panel()
Me.cbxRechnungsdetails = New System.Windows.Forms.CheckBox()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1434,9 +1435,9 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage3.Controls.Add(Me.GroupBox21)
Me.TabPage3.Controls.Add(Me.Label66)
Me.TabPage3.Controls.Add(Me.GroupBox20)
Me.TabPage3.Controls.Add(Me.UsrCntlWoelfl_IM_CSVRg1)
Me.TabPage3.Controls.Add(Me.Label4)
Me.TabPage3.Controls.Add(Me.GroupBox2)
Me.TabPage3.Controls.Add(Me.UsrCntlWoelfl_IM_CSVRg1)
Me.TabPage3.Location = New System.Drawing.Point(4, 22)
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Size = New System.Drawing.Size(1049, 990)
@@ -1469,6 +1470,18 @@ Partial Class usrCntlMDMAuswertungen
Me.GroupBox21.TabIndex = 18
Me.GroupBox21.TabStop = False
'
'cbxRechnungsdetails
'
Me.cbxRechnungsdetails.AutoSize = True
Me.cbxRechnungsdetails.Checked = True
Me.cbxRechnungsdetails.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxRechnungsdetails.Location = New System.Drawing.Point(273, 49)
Me.cbxRechnungsdetails.Name = "cbxRechnungsdetails"
Me.cbxRechnungsdetails.Size = New System.Drawing.Size(152, 17)
Me.cbxRechnungsdetails.TabIndex = 18
Me.cbxRechnungsdetails.Text = "Rechnungsdetail anzeigen"
Me.cbxRechnungsdetails.UseVisualStyleBackColor = True
'
'txtJahr_rechnungen
'
Me.txtJahr_rechnungen._DateTimeOnly = False
@@ -2111,8 +2124,9 @@ Partial Class usrCntlMDMAuswertungen
'
'GroupBox17
'
Me.GroupBox17.Controls.Add(Me.cboASFINAG_DATUM)
Me.GroupBox17.Controls.Add(Me.cbxAbrecnungszeitraum_ASFINAG)
Me.GroupBox17.Controls.Add(Me.cbxExcel)
Me.GroupBox17.Controls.Add(Me.Label55)
Me.GroupBox17.Controls.Add(Me.Button16)
Me.GroupBox17.Location = New System.Drawing.Point(6, 367)
Me.GroupBox17.Name = "GroupBox17"
@@ -2120,6 +2134,29 @@ Partial Class usrCntlMDMAuswertungen
Me.GroupBox17.TabIndex = 13
Me.GroupBox17.TabStop = False
'
'cboASFINAG_DATUM
'
Me.cboASFINAG_DATUM._allowedValuesFreiText = Nothing
Me.cboASFINAG_DATUM._allowFreiText = False
Me.cboASFINAG_DATUM._value = ""
Me.cboASFINAG_DATUM.FormattingEnabled = True
Me.cboASFINAG_DATUM.Location = New System.Drawing.Point(346, 17)
Me.cboASFINAG_DATUM.Name = "cboASFINAG_DATUM"
Me.cboASFINAG_DATUM.Size = New System.Drawing.Size(103, 21)
Me.cboASFINAG_DATUM.TabIndex = 57
'
'cbxAbrecnungszeitraum_ASFINAG
'
Me.cbxAbrecnungszeitraum_ASFINAG.AutoSize = True
Me.cbxAbrecnungszeitraum_ASFINAG.Checked = True
Me.cbxAbrecnungszeitraum_ASFINAG.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAbrecnungszeitraum_ASFINAG.Location = New System.Drawing.Point(150, 19)
Me.cbxAbrecnungszeitraum_ASFINAG.Name = "cbxAbrecnungszeitraum_ASFINAG"
Me.cbxAbrecnungszeitraum_ASFINAG.Size = New System.Drawing.Size(180, 17)
Me.cbxAbrecnungszeitraum_ASFINAG.TabIndex = 56
Me.cbxAbrecnungszeitraum_ASFINAG.Text = "Abrechnungszeitraum auswerten"
Me.cbxAbrecnungszeitraum_ASFINAG.UseVisualStyleBackColor = True
'
'cbxExcel
'
Me.cbxExcel.AutoSize = True
@@ -2132,15 +2169,6 @@ Partial Class usrCntlMDMAuswertungen
Me.cbxExcel.Text = "als Excel"
Me.cbxExcel.UseVisualStyleBackColor = True
'
'Label55
'
Me.Label55.AutoSize = True
Me.Label55.Location = New System.Drawing.Point(147, 19)
Me.Label55.Name = "Label55"
Me.Label55.Size = New System.Drawing.Size(161, 13)
Me.Label55.TabIndex = 6
Me.Label55.Text = "Abrechnungszeitraum auswerten"
'
'Button16
'
Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2353,18 +2381,6 @@ Partial Class usrCntlMDMAuswertungen
Me.pnl.Size = New System.Drawing.Size(1057, 54)
Me.pnl.TabIndex = 26
'
'cbxRechnungsdetails
'
Me.cbxRechnungsdetails.AutoSize = True
Me.cbxRechnungsdetails.Checked = True
Me.cbxRechnungsdetails.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxRechnungsdetails.Location = New System.Drawing.Point(273, 49)
Me.cbxRechnungsdetails.Name = "cbxRechnungsdetails"
Me.cbxRechnungsdetails.Size = New System.Drawing.Size(152, 17)
Me.cbxRechnungsdetails.TabIndex = 18
Me.cbxRechnungsdetails.Text = "Rechnungsdetail anzeigen"
Me.cbxRechnungsdetails.UseVisualStyleBackColor = True
'
'usrCntlMDMAuswertungen
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2588,7 +2604,6 @@ Partial Class usrCntlMDMAuswertungen
Friend WithEvents btnKartenpruefung As Button
Friend WithEvents Label56 As Label
Friend WithEvents GroupBox17 As GroupBox
Friend WithEvents Label55 As Label
Friend WithEvents Button16 As Button
Friend WithEvents Label60 As Label
Friend WithEvents GroupBox18 As GroupBox
@@ -2630,4 +2645,6 @@ Partial Class usrCntlMDMAuswertungen
Friend WithEvents Label71 As Label
Friend WithEvents Button21 As Button
Friend WithEvents cbxRechnungsdetails As CheckBox
Friend WithEvents cbxAbrecnungszeitraum_ASFINAG As CheckBox
Friend WithEvents cboASFINAG_DATUM As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class

View File

@@ -1153,16 +1153,6 @@ Public Class usrCntlMDMAuswertungen
rpt.DataSource = dt
'If cbxProdukt.Checked Then
' rpt.GroupHeader2.DataField = "prod_descr"
'Else
' rpt.GroupHeader2.Visible = False
' rpt.GroupFooter2.Visible = False
'End If
Dim sum = 0
rpt.lblUeberschrift.Text = "ASFINAG Summenbericht " & CDate(dat_Sum_Bis.Value.ToShortDateString)
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
@@ -1171,10 +1161,6 @@ Public Class usrCntlMDMAuswertungen
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
Dim sumNetto As Double = 0
Dim sumMWST As Double = 0
Dim sumBrutto As Double = 0
@@ -1234,13 +1220,8 @@ Public Class usrCntlMDMAuswertungen
End Function
Private Sub TabPage5_Paint(sender As Object, e As PaintEventArgs) Handles TabPage5.Paint
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim letzteMaut = SQL.getValueTxtBySql("SELECT Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG")
If letzteMaut IsNot Nothing AndAlso IsDate(letzteMaut) Then
lblDatletzteMaut.Text = letzteMaut
Else
lblDatletzteMaut.Text = "-"
End If
End Sub
Private Sub Button17_Click(sender As Object, e As EventArgs) Handles btnKartenpruefung.Click
@@ -1336,16 +1317,25 @@ Public Class usrCntlMDMAuswertungen
Dim frm As New Form
Dim dgv As New DataGridView()
Dim SQLWhere As String = ""
If Not cbxAbrecnungszeitraum_ASFINAG.Checked Then
SQLWhere = "(Abrechnungsdatum = (SELECT Abrechnungsdatum FROM Abrechnungsdatum))"
Else
SQLWhere = "(Abrechnungsdatum = '" & cboASFINAG_DATUM._value & "')"
End If
Dim dt As DataTable = SQL.loadDgvBySql("SELECT
PKFileName,
FileCreationDate,
Abrechnungsdatum,
round(SUM(amountInclVAT) - SUM(VATAmount),2) AS Nettobetrag,
round(SUM(VATAmount),2) AS Umsatzsteuer,
VATRate AS 'USt %',
round(SUM(amountInclVAT),2) AS Bruttobetrag
Abrechnungsdatum as turnoverdate,
round(SUM(amountInclVAT) - SUM(VATAmount),2) AS Netamount,
round(SUM(VATAmount),2) AS VATAmount,
VATRate AS 'VAT-Rate %',
round(SUM(amountInclVAT),2) AS TotalAmount
FROM TTRBody
WHERE (PKHistory = 0) AND (Abrechnungsdatum = (SELECT Abrechnungsdatum FROM Abrechnungsdatum))
WHERE (PKHistory = 0) AND " & SQLWhere & "
GROUP BY PKFileName, FileCreationDate, Abrechnungsdatum, VATRate
ORDER BY PKFileName", "ASFINAG")
@@ -1356,10 +1346,109 @@ Public Class usrCntlMDMAuswertungen
If cbxExcel.Checked Then
VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt)
If Not cbxAbrecnungszeitraum_ASFINAG.Checked Then
'tblAsfinagMaut ist nur eine Zwischentabelle, die nach jeder Sammelrechnung wieder geleert wird!!!
Dim dt_Abrechnung As DataTable = SQL.loadDgvBySql("select
'AT'
,Adressen.AdressenNr
,licenceplate
,turnoverdate
,contractPartner
,TT.PKFileName
,MAUT.[cardnumber] as CardNumber
,MAUT.[netAmount] as Netamount
,MAUT.[VATamount] as VATAmount
,MAUT.[totalAmount] as TotalAmount
FROM [VERAG].[dbo].[tblAsfinagMaut] as MAUT
INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr
INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
INNER JOIN TTRBody as TT on TT.receiptNumber = MAUT.receiptnumber and TT.cardnumber = MAUT.CardNumber
WHERE 1 = 1
order by Adressen.AdressenNr, TT.PKFileName", "ASFINAG")
Dim dt_Abrechnung_Summen As DataTable = SQL.loadDgvBySql(" select
TT.PKFileName
,SUM(MAUT.[netAmount]) as Netamount
,SUM(MAUT.[VATamount]) as VATAmount
,SUM(MAUT.[totalAmount]) as TotalAmount
FROM [VERAG].[dbo].[tblAsfinagMaut] as MAUT
INNER JOIN TTRBody as TT on TT.receiptNumber = MAUT.receiptnumber and TT.cardnumber = MAUT.CardNumber
WHERE 1 = 1
group by TT.PKFileName
order by TT.PKFileName", "ASFINAG")
SDL.cProgramFunctions.genExcelFromMultibleDT_NEW({dt, dt_Abrechnung, dt_Abrechnung_Summen})
Else
If cboASFINAG_DATUM._value IsNot Nothing AndAlso IsDate(cboASFINAG_DATUM._value) Then
Dim dt_Abrechnung As DataTable = SQL.loadDgvBySql("select
'AT'
,Adressen.AdressenNr
,dbo.CLFArchiv.vehicleLicensePlate as licenceplate
,dbo.TTRBody.DeliveryDate as turnoverdate
,dbo.tblWarenarten.WarenartDE as ProductCode
,dbo.TTRBody.PKFileName as PKFileName
,dbo.TTRBody.[cardnumber] as CardNumber
,dbo.TTRBody.amountInclVAT - [VATamount] as Netamount
,dbo.TTRBody.[VATamount] as VATAmount
,dbo.TTRBody.amountInclVAT as TotalAmount
From dbo.CLFArchiv
RIGHT OUTER Join dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID
LEFT OUTER Join dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
INNER JOIN [VERAG].[dbo].Kreditkarten ON TTRBody.CardNumber = Kreditkarten.KartenNr
INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
Where TTRBody.abrechnungsdatum = '" & cboASFINAG_DATUM._value & "'
order by Adressen.AdressenNr, TTRBody.PKFileName", "ASFINAG")
Dim dt_Abrechnung_Summen As DataTable = SQL.loadDgvBySql("select
dbo.TTRBody.PKFileName
,sum(dbo.TTRBody.amountInclVAT - [VATamount]) as Netamount
,sum(dbo.TTRBody.[VATamount]) as VATAmount
,sum(dbo.TTRBody.amountInclVAT) as TotalAmount
From dbo.CLFArchiv
RIGHT OUTER Join dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID
LEFT OUTER Join dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
INNER JOIN [VERAG].[dbo].Kreditkarten ON TTRBody.CardNumber = Kreditkarten.KartenNr
INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
Where TTRBody.abrechnungsdatum = '" & cboASFINAG_DATUM._value & "'
group by TTRBody.PKFileName
order by TTRBody.PKFileName", "ASFINAG")
SDL.cProgramFunctions.genExcelFromMultibleDT_NEW({dt, dt_Abrechnung, dt_Abrechnung_Summen})
End If
End If
If cboASFINAG_DATUM._value IsNot Nothing AndAlso IsDate(cboASFINAG_DATUM._value) Then
Dim date_ASFINAG_start = CDate(cboASFINAG_DATUM._value).AddDays(-1)
Dim dt_Abrechnung_VERAG As DataTable = SQL.loadDgvBySql(" SELECT year(rechnungsdatum)Year,MONTH(rechnungsdatum)Month,RechnungsKundenNr CustomerNo, Adressen.Ordnungsbegriff Customer,Adressen.LandKz Ctry, Offertenstamm.OffertenNr, Offertenstamm.OffertenBez,leistungen.LeistungsNr ProdNo,leistungen.LeistungsBez ProdDscr, /*count(distinct([Rechnungsausgang].Rk_ID)) CountInv,*/ sum(RechnungsausgangPositionen.SteuerfreierBetrag+RechnungsausgangPositionen.SteuerpflichtigerBetrag)NetSum,ReverseCharge
FROM [VERAG].[dbo].[Rechnungsausgang]
inner join Adressen on RechnungsKundenNr=AdressenNr
inner join RechnungsausgangPositionen on Rechnungsausgang.RK_ID= RechnungsausgangPositionen.rk_id
inner join leistungen on leistungen.LeistungsNr=RechnungsausgangPositionen.LeistungsNr
inner join Offertenstamm on Offertenstamm.OffertenNr=Rechnungsausgang.OffertenNr
where Firma_ID=19
and Rechnungsausgang.Abfertigungsdatum between '" & date_ASFINAG_start.ToShortDateString & "' and '" & cboASFINAG_DATUM._value & "'
and Rechnungsausgang.OffertenNr in (11)
group by year(rechnungsdatum),MONTH(rechnungsdatum),RechnungsKundenNr,Offertenstamm.OffertenNr,Offertenstamm.OffertenBez,Adressen.Ordnungsbegriff,Adressen.LandKz , leistungen.LeistungsNr,leistungen.LeistungsBez,ReverseCharge
order by Year,Month,CustomerNo,Offertenstamm.OffertenNr,Offertenstamm.OffertenBez,leistungen.LeistungsNr", "FMZOLL")
VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Abrechnung_VERAG)
End If
Else
dgv.DataSource = dt
dgv.DataSource = dt
If dgv IsNot Nothing Then
frm.Size = New Size(1400, 1000)
@@ -1580,6 +1669,39 @@ Public Class usrCntlMDMAuswertungen
End Sub
Private Sub TabPage5_Click(sender As Object, e As EventArgs) Handles TabPage5.Click
End Sub
Private Sub tbcntr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tbcntr.SelectedIndexChanged
Select Case tbcntr.SelectedIndex
Case 6 'ASFINAG
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim letzteMaut = SQL.getValueTxtBySql("SELECT Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG")
If letzteMaut IsNot Nothing AndAlso IsDate(letzteMaut) Then
lblDatletzteMaut.Text = letzteMaut
Else
lblDatletzteMaut.Text = "-"
End If
cboASFINAG_DATUM.fillWithSQL("select cast([abrechnungsdatum] as Date) from [ASFINAG].[dbo].[TTRBody] where [abrechnungsdatum] is not null group by [abrechnungsdatum] order by [abrechnungsdatum] desc", False, "ASFINAG")
End Select
End Sub
Private Sub cbxAbrecnungszeitraum_ASFINAG_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAbrecnungszeitraum_ASFINAG.CheckedChanged
If Not cbxAbrecnungszeitraum_ASFINAG.Checked Then
cboASFINAG_DATUM._value = lblDatletzteMaut.Text
cboASFINAG_DATUM.Enabled = False
Else
cboASFINAG_DATUM.Enabled = True
End If
End Sub
End Class