This commit is contained in:
2024-11-25 10:01:21 +01:00
parent 5c604f63db
commit c25e93e608

View File

@@ -4234,6 +4234,11 @@ Public Class frmMDMDatenverarbetiung
If trans.KdNrVERAG Is Nothing Then
'If trans.CustomerCode = 60003513 And trans.OutletCountry = "France" Then
' seachedCustomer = True
'End If
If trans.TransactionVolume <> 0 Then
trans.avpriceexclVAT = trans.TotalNetAmount / trans.TransactionVolume
End If
@@ -4244,9 +4249,6 @@ Public Class frmMDMDatenverarbetiung
If kundeOhneRabatt Then GoTo RabattBerechnen 'kundeOhneRabatt -> gleich zu Rabattberechnen!
If trans.CustomerCode = 60003367 And trans.OutletCountry = "Austria" Then
seachedCustomer = True
End If
'Rechenwert für Land/Station/Kunde/Produkt ermitteln
Dim sqlStringLandStationKundeProdukt = "select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " AND OutletCode=" & row.Cells("OutletCode").Value & " And CustomerCode=" & row.Cells("KundeCustomerCode").Value & " AND ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC"
@@ -4263,7 +4265,7 @@ Public Class frmMDMDatenverarbetiung
'Rechenwert für Land/Kunde/Produkt ermittteln
Dim sqlStringLandKundeProdukt = "Select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " And OutletCode Is Null AND CustomerCode=" & row.Cells("KundeCustomerCode").Value & " And ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC"
Dim dtLandKundeProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandStationKundeProdukt, "FMZOLL")
Dim dtLandKundeProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandKundeProdukt, "FMZOLL")
If dtLandKundeProdukt.Rows.Count > 0 Then
For Each r In dtLandKundeProdukt.Rows
@@ -4348,6 +4350,8 @@ RechenwertBerechnen:
End If
RabattBerechnen:
Select Case trans.Kz