IDS, etc. Zollern Gesamtsicherheiten, etc.
This commit is contained in:
@@ -1,8 +1,5 @@
|
||||
Imports System.Configuration
|
||||
Imports System.Data.OleDb
|
||||
Imports System.Data.SqlClient
|
||||
Imports System.Data.OleDb
|
||||
Imports System.IO
|
||||
Imports System.Runtime.InteropServices
|
||||
Imports itextsharp.text.pdf
|
||||
Imports MDM_Worker
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
@@ -2295,7 +2292,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
FROM
|
||||
(SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.*
|
||||
FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
|
||||
WHERE cast(Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "' and chargedDatetime is not null " & sqlWhere & "
|
||||
WHERE cast(Rechnungsdatum as Date) = '" & datPloseAnhang.Text & "' and chargedDatetime is not null " & sqlWhere & "
|
||||
) as qryUTA_Fakturierungspositionen
|
||||
WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))
|
||||
order by KundenNr, LicencePlateNumber, Belegdatum"
|
||||
@@ -2374,7 +2371,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
left Join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
|
||||
left Join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] And inv.customer_number = cust.[customer_id] And trans.transaction_country = inv.country
|
||||
Left Join adressen ON cust.[customer_id] = Adressen.MSEKundenNr
|
||||
where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.chargedDatetime is not null " & sqlWhere &
|
||||
where bills.invoice_date = '" & datPloseAnhang.Text & "' and trans.chargedDatetime is not null " & sqlWhere &
|
||||
"order by Adressen.AdressenNr "
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
@@ -2423,7 +2420,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
End Function
|
||||
|
||||
Function genIDSInsertMaut(kdNr, IDS) As Boolean
|
||||
Function genIDSInsertMaut(kdNr) As Boolean
|
||||
Try
|
||||
pic.Visible = False
|
||||
Dim displayFilter = False
|
||||
@@ -2435,55 +2432,150 @@ Public Class frmMDMDatenverarbetiung
|
||||
End If
|
||||
|
||||
|
||||
Dim SQL_IDS = "SELECT 'IDS' as Datenquelle,
|
||||
trans.KdNrVERAG As [Customer No],
|
||||
isnull(det.LicencePlateNumber,'-') as [Licence Plate Number],
|
||||
land.Lieferland_ISO2 As [Transaction Country],
|
||||
det.Transactiondate as [Transaction Date] ,
|
||||
'' AS [Product description],
|
||||
det.CardNumber as [Card Number] ,
|
||||
'' as [Entry Terminal],
|
||||
'' as [Exit Terminal],
|
||||
sum(det.[TotalNetAmount]) AS [Nett Amount],
|
||||
sum(det.[VATAmount]) AS[VAT Amount],
|
||||
sum(det.[AmminclVAT]) AS [Total Amount]
|
||||
|
||||
|
||||
FROM [VERAG].[dbo].[tblIDSTransactionsNew_Details] as det
|
||||
inner join [tblIDSTransactionsNew] as trans on det.[YearMonthDay] = trans.[YearMonthDay] and det.[CustomerCode] = trans.[CustomerCode] and det.[OutletCountryCode] = trans.[OutletCountryCode] and det.[OutletCode] = trans.[OutletCode] and det.[ProductTypeCode] = trans.[ProductTypeCode]
|
||||
inner join [VERAG].[dbo].[tbl_IDS_Länder] as land on det.OutletCountryCode = land.OutletCountryCode
|
||||
where cast(det.[YearMonthDay] as date) = '" & DateTimePicker2.Text & "' and trans.charged = 1
|
||||
group by trans.KdNrVERAG,det.CustomerCode, det.[YearMonthDay], det.CardNumber, land.Lieferland_ISO2, det.LicencePlateNumber,det.Transactiondate "
|
||||
' Dim SQL_IDS = "SELECT 'IDS' as Datenquelle,
|
||||
' trans.KdNrVERAG As [Customer No],
|
||||
' isnull(det.LicencePlateNumber,'-') as [Licence Plate Number],
|
||||
'land.Lieferland_ISO2 As [Transaction Country],
|
||||
'det.Transactiondate as [Transaction Date] ,
|
||||
' '' AS [Product description],
|
||||
'det.CardNumber as [Card Number] ,
|
||||
' '' as [Entry Terminal],
|
||||
' '' as [Exit Terminal],
|
||||
' sum(det.[TotalNetAmount]) AS [Net Amount],
|
||||
' sum(det.[VATAmount]) AS[VAT Amount],
|
||||
' sum(det.[AmminclVAT]) AS [Total Amount]
|
||||
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(SQL_IDS, "FMZOLL")
|
||||
' FROM [VERAG].[dbo].[tblIDSTransactionsNew_Details] as det
|
||||
' inner join [tblIDSTransactionsNew] as trans on det.[YearMonthDay] = trans.[YearMonthDay] and det.[CustomerCode] = trans.[CustomerCode] and det.[OutletCountryCode] = trans.[OutletCountryCode] and det.[OutletCode] = trans.[OutletCode] and det.[ProductTypeCode] = trans.[ProductTypeCode]
|
||||
' inner join [VERAG].[dbo].[tbl_IDS_Länder] as land on det.OutletCountryCode = land.OutletCountryCode
|
||||
' where cast(det.[YearMonthDay] as date) = '" & DateTimePicker2.Text & "' and trans.charged = 0
|
||||
' group by trans.KdNrVERAG,det.CustomerCode, det.[YearMonthDay], det.CardNumber, land.Lieferland_ISO2, det.LicencePlateNumber,det.Transactiondate "
|
||||
|
||||
Dim sqlstrBULKIMPORT As String = "SELECT *, cast( '" & datPloseAnhang.Text & "' as date) as Billingdate FROM ( " & SQL_IDS & " ) AS TEMP ORDER BY TEMP.[Customer No];"
|
||||
Dim updated As Boolean = False
|
||||
|
||||
|
||||
Dim InsertSatement As String = " INSERT INTO tblMautbericht
|
||||
(
|
||||
Datenquelle,
|
||||
[Customer No],
|
||||
[Licence Plate Number],
|
||||
[Transaction Country],
|
||||
[Transaction Date],
|
||||
[Product description],
|
||||
[Card Number],
|
||||
[Entry Terminal],
|
||||
[Exit Terminal],
|
||||
[Net Amount],
|
||||
[VAT Amount],
|
||||
[Total Amount],
|
||||
[Billingdate]
|
||||
)"
|
||||
Dim InsertSatement As String = ";WITH detAgg AS
|
||||
(
|
||||
SELECT
|
||||
CAST(det.YearMonthDay AS date) AS Datum,
|
||||
det.CustomerCode,
|
||||
det.OutletCountryCode,
|
||||
det.OutletCode,
|
||||
det.ProductTypeCode,
|
||||
det.CardNumber,
|
||||
det.LicencePlateNumber,
|
||||
det.Transactiondate,
|
||||
|
||||
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
|
||||
SUM(det.TransactionVolume) AS TotalVolume,
|
||||
SUM(det.TotalNetAmount) AS NetAmount,
|
||||
SUM(det.VATAmount) AS VATAmount,
|
||||
SUM(det.AmminclVAT) AS TotalAmount
|
||||
|
||||
FROM VERAG.dbo.tblIDSTransactionsNew_Details det
|
||||
|
||||
WHERE CAST(det.YearMonthDay AS date) = '" & datPloseAnhang.Text & "'
|
||||
|
||||
|
||||
GROUP BY
|
||||
CAST(det.YearMonthDay AS date),
|
||||
det.CustomerCode,
|
||||
det.OutletCountryCode,
|
||||
det.OutletCode,
|
||||
det.ProductTypeCode,
|
||||
det.CardNumber,
|
||||
det.LicencePlateNumber,
|
||||
det.Transactiondate
|
||||
),
|
||||
|
||||
transAgg AS
|
||||
(
|
||||
SELECT
|
||||
CAST(trans.YearMonthDay AS date) AS Datum,
|
||||
trans.CustomerCode,
|
||||
trans.OutletCountryCode,
|
||||
trans.OutletCode,
|
||||
trans.ProductTypeCode,
|
||||
MAX(trans.KdNrVERAG) AS KdNrVERAG
|
||||
|
||||
FROM VERAG.dbo.tblIDSTransactionsNew trans
|
||||
|
||||
WHERE trans.charged = 0 and KdNrVERAG not in (756150, 711104)
|
||||
|
||||
GROUP BY
|
||||
CAST(trans.YearMonthDay AS date),
|
||||
trans.CustomerCode,
|
||||
trans.OutletCountryCode,
|
||||
trans.OutletCode,
|
||||
trans.ProductTypeCode
|
||||
) INSERT INTO tblMautbericht
|
||||
(
|
||||
Datenquelle,
|
||||
[Customer No],
|
||||
[Licence Plate Number],
|
||||
[Transaction Country],
|
||||
[Transaction Date],
|
||||
[Product description],
|
||||
[Card Number],
|
||||
[Entry Terminal],
|
||||
[Exit Terminal],
|
||||
[Net Amount],
|
||||
[VAT Amount],
|
||||
[Total Amount],
|
||||
[Billingdate]
|
||||
)
|
||||
|
||||
SELECT
|
||||
'IDS' AS Datenquelle,
|
||||
|
||||
transAgg.KdNrVERAG AS [Customer No],
|
||||
|
||||
ISNULL(detAgg.LicencePlateNumber,'-')
|
||||
AS [Licence Plate Number],
|
||||
|
||||
land.Lieferland_ISO2
|
||||
AS [Transaction Country],
|
||||
|
||||
detAgg.Transactiondate
|
||||
AS [Transaction Date],
|
||||
|
||||
'' AS [Product description],
|
||||
|
||||
detAgg.CardNumber
|
||||
AS [Card Number],
|
||||
|
||||
'' AS [Entry Terminal],
|
||||
|
||||
'' AS [Exit Terminal],
|
||||
|
||||
detAgg.NetAmount
|
||||
AS [Net Amount],
|
||||
|
||||
detAgg.VATAmount
|
||||
AS [VAT Amount],
|
||||
|
||||
detAgg.TotalAmount
|
||||
AS [Total Amount],
|
||||
|
||||
CAST('" & datPloseAnhang.Text & "' as Date) AS [Billingdate]
|
||||
|
||||
FROM detAgg
|
||||
|
||||
INNER JOIN transAgg
|
||||
ON detAgg.Datum = transAgg.Datum
|
||||
AND detAgg.CustomerCode = transAgg.CustomerCode
|
||||
AND detAgg.OutletCountryCode = transAgg.OutletCountryCode
|
||||
AND detAgg.OutletCode = transAgg.OutletCode
|
||||
AND detAgg.ProductTypeCode = transAgg.ProductTypeCode
|
||||
|
||||
LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
|
||||
ON detAgg.OutletCountryCode = land.OutletCountryCode"
|
||||
|
||||
|
||||
|
||||
updated = SQL.doSQL(InsertSatement, "FMZOLL",,,, 500)
|
||||
|
||||
updated = SQL.doSQL(InsertSatement & sqlstrBULKIMPORT, "FMZOLL",,,, 500)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
pic.Visible = updated
|
||||
@@ -4761,7 +4853,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
Case "ASFINAG" : deleteMautD("AT") : Return genASFINAGInsertMautAT(kdNr)
|
||||
Case "UTA" : deleteMautD("UTA") : Return genUTAInsertMaut(kdNr)
|
||||
Case "MSE" : deleteMautD("MSE") : Return genMSEInsertMaut(kdNr)
|
||||
Case "IDS" : deleteMautD("IDS") : Return genIDSInsertMaut(kdNr, LIEFERANT)
|
||||
Case "IDS" : deleteMautD("IDS") : Return genIDSInsertMaut(kdNr)
|
||||
|
||||
End Select
|
||||
Return False
|
||||
@@ -4803,7 +4895,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
PictureBox1.Visible = True
|
||||
End If
|
||||
Case Else
|
||||
MsgBox("Funktion setFaktiuriert für den Lieferant " & Lieferant & " nicht definiert!")
|
||||
MsgBox("Funktion setFakturiert für den Lieferant " & Lieferant & " nicht definiert!")
|
||||
End Select
|
||||
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user