MDM, CHAT, MSE_API
This commit is contained in:
@@ -15,6 +15,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 "
|
||||
Dim ProduktCode_NOT_IN = "'9020'"
|
||||
Dim datum As Date = Nothing
|
||||
Dim test As Boolean = False
|
||||
Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Me.Top = 0
|
||||
Me.Height = My.Computer.Screen.WorkingArea.Height
|
||||
@@ -96,7 +97,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
End If
|
||||
Case "UTA"
|
||||
If genRGAtt_UTA() Then
|
||||
If MautD_Befuellen() Then
|
||||
If Not test AndAlso MautD_Befuellen() Then
|
||||
setFakturiert(LIEFERANT)
|
||||
End If
|
||||
End If
|
||||
@@ -105,7 +106,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
MsgBox("Nicht verfügbar!")
|
||||
Case "MSE"
|
||||
If genRGAtt_MSE() Then
|
||||
If MautD_Befuellen() Then
|
||||
If Not test AndAlso MautD_Befuellen() Then
|
||||
setFakturiert(LIEFERANT)
|
||||
End If
|
||||
End If
|
||||
@@ -375,14 +376,14 @@ Public Class frmMDMDatenverarbetiung
|
||||
Offertenpositionen.LeistungsNr,
|
||||
Offertenpositionen.LeistungsBez,
|
||||
tblUTAFakturierwarenarten.Warenart,
|
||||
tblUTAImport.*
|
||||
tblUTAImportNew.*
|
||||
FROM tblUTAFakturierwarenarten
|
||||
INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer)
|
||||
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 (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
|
||||
AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)
|
||||
AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland)
|
||||
AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)
|
||||
as temp
|
||||
where temp.abgerechnet <> 1
|
||||
GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer"
|
||||
@@ -466,14 +467,18 @@ Public Class frmMDMDatenverarbetiung
|
||||
Dim displayFilter = False
|
||||
Dim sqlstr As String = ""
|
||||
|
||||
sqlstr &= " SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType, trans.device_product_number AS CardNr,Sum(trans.transaction_gross_amount) AS [Transaction Amount], Sum(trans.total_gross_amount) AS [Total Amount]
|
||||
sqlstr &= " SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType,
|
||||
/*trans.device_product_number AS CardNr,*/
|
||||
Sum(trans.transaction_gross_amount) AS [Transaction Amount],
|
||||
Sum(trans.total_gross_amount) AS [Total Amount]
|
||||
FROM [VERAG].[dbo].[tblMSESettlements] as bills
|
||||
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
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.charged <> 1
|
||||
GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type, trans.device_product_number "
|
||||
GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type--, trans.device_product_number
|
||||
order by KundenNr"
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
'DataGridView.DataSource = dt
|
||||
@@ -500,7 +505,9 @@ Public Class frmMDMDatenverarbetiung
|
||||
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
|
||||
rpt.lblBrutto.Text = "Total Amount"
|
||||
rpt.lblNetto.Text = "Transaction Amount"
|
||||
|
||||
rpt.Label4.Text = rpt.lblNetto.Text
|
||||
rpt.Label2.Visible = False
|
||||
rpt.Label14.Text = rpt.lblBrutto.Text
|
||||
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
|
||||
|
||||
'Dim cnt As Integer = 0
|
||||
@@ -520,7 +527,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("KundenNr").Value, "")
|
||||
rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Name").Value, "")
|
||||
rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CardType").Value, "") & " - " & SQL.isDbnullEmpty(rpt.Fields.Item("Country").Value, "") & " - " & SQL.isDbnullEmpty(rpt.Fields.Item("CardNr").Value, "")
|
||||
rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CardType").Value, "") & " - " & SQL.isDbnullEmpty(rpt.Fields.Item("Country").Value, "") '& " - " & SQL.isDbnullEmpty(rpt.Fields.Item("CardNr").Value, "")
|
||||
|
||||
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount").Value, 2, "")
|
||||
rpt.lblMWST.Text = "" 'SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value) - CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value), 2, "")
|
||||
@@ -645,15 +652,15 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
.SET_SQL("SELECT Kundennummer, KundenNr, [Name 1], LandKz, Ort, /*Lieferland, Kartennummer,*/ Sum(Gesamtbetrag_Netto_in_Darstellwährung) AS Netto, Sum(Gesamtbetrag_Brutto_in_Darstellwährung) AS Brutto
|
||||
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, tblUTAImport.*
|
||||
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 tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer)
|
||||
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 (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
|
||||
AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart))
|
||||
AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland)
|
||||
AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart))
|
||||
ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp
|
||||
where temp.abgerechnet <> 1
|
||||
GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort", "FMZOLL")
|
||||
@@ -735,7 +742,10 @@ Public Class frmMDMDatenverarbetiung
|
||||
'Exit Sub
|
||||
'MsgBox(.sql)
|
||||
|
||||
.SET_SQL(" SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType, Sum(trans.transaction_gross_amount) As [Transaktionsbetrag],Sum(trans.USteuer_EUR) As [USt Betrag], Sum(trans.total_gross_amount) As [Gesamtbetrag_Brutto]
|
||||
.SET_SQL(" SELECT Adressen.AdressenNr as KundenNr, Adressen.[Name 1] as Name, trans.transaction_country AS Country,trans.device_product_type AS CardType,
|
||||
Sum(trans.transaction_gross_amount) As [Transaktionsbetrag],
|
||||
Sum(trans.msts_fee_amount) As [Transaktionskosten],
|
||||
Sum(trans.total_gross_amount) As [Gesamtbetrag]
|
||||
FROM [VERAG].[dbo].[tblMSESettlements] as bills
|
||||
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
|
||||
@@ -744,9 +754,8 @@ Public Class frmMDMDatenverarbetiung
|
||||
where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1
|
||||
GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type", "FMZOLL")
|
||||
|
||||
|
||||
.LOAD()
|
||||
'MsgBox(.GET_SQL())
|
||||
|
||||
If .Columns.Count > 0 Then
|
||||
|
||||
'.Columns("AdressenNr").HeaderText = "KdNr"
|
||||
@@ -796,16 +805,26 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
End If
|
||||
|
||||
Dim sumBto As Double = 0
|
||||
Dim sumNto As Double = 0
|
||||
Dim sumGes As Double = 0
|
||||
Dim sumFee As Double = 0
|
||||
Dim sumTr As Double = 0
|
||||
For Each r As DataGridViewRow In .Rows
|
||||
sumBto += If(IsNumeric(r.Cells("Gesamtbetrag_Brutto").Value), CDbl(r.Cells("Gesamtbetrag_Brutto").Value), 0)
|
||||
sumNto += If(IsNumeric(r.Cells("Transaktionsbetrag").Value), CDbl(r.Cells("Transaktionsbetrag").Value), 0)
|
||||
sumGes += If(IsNumeric(r.Cells("Gesamtbetrag").Value), CDbl(r.Cells("Gesamtbetrag").Value), 0)
|
||||
sumTr += If(IsNumeric(r.Cells("Transaktionsbetrag").Value), CDbl(r.Cells("Transaktionsbetrag").Value), 0)
|
||||
sumFee += If(IsNumeric(r.Cells("Transaktionskosten").Value), CDbl(r.Cells("Transaktionskosten").Value), 0)
|
||||
Next
|
||||
|
||||
txtAnzahl.Text = .Rows.Count
|
||||
txtPruefsummeNetto.Text = CDbl(sumNto).ToString("C2")
|
||||
txtPruefsummeBrutto.Text = CDbl(sumBto).ToString("C2")
|
||||
txtPruefsummeNetto.Text = CDbl(sumTr).ToString("C2")
|
||||
txtPruefsummeBrutto.Text = CDbl(sumGes).ToString("C2")
|
||||
txtTTRSum.Text = CDbl(sumFee).ToString("C2")
|
||||
|
||||
lblTTRSum.Visible = True
|
||||
txtTTRSum.Visible = True
|
||||
|
||||
lblTTRSum.Text = "Tr-Kosten"
|
||||
|
||||
|
||||
.ClearSelection()
|
||||
|
||||
End With
|
||||
@@ -990,9 +1009,9 @@ Public Class frmMDMDatenverarbetiung
|
||||
'top = " TOP 20 "
|
||||
Dim SQLStr = " SELECT Kundennummer AS [Customer ID], KundenNr AS [Customer Nr], UTAExportCSV,Rechnungsdruck
|
||||
FROM tblUTAFakturierwarenarten
|
||||
INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer)
|
||||
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 (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
|
||||
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 abgerechnet <> 1
|
||||
group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck"
|
||||
|
||||
@@ -1017,7 +1036,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
For Each csv As DataRow In distinctDT_CSV.Rows
|
||||
|
||||
Dim dt_CSV_selected = SQL.loadDgvBySql_Param("SELECT * FROM tblUTAImport where Kundennummer = " & csv.Item("Customer ID"), "FMZOLL")
|
||||
Dim dt_CSV_selected = SQL.loadDgvBySql_Param("SELECT * FROM tblUTAImportNew where Kundennummer = " & csv.Item("Customer ID"), "FMZOLL")
|
||||
dt_CSV_selected.ParentRelations.Clear()
|
||||
dt_CSV_selected.ChildRelations.Clear()
|
||||
dt_CSV_selected.Constraints.Clear()
|
||||
@@ -1055,7 +1074,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
If verarbOK Then
|
||||
'UPDATE Fakturiert
|
||||
SQL.doSQL("UPDATE [tblUTAImport] set abgerechnetDatum=GETDATE() where abgerechnetDatum is null and Kundennummer = " & UTA("Customer ID"), "FMZOLL")
|
||||
SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnetDatum=GETDATE() where abgerechnetDatum is null and Kundennummer = " & UTA("Customer ID"), "FMZOLL")
|
||||
|
||||
End If
|
||||
|
||||
@@ -1100,13 +1119,15 @@ Public Class frmMDMDatenverarbetiung
|
||||
Function genRGAtt_MSE() As Boolean
|
||||
Dim top = ""
|
||||
'top = " TOP 20 "
|
||||
Dim sqlWhere = IIf(test, " and (cust.[customer_id] = 12229 or cust.[customer_id] = 13236 or cust.[customer_id] = 11836 or cust.[customer_id] = 14385)", "") 'zum testem
|
||||
|
||||
Dim SQLStr = " SELECT distinct cust.customer_id as [Customer ID], Adressen.AdressenNr AS [Customer Nr], Adressen.MSEExportCSV, Adressen.Rechnungsdruck
|
||||
FROM [VERAG].[dbo].[tblMSESettlements] as bills
|
||||
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
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.charged <> 0 and (trans.transaction_gross_amount <> 0 or trans.[msts_fee_amount] <> 0)
|
||||
where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 and (trans.transaction_gross_amount <> 0 or trans.[msts_fee_amount] <> 0) " & sqlWhere & "
|
||||
order by cust.customer_id"
|
||||
|
||||
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200)
|
||||
@@ -1119,7 +1140,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
Dim cnt = 0
|
||||
If vbYes = MsgBox("Es wurden Daten von " & dt_Main.Rows.Count & " Kunden gefunden " & vbNewLine & " Möchten Sie die Anhänge erstellen?", vbYesNoCancel) Then
|
||||
|
||||
Dim dir = "F:\FMZoll\MSE\Archiv\" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString
|
||||
Dim dir = IIf(test, "C:\Users\d.breimaier\Desktop\MSE\", "F:\FMZoll\MSE\Archiv\" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString)
|
||||
|
||||
If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "")
|
||||
Directory.CreateDirectory(dir)
|
||||
@@ -1135,8 +1156,6 @@ Public Class frmMDMDatenverarbetiung
|
||||
SELECT controller_id as [Controller ID], 'VERAG 360 GmbH' as [Controller Name] , inv.[invoice_id] as [Invoice ID], inv.invoice_date as [Invoice Date],
|
||||
cust.customer_id as [Customer ID], cust.partner_customer_number as [Customer No], cust.customer_name as [Customer name], bills.specification_page_name as [Specification Page], bills.specification_page_id as [Specification ID], trans.purchase_datetime as [Transaction date], trans.transaction_id as [Transaction ID],
|
||||
trans.supplier_name as [Transaction Supplier/Terminal], trans.transaction_country as [Transaction Country], trans.transaction_product_name as [Product description], trans.transaction_product_id as [Product Description ID], trans.device_product_type as [Card Type], trans.device_product_number as [Card number], trans.license_plate_number as [Load File Licence Plate Number],
|
||||
|
||||
|
||||
'' as [Card Licence Plate Number], trans.license_plate_number as [Truck Licence Plate Number], '' as [Truck Fleet Code], '' as [Truck Driver Name], trans.entry_point_name as [Entry Terminal/Direction], trans.entry_datetime as [Start date], trans.entry_datetime as [Start Time], trans.exit_point_name as [Exit Terminal Description], trans.exit_datetime as [End Date], trans.exit_datetime as [End Time],
|
||||
'' as [Eurovignet K-Number], '' as [LKW-Kostenstelle], trans.original_net_amount as [Original Nett Amount], trans.original_vat_amount as [Original VAT Amount], trans.original_gross_amount as [Original Amount], trans.original_currency as [Original Currency],
|
||||
trans.transaction_gross_amount as [Transaction Amount ( EUR )], trans.msts_fee_amount as [Admin Fee Amount ( EUR )], '' as [Fees and Costs Amount ( EUR )], trans.msts_vat_amount as [VAT Amount ( EUR )],trans.total_gross_amount as [Total Amount ( EUR )], '' as [Total Dutch VAT ( EUR )], '' as [Total Foreign VAT ( EUR )], trans.[USteuer_EUR] as [USteuer_EUR]
|
||||
@@ -1172,7 +1191,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
For Each MSE In dt_Main.Rows
|
||||
|
||||
Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
|
||||
Dim verarbOK = True
|
||||
Dim verarbOK = IIf(test, False, True)
|
||||
|
||||
If Not gen_SPEDBUCH_ByKdNr(MSE("Customer Nr"), SPEDBUCH, "MSE") Then verarbOK = False
|
||||
If Not gen_RECHNUNG_BySPEDBUCH(MSE("Customer Nr"), SPEDBUCH, "MSE") Then verarbOK = False
|
||||
@@ -1200,6 +1219,8 @@ Public Class frmMDMDatenverarbetiung
|
||||
cnt += 1
|
||||
Next
|
||||
|
||||
If test Then Return True
|
||||
|
||||
' ANHÄNGE WERDEN NCIHT BENÖTIGT::
|
||||
'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren
|
||||
Dim dirAnhang = "F:\FMZoll\MSE\Anlagen\" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString
|
||||
@@ -1276,7 +1297,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
End If
|
||||
|
||||
If vbYes = MsgBox(Info & vbNewLine & "Möchten Sie die Rechnungen + Anhänge erstellen?", vbYesNoCancel) Then
|
||||
Dim dir = "F:\FMZoll\Maut\AT\Anlagen" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "\Test", "") '"C:\Users\d.breimaier\Desktop\Asfinag\Mautberichte"
|
||||
Dim dir = "F:\FMZoll\Maut\AT\Anlagen" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "\Test", "") '"C:\Users\d.breimaier\Desktop\Asfinag\Mautberichte"
|
||||
|
||||
If Not Directory.Exists(dir) Then
|
||||
Directory.CreateDirectory(dir)
|
||||
@@ -1689,10 +1710,10 @@ Public Class frmMDMDatenverarbetiung
|
||||
qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung AS [Total Amount],
|
||||
qryUTA_Fakturierungspositionen.Gesamtbetrag_Netto_in_Darstellwährung AS [Nett Amount],
|
||||
qryUTA_Fakturierungspositionen.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung AS [VAT Amount]
|
||||
|
||||
|
||||
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, tblUTAImport.*
|
||||
FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.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 (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
|
||||
(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 Offertenpositionen.KundenNr=" & sqlWhere & "
|
||||
) as qryUTA_Fakturierungspositionen
|
||||
WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))
|
||||
@@ -1787,17 +1808,16 @@ Public Class frmMDMDatenverarbetiung
|
||||
trans.device_product_number as [Card Number],
|
||||
trans.entry_point_name as [Entry Terminal],
|
||||
trans.exit_point_name as [Exit Terminal],
|
||||
sum(trans.total_gross_amount) - sum(trans.USteuer_EUR) As [Nett Amount],
|
||||
Sum(trans.USteuer_EUR) As [VAT Amount],
|
||||
Sum(trans.total_gross_amount) As [Total Amount]
|
||||
case when trans.device_product_type like '%System Fee' then (msts_fee_amount + transaction_gross_amount) - trans.USteuer_EUR else transaction_gross_amount - trans.USteuer_EUR End As [Nett Amount],
|
||||
trans.USteuer_EUR As [VAT Amount],
|
||||
case when trans.device_product_type like '%System Fee' then msts_fee_amount + transaction_gross_amount else transaction_gross_amount End as [Total Amount]
|
||||
From [VERAG].[dbo].[tblMSESettlements] as bills
|
||||
left Join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
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 &
|
||||
"GROUP BY Adressen.AdressenNr,trans.license_plate_number,cast(trans.[purchase_datetime] as Date), trans.transaction_country,trans.device_product_type, trans.device_product_number, trans.entry_point_name ,trans.exit_point_name
|
||||
order by Adressen.AdressenNr "
|
||||
"order by Adressen.AdressenNr "
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
|
||||
@@ -2066,8 +2086,8 @@ Public Class frmMDMDatenverarbetiung
|
||||
qryUTA_Fakturierungspositionen.Lieferzeit AS [Transaction Time], qryUTA_Fakturierungspositionen.Lieferland AS [Transaction Country], qryUTA_Fakturierungspositionen.Warenart AS [Product description], qryUTA_Fakturierungspositionen.Fakturierwarenart AS [Product Description ID], qryUTA_Fakturierungspositionen.Kartentyp AS [Card Type], qryUTA_Fakturierungspositionen.Kartennummer AS [Card number],
|
||||
isnull([KFZ_Kennzeichen_komprimiert],isnull([KFZ_Kennzeichen],isnull([Prägetext_i_d_R_KFZ_Kennzeichen],''))) AS LicencePlateNumber, qryUTA_Fakturierungspositionen.Autobahnauffahrt AS [Entry Terminal/Direction], qryUTA_Fakturierungspositionen.Autobahnausfahrt AS [Exit Terminal Description], qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung AS [Transaction Amount ( EUR )]
|
||||
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, tblUTAImport.*
|
||||
FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.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 (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
|
||||
(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 Offertenpositionen.KundenNr='" & KdNr & "'
|
||||
) as qryUTA_Fakturierungspositionen
|
||||
WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))
|
||||
@@ -2256,13 +2276,18 @@ Public Class frmMDMDatenverarbetiung
|
||||
trans.supplier_name as [Transaction Supplier/Terminal], trans.transaction_country as [Transaction Country], trans.transaction_product_name as [Product description], trans.purchase_datetime as [Transaction date],trans.device_product_type as [Card Type], trans.device_product_number as [Card number], trans.license_plate_number as [LicencePlateNumber],
|
||||
trans.entry_point_name as [Entry Terminal/Direction], trans.entry_datetime as [Start date], trans.entry_datetime as [Start Time], trans.exit_point_name as [Exit Terminal Description], trans.exit_datetime as [End Date], trans.exit_datetime as [End Time],
|
||||
trans.original_net_amount as [Original Nett Amount], trans.original_vat_amount as [Original VAT Amount], trans.original_gross_amount as [Original Amount], trans.original_currency as [Original Currency],
|
||||
trans.transaction_gross_amount as [Transaction Amount ( EUR )], trans.msts_fee_amount as [Admin Fee Amount ( EUR )], '' as [Fees and Costs Amount ( EUR )], trans.msts_vat_amount as [VAT Amount ( EUR )],trans.total_gross_amount as [Total Amount ( EUR )], '' as [Total Dutch VAT ( EUR )], '' as [Total Foreign VAT ( EUR )], trans.[USteuer_EUR] as [USteuer_EUR]
|
||||
case when trans.device_product_type like '%System Fee' then msts_fee_amount + transaction_gross_amount
|
||||
else transaction_gross_amount End as [Transaction Amount ( EUR )],
|
||||
trans.msts_fee_amount as [Admin Fee Amount ( EUR )], '' as [Fees and Costs Amount ( EUR )],
|
||||
trans.msts_vat_amount as [VAT Amount ( EUR )],trans.total_gross_amount as [Total Amount ( EUR )],
|
||||
'' as [Total Dutch VAT ( EUR )],
|
||||
'' as [Total Foreign VAT ( EUR )], trans.[USteuer_EUR] as [USteuer_EUR]
|
||||
|
||||
FROM [VERAG].[dbo].[tblMSESettlements] as bills
|
||||
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
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
|
||||
where bills.invoice_date = '" & DateTimePicker2.Text & "' and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & MSEKdNr
|
||||
|
||||
where bills.invoice_date = '" & DateTimePicker2.Text & "' and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & MSEKdNr & " order by trans.license_plate_number"
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
If dt Is DBNull.Value Then Return ""
|
||||
@@ -2290,7 +2315,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
rpt.txtMWSTKatSum.Visible = False
|
||||
rpt.lblMWST.Visible = False
|
||||
|
||||
rpt.lblBrutto.Text = "Total Amount ( EUR )"
|
||||
rpt.lblBrutto.Text = "Transaction Amount(EUR)"
|
||||
rpt.Label4.Text = bis.ToShortDateString
|
||||
rpt.Label2.Text = "MSE-KundenNr:"
|
||||
rpt.TextBox1.Text = MSEKdNr
|
||||
@@ -2339,11 +2364,11 @@ Public Class frmMDMDatenverarbetiung
|
||||
rpt.txtDatum.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Transaction Date").Value, "")
|
||||
rpt.txtEingang.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Card Type").Value, "")
|
||||
|
||||
rpt.txtNetto.Text = "" 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_NettobetragWaehrungAbbuchung").Value, 2, "")
|
||||
rpt.txtNetto.Text = "" 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").Value, 2, "")
|
||||
rpt.txtMWST.Text = "" 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetragWaehrungAbbuchung").Value, 2, "")
|
||||
rpt.txtBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").Value, 2, "")
|
||||
|
||||
sumNetto += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_NettobetragWaehrungAbbuchung").Value, 4, 0)
|
||||
sumNetto += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").Value, 4, 0)
|
||||
sumMWST += 0 'SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetragWaehrungAbbuchung").Value, 4, 0)
|
||||
sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Transaction Amount ( EUR )").Value, 4, 0)
|
||||
cnt += 1
|
||||
@@ -2656,7 +2681,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
SPEDBUCH.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
|
||||
|
||||
Return SPEDBUCH.SAVE
|
||||
Return IIf(test, True, SPEDBUCH.SAVE)
|
||||
|
||||
Catch ex As System.Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
@@ -2982,13 +3007,13 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
useNettogesamtbetrag = False
|
||||
|
||||
sqlstr = " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.Fakturierwarenart,sum(tblUTAImport.Gesamtbetrag_Netto_in_Lieferlandwährung) as Netto ,sum(tblUTAImport.Gesamtbetrag_Brutto_in_Lieferlandwährung) as Brutto
|
||||
sqlstr = " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.Fakturierwarenart,sum(tblUTAImportNew.Gesamtbetrag_Netto_in_Lieferlandwährung) as Netto ,sum(tblUTAImportNew.Gesamtbetrag_Brutto_in_Lieferlandwährung) as Brutto
|
||||
FROM tblUTAFakturierwarenarten
|
||||
INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer)
|
||||
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 (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart
|
||||
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 Offertenpositionen.LeistungsNr is not null AND Offertenpositionen.OffertenNr = " & OffertenNr & " AND Offertenpositionen.KundenNr = " & KdNr &
|
||||
"group by Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart,tblUTAImport.Fakturierwarenart"
|
||||
"group by Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart,tblUTAImportNew.Fakturierwarenart"
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
|
||||
@@ -3007,6 +3032,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
|
||||
Case "MSE"
|
||||
'des is da schass!!!!
|
||||
' Case 23 'MSE Maut
|
||||
'5070 Select Case ![LeistungsNr]
|
||||
' Case 134 'Frejus - Tunnelmaut (20.01.2011)
|
||||
@@ -3020,6 +3046,11 @@ Public Class frmMDMDatenverarbetiung
|
||||
'5150 End If
|
||||
'5160 rst.Close
|
||||
'5170 Set rst = Nothing
|
||||
|
||||
'qryReErfSchOpt6BeträgeLNr134
|
||||
|
||||
|
||||
|
||||
'5180 Case 141 'MSC Ressa - alle Länder
|
||||
'5190 Set rst = OpenParameterQuery("qryReErfSchOpt6BeträgeLNr141", eOpensnapshot, "prmAdressenNr:=" & rstRK![RechnungsKundenNr])
|
||||
'5200 If Not rst.EOF Then
|
||||
@@ -3031,6 +3062,10 @@ Public Class frmMDMDatenverarbetiung
|
||||
'5260 End If
|
||||
'5270 rst.Close
|
||||
'5280 Set rst = Nothing
|
||||
|
||||
'qryReErfSchOpt6BeträgeLNr141
|
||||
|
||||
|
||||
'5290 Case Else 'alle anderen MSE Transactions
|
||||
'5300 Set rst = OpenParameterQuery("qryReErfSchOpt6Beträge", eOpensnapshot, "prmAdressenNr:=" & rstRK![RechnungsKundenNr], "prmLeistungsNr:=" & ![LeistungsNr])
|
||||
'5310 If Not rst.EOF Then
|
||||
@@ -3044,17 +3079,24 @@ Public Class frmMDMDatenverarbetiung
|
||||
'5390 Set rst = Nothing
|
||||
'5400 End Select
|
||||
|
||||
'qryReErfSchOpt6Beträge
|
||||
|
||||
|
||||
|
||||
useNettogesamtbetrag = False
|
||||
|
||||
sqlstr = "select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , sum(trans.total_gross_amount) as Brutto, sum(trans.total_gross_amount) - sum(trans.USteuer_EUR) as Netto
|
||||
'alles steuerfrei also Brutto = Netto
|
||||
sqlstr = "select customer_id, LeistungsNr, sum(Netto) as Netto, Sum (Brutto) as Brutto from (select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr ,
|
||||
case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount)
|
||||
else sum(transaction_gross_amount) End as Netto,
|
||||
case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount)
|
||||
else sum(transaction_gross_amount) End as Brutto
|
||||
FROM [VERAG].[dbo].[tblMSESettlements] as bills
|
||||
inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
inner join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
|
||||
INNER JOIN tblMSELeistungen ON (tblMSELeistungen.[Card Type] = trans.device_product_type) AND (tblMSELeistungen.[Transaction Country] = trans.transaction_country)
|
||||
INNER JOIN Offertenpositionen ON cust.partner_customer_number = Offertenpositionen.KundenNr and tblMSELeistungen.LeistungsNr = Offertenpositionen.LeistungsNr and Offertenpositionen.OffertenNr = " & OffertenNr & "
|
||||
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
|
||||
left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
|
||||
left JOIN tblMSELeistungen ON (tblMSELeistungen.[Card Type] = trans.device_product_type) AND (tblMSELeistungen.[Transaction Country] = trans.transaction_country)
|
||||
left JOIN Offertenpositionen ON cust.partner_customer_number = Offertenpositionen.KundenNr and tblMSELeistungen.LeistungsNr = Offertenpositionen.LeistungsNr and Offertenpositionen.OffertenNr = " & OffertenNr & "
|
||||
where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged = 0 and cust.[partner_customer_number] = " & KdNr & "
|
||||
group by cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , Offertenpositionen.LeistungsBez"
|
||||
group by cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , Offertenpositionen.LeistungsBez ) as temp group by customer_id, LeistungsNr"
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
|
||||
@@ -3087,7 +3129,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
Call usrCntlFaktAbrechnung.przPP(RG) ' Porto/Papiere errechnen
|
||||
Call usrCntlFaktAbrechnung.przBS415(RG) ' Bankspesen errechnen
|
||||
|
||||
Return RG.SAVE
|
||||
Return IIf(test, True, RG.SAVE)
|
||||
|
||||
Catch ex As System.Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
@@ -3380,23 +3422,23 @@ Public Class frmMDMDatenverarbetiung
|
||||
pruefData_UTA = True
|
||||
Try
|
||||
|
||||
Dim dtUTAKundennummern As DataTable = SQL.loadDgvBySql("SELECT Distinct(tblUTAImport.Kundennummer)
|
||||
FROM tblUTAImport LEFT JOIN Adressen ON tblUTAImport.Kundennummer = Adressen.UTAKundenNr
|
||||
GROUP BY tblUTAImport.Kundennummer, Adressen.UTAKundenNr
|
||||
Dim dtUTAKundennummern As DataTable = SQL.loadDgvBySql("SELECT Distinct(tblUTAImportNew.Kundennummer)
|
||||
FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr
|
||||
GROUP BY tblUTAImportNew.Kundennummer, Adressen.UTAKundenNr
|
||||
HAVING (((Adressen.UTAKundenNr) Is Null))", "FMZOLL")
|
||||
|
||||
If dtUTAKundennummern.Rows.Count > 0 Then
|
||||
|
||||
pruefData_UTA = False
|
||||
|
||||
If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer").Value = "868070" Then pruefData_UTA = True 'ist VERAG -> OK
|
||||
If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer") = 868070 Then pruefData_UTA = True 'ist VERAG -> OK
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Dim dtUTAFakturierwarenarten As DataTable = SQL.loadDgvBySql("SELECT tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland
|
||||
FROM tblUTAImport LEFT JOIN tblUTALeistungen ON (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
|
||||
GROUP BY tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
|
||||
Dim dtUTAFakturierwarenarten As DataTable = SQL.loadDgvBySql("SELECT tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland
|
||||
FROM tblUTAImportNew LEFT JOIN tblUTALeistungen ON (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland)
|
||||
GROUP BY tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
|
||||
HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))", "FMZOLL")
|
||||
|
||||
|
||||
@@ -3406,7 +3448,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
End If
|
||||
|
||||
Dim dtUTAOffertenPositionen As DataTable = SQL.loadDgvBySql("SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2", "FMZOLL")
|
||||
Dim dtUTAOffertenPositionen As DataTable = SQL.loadDgvBySql("SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2_new", "FMZOLL")
|
||||
|
||||
If dtUTAOffertenPositionen.Rows.Count > 0 Then
|
||||
|
||||
@@ -3626,7 +3668,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
PictureBox1.Visible = True
|
||||
End If
|
||||
Case "UTA"
|
||||
If SQL.doSQL("UPDATE [tblUTAImport] set abgerechnet=1 where abgerechnetDatum is not null and abgerechnet <> 1", "FMZOLL") Then
|
||||
If SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnet=1 where abgerechnetDatum is not null and abgerechnet <> 1", "FMZOLL") Then
|
||||
PictureBox1.Visible = True
|
||||
End If
|
||||
Case "MSE"
|
||||
@@ -3773,6 +3815,7 @@ Public Class frmMDMDatenverarbetiung
|
||||
txtTTRSum.Text = CDbl(pruefSumTTR).ToString("C2")
|
||||
lblTTRSum.Visible = True
|
||||
txtTTRSum.Visible = True
|
||||
lblTTRSum.Text = "Prüfsumme TTR:"
|
||||
Else
|
||||
lblTTRSum.Visible = False
|
||||
txtTTRSum.Visible = False
|
||||
|
||||
Reference in New Issue
Block a user