From 2a3866f66cf75d2703bc6d9b21a8b26c0fe2ef8b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 10 Dec 2024 11:39:24 +0100 Subject: [PATCH] MSE, USTVA --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 1 - SDL/USTV/frmMDM_USTVAntrag.vb | 29 ++++++++++--------- .../Schnittstellen/MSE/cMSEAPI.vb | 4 +-- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 150586d9..6548ea2e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -715,7 +715,6 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTVPositionen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTVPositionen.Location = New System.Drawing.Point(0, 0) - Me.dgvUSTVPositionen.MultiSelect = False Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" Me.dgvUSTVPositionen.ReadOnly = True Me.dgvUSTVPositionen.RowHeadersVisible = False diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 48677e56..500e6f37 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -412,19 +412,22 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_Schnittstelle = True USTV_POS.UStVPo_Leistungsbezeichnung = "Maut" USTV_POS.UStVPo_Leistender = ANTRAG.plose_Lieferant - USTV_POS.UStVPo_Leistender = USTV_POS.UStVPo_Leistender.ToString.Replace("", "PLOSE Sistem Service") + If ANTRAG.plose_Lieferant = "PLOSE Then Sistem Service" Then + USTV_POS.UStVPo_Leistender = USTV_POS.UStVPo_Leistender.ToString.Replace("", "PLOSE Sistem Service") + End If + USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - USTV_POS.UStVPo_Zeitstempel = Now() - ' Berechnungen - USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(ANTRAG.plose_MWSTBetragWaehrungAbbuchung, USTV_ANTRAG.UStVAn_Währungscode, "EUR") - 'USTV_POS.UStVPo_Umrechnungskurs = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuroKurs(ANTRAG.plose_WaehrungAbbuchung, ANTRAG.plose_RechnungsDatum) - USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung - USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag - ' MsgBox(ANTRAG.plose_Lieferant & " - " & ANTRAG.plose_RechnungsDatum & " - " & ANTRAG.plose_RechnungsNr & " :::::::::: " & CDbl(ANTRAG.plose_MWSTBetrag).ToString("C2")) + USTV_POS.UStVPo_Zeitstempel = Now() + ' Berechnungen + USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(ANTRAG.plose_MWSTBetragWaehrungAbbuchung, USTV_ANTRAG.UStVAn_Währungscode, "EUR") + 'USTV_POS.UStVPo_Umrechnungskurs = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuroKurs(ANTRAG.plose_WaehrungAbbuchung, ANTRAG.plose_RechnungsDatum) + USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung + USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag + ' MsgBox(ANTRAG.plose_Lieferant & " - " & ANTRAG.plose_RechnungsDatum & " - " & ANTRAG.plose_RechnungsNr & " :::::::::: " & CDbl(ANTRAG.plose_MWSTBetrag).ToString("C2")) - USTV_POS.INSERT() - End If + USTV_POS.INSERT() + End If Next 'Einträge als archivert setzen ' vormals wichtig @@ -616,10 +619,10 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr USTV_POS.UStVPo_ReDat = r.Item("invoice_date") - USTV_POS.UStVPo_ReNr = r.Item("invoice_number") & " - " & kdNr + USTV_POS.UStVPo_ReNr = r.Item("invoice_number") & " - " & kdNr & IIf(Antrag_LandKz = "BE", "/Belgium", "") USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr - If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then + If Not alreadyExistsMitLeistungsBez(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then USTV_POS.UStVPo_Schnittstelle = True USTV_POS.UStVPo_Leistungsbezeichnung = r.Item("specification_page_name") @@ -1009,7 +1012,7 @@ Public Class frmMDM_USTVAntrag Case 5 'UNIONTANK - UTA - OK ' UStV-Antragsnummer in tblUTAArchiv löschen. sqlText = - "UPDATE tblUTAArchiv SET tblUTAArchiv.UStVAn_ID = [prmUStVAn_ID] FROM tblUTAArchiv INNER JOIN Adressen ON tblUTAArchiv.Kundennummer = Adressen.UTAKundenNr + "UPDATE tblUTAArchiv SET tblUTAArchiv.UStVAn_ID = NULL FROM tblUTAArchiv INNER JOIN Adressen ON tblUTAArchiv.Kundennummer = Adressen.UTAKundenNr WHERE tblUTAArchiv.Rechnungsdatum='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' AND tblUTAArchiv.Rechnungsnummer_pro_Lieferland=" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " AND tblUTAArchiv.Lieferland='" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO3LandFromLandNr(USTV_ANTRAG.UStVAn_LandNr) & "' diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index bfb26728..989bdab5 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -1366,13 +1366,13 @@ Public Class cMSEAPI Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("select * from ( select cust.[customer_id],bills.invoice_date, bills.invoice_number, 'MAUT' as specification_page_name/*bills.specification_page_name*/, trans.original_currency ,sum(USteuer_EUR) as UST_EUR, sum(original_vat_amount) as UST + Using cmd As New SqlCommand("select * from ( select cust.[customer_id],bills.invoice_date, bills.invoice_number, bills.specification_page_name, trans.original_currency ,sum(USteuer_EUR) as UST_EUR, sum(original_vat_amount) as UST 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.customer_number = cust.customer_id and bills.invoice_date = inv.invoice_date and inv.country = trans.transaction_country where bills.invoice_date Between '" & von & "' And '" & bis & "'and trans.charged = 1 and cust.[partner_customer_number] = " & KundenNr & " and trans.transaction_country = '" & LandKZ & "' and trans.original_currency = '" & Wahrungscode & "' AND isnull(inv.archiv,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) & " - group by bills.invoice_date, bills.invoice_number, cust.[customer_id], /*bills.specification_page_name*/specification_page_name, trans.original_currency) as temp + group by bills.invoice_date, bills.invoice_number, cust.[customer_id], bills.specification_page_name, trans.original_currency) as temp where temp.UST <> 0", conn) cmd.Parameters.AddWithValue("@von", von)