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

Korrekturen, div.

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-03-24 08:01:51 +01:00
parent 408440750e
commit b9c0731ae3
15 changed files with 582 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SDL/mdm/frmMDMDatenverarbetiung.Designer.vb generated
View File

@@ -67,6 +67,7 @@ Partial Class frmMDMDatenverarbetiung
Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cbx = New System.Windows.Forms.CheckBox()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.cbxKopie = New System.Windows.Forms.CheckBox()
Me.Label43 = New System.Windows.Forms.Label()
Me.datPloseAnhang = New System.Windows.Forms.DateTimePicker()
Me.btnREerstellen = New System.Windows.Forms.Button()
@@ -82,7 +83,6 @@ Partial Class frmMDMDatenverarbetiung
Me.Button2 = New System.Windows.Forms.Button()
Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.cbxKopie = New System.Windows.Forms.CheckBox()
Me.pnl.SuspendLayout()
Me.Panel5.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -609,6 +609,19 @@ Partial Class frmMDMDatenverarbetiung
Me.Panel2.Size = New System.Drawing.Size(301, 114)
Me.Panel2.TabIndex = 41
'
'cbxKopie
'
Me.cbxKopie.AutoSize = True
Me.cbxKopie.Checked = True
Me.cbxKopie.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxKopie.Location = New System.Drawing.Point(198, 16)
Me.cbxKopie.Name = "cbxKopie"
Me.cbxKopie.Size = New System.Drawing.Size(92, 17)
Me.cbxKopie.TabIndex = 53
Me.cbxKopie.Text = "IDS RE Kopie"
Me.cbxKopie.UseVisualStyleBackColor = True
Me.cbxKopie.Visible = False
'
'Label43
'
Me.Label43.AutoSize = True
@@ -782,19 +795,6 @@ Partial Class frmMDMDatenverarbetiung
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
'
'cbxKopie
'
Me.cbxKopie.AutoSize = True
Me.cbxKopie.Checked = True
Me.cbxKopie.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxKopie.Location = New System.Drawing.Point(198, 16)
Me.cbxKopie.Name = "cbxKopie"
Me.cbxKopie.Size = New System.Drawing.Size(92, 17)
Me.cbxKopie.TabIndex = 53
Me.cbxKopie.Text = "IDS RE Kopie"
Me.cbxKopie.UseVisualStyleBackColor = True
Me.cbxKopie.Visible = False
'
'frmMDMDatenverarbetiung
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

5
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -2784,7 +2784,10 @@ Public Class frmMDMDatenverarbetiung
sqlGroup = " CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END"
End Select
sqlstr &= " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlSelect & ", tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, Sum([TotalNetAmount])/Sum([TransactionVolume]) AS NettopreisProLiter, Sum(tblIDSTransactionsNew.Rabattbetrag) AS [SummevonRabattbetrag], Sum([Rabattbetrag])/Sum([TransactionVolume]) AS RabattbetragProLiter
sqlstr &= " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlSelect & ", tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag,
case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([TotalNetAmount])/Sum([TransactionVolume]) END AS NettopreisProLiter,
Sum(tblIDSTransactionsNew.Rabattbetrag) AS [SummevonRabattbetrag],
case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([Rabattbetrag])/Sum([TransactionVolume]) END AS RabattbetragProLiter
FROM ((tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode) INNER JOIN tbl_IDS_Produkte ON tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode) INNER JOIN Adressen ON tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr
WHERE cast(tblIDSTransactionsNew.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.KdNrVERAG = " & KdNr & sqlWhere & "
GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlGroup & ", tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz;