From 54e964382364cc7678e48f22ea61a904d8f57897 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 2 Dec 2024 09:15:04 +0100 Subject: [PATCH] Kunden, Zollauswertung, MDM, eRechnung (aktuell noch deaktiviert!) --- SDL/Fakturierung/cFakturierung.vb | 106 ++++- SDL/Fakturierung/rptRechnungDruck.Designer.vb | 18 +- .../usrcntlVollmacht_MDM_NICHT_EU.vb | 15 +- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/USTV/frmMDM_USTVAntrag.vb | 72 ++- SDL/USTV/frmUSTVoffeneAntraege.vb | 117 +++-- SDL/USTV/usrCntlUSTV.vb | 18 + SDL/kunden/usrcntlKundeBearbeitenFull.vb | 431 ++++++++++-------- SDL/mdm/frmMDMDatenverarbetiung.vb | 210 +++------ SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 346 +++++++------- VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb | 83 ++++ VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb | 2 +- .../DATENSERVER/cDATENSERVER.vb | 23 + .../Schnittstellen/MSE/cMSEAPI.vb | 4 +- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 8 + 15 files changed, 868 insertions(+), 589 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 77d47fdf..cb8e00ff 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1,12 +1,11 @@  Imports System.Globalization Imports System.Net -Imports awt.ShellApi -Imports com.sun.org.apache.xerces.internal.impl.dv.xs -Imports com.sun.org.apache.xml.internal.serializer -Imports java.awt.geom +Imports System.Xml +Imports itextsharp.text.pdf Imports Microsoft.Office.Interop -Imports VERAG_PROG_ALLGEMEIN.TESTJSON +Imports VERAG_PROG_ALLGEMEIN.Spire.Pdf +Imports VERAG_PROG_ALLGEMEIN.Spire.Pdf.Attachments Public Class cFakturierung @@ -1528,16 +1527,23 @@ Public Class cFakturierung rpt.Document.Printer.PrinterName = PrinterName End If rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize - '-------------------------------- 'Immer Exportieren, da in Therefore speichern Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False) Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport rpt.Run(False) p.NeverEmbedFonts = "" + p.Export(rpt.Document, tmpPath) + + + 'e-Rechnung ZUGFeRD aktuell noch deaktiviert! + If False Then tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(RECHNUNG)) + Path = tmpPath + + 'THEREFORE IMPORT: '------------------------------------------------------------------------------- Try @@ -1722,6 +1728,94 @@ Public Class cFakturierung Return False End Function + Shared Function createZUGFeRD(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang) As String + + ' ZUGFeRD XML-Dokument erzeugen + Dim zugferdXml As New XmlDocument() + + ' Root-Element (Invoice) erstellen + Dim root As XmlElement = zugferdXml.CreateElement("Invoice") + ' Namespaces definieren + root.SetAttribute("xmlns", "urn:ferd:zugferd:invoice:1p0") + root.SetAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance") + root.SetAttribute("xsi:schemaLocation", "urn:ferd:zugferd:invoice:1p0 ZugferdInvoice_1p0.xsd") + + zugferdXml.AppendChild(root) + + ' ZUGFeRD Header + Dim header As XmlElement = zugferdXml.CreateElement("Header") + root.AppendChild(header) + + ' Absender und Empfänger + Dim sender As XmlElement = zugferdXml.CreateElement("Seller") + sender.SetAttribute("name", RECHNUNG.AbsenderName_1) + sender.SetAttribute("address", RECHNUNG.AbsenderStraße & ", " & RECHNUNG.AbsenderOrt) + header.AppendChild(sender) + + Dim recipient As XmlElement = zugferdXml.CreateElement("Buyer") + recipient.SetAttribute("name", RECHNUNG.EmpfängerName_1) + recipient.SetAttribute("address", RECHNUNG.EmpfängerStraße & ", " & RECHNUNG.EmpfängerOrt) + header.AppendChild(recipient) + + ' Rechnungsdaten + Dim invoiceDetails As XmlElement = zugferdXml.CreateElement("InvoiceDetails") + root.AppendChild(invoiceDetails) + + ' Rechnungsnummer und -datum + Dim invoiceNumber As XmlElement = zugferdXml.CreateElement("InvoiceNumber") + invoiceNumber.InnerText = RECHNUNG.RechnungsNr + invoiceDetails.AppendChild(invoiceNumber) + + Dim invoiceDate As XmlElement = zugferdXml.CreateElement("InvoiceDate") + invoiceDate.InnerText = RECHNUNG.RechnungsDatum + invoiceDetails.AppendChild(invoiceDate) + + For Each pos In RECHNUNG.POSITIONEN + + + + ' Rechnungspositionen (Artikel) + Dim items As XmlElement = zugferdXml.CreateElement("Items") + invoiceDetails.AppendChild(items) + + Dim item As XmlElement = zugferdXml.CreateElement("Item") + items.AppendChild(item) + + ' Artikelbeschreibung und Preis + Dim description As XmlElement = zugferdXml.CreateElement("Description") + description.InnerText = pos.LeistungsBez + item.AppendChild(description) + + Dim quantity As XmlElement = zugferdXml.CreateElement("Quantity") + quantity.InnerText = pos.Anzahl + item.AppendChild(quantity) + + Dim unitPrice As XmlElement = zugferdXml.CreateElement("UnitPrice") + unitPrice.InnerText = pos.Preis + item.AppendChild(unitPrice) + + Next + + ' Gesamtsumme + Dim totalAmount As XmlElement = zugferdXml.CreateElement("TotalAmount") + totalAmount.InnerText = RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + invoiceDetails.AppendChild(totalAmount) + + ' Zahlungstermine und -bedingungen + Dim paymentTerms As XmlElement = zugferdXml.CreateElement("PaymentTerms") + paymentTerms.InnerText = RECHNUNG.TextZZ + invoiceDetails.AppendChild(paymentTerms) + + + Dim tmpPathZugpferd = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("ZUGFeRD_Invoice", ".xml", , False) + zugferdXml.Save(tmpPathZugpferd) + + + + Return tmpPathZugpferd + + End Function + Shared Sub printSpedBuchAnhaenge(RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional printStb As Boolean = False, Optional printVbD As Boolean = False) Try Dim SPEDBCUH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RG.FilialenNr, RG.AbfertigungsNr, RG.SpeditionsbuchUnterNr) diff --git a/SDL/Fakturierung/rptRechnungDruck.Designer.vb b/SDL/Fakturierung/rptRechnungDruck.Designer.vb index 90eca16e..5f3c3175 100644 --- a/SDL/Fakturierung/rptRechnungDruck.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck.Designer.vb @@ -496,19 +496,19 @@ Partial Public Class rptRechnungDruck ' 'lblFirmaOrt ' - Me.lblFirmaOrt.Height = 0.1181102! + Me.lblFirmaOrt.Height = 0.1606298! Me.lblFirmaOrt.HyperLink = Nothing Me.lblFirmaOrt.Left = 0.01417317! Me.lblFirmaOrt.Name = "lblFirmaOrt" Me.lblFirmaOrt.Style = "font-size: 7pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & "o-char-set: 1" Me.lblFirmaOrt.Text = "A-4975 Suben" - Me.lblFirmaOrt.Top = 0.7503937! + Me.lblFirmaOrt.Top = 0.7078741! Me.lblFirmaOrt.Width = 1.19685! ' 'lblFirmaStrasse ' - Me.lblFirmaStrasse.Height = 0.1181102! + Me.lblFirmaStrasse.Height = 0.1598426! Me.lblFirmaStrasse.HyperLink = Nothing Me.lblFirmaStrasse.Left = 0.01417319! Me.lblFirmaStrasse.Name = "lblFirmaStrasse" @@ -520,19 +520,19 @@ Partial Public Class rptRechnungDruck ' 'lblFirmaTel ' - Me.lblFirmaTel.Height = 0.1181103! + Me.lblFirmaTel.Height = 0.1606299! Me.lblFirmaTel.HyperLink = Nothing Me.lblFirmaTel.Left = 1.45748! Me.lblFirmaTel.Name = "lblFirmaTel" Me.lblFirmaTel.Style = "font-size: 7pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & "o-char-set: 1" Me.lblFirmaTel.Text = "Tel. +43 7711 2777 - 0" - Me.lblFirmaTel.Top = 0.7503937! + Me.lblFirmaTel.Top = 0.7078741! Me.lblFirmaTel.Width = 1.240158! ' 'lblFirmaFax ' - Me.lblFirmaFax.Height = 0.1181103! + Me.lblFirmaFax.Height = 0.1598426! Me.lblFirmaFax.HyperLink = Nothing Me.lblFirmaFax.Left = 1.45748! Me.lblFirmaFax.Name = "lblFirmaFax" @@ -544,19 +544,19 @@ Partial Public Class rptRechnungDruck ' 'lblFirmaEmail ' - Me.lblFirmaEmail.Height = 0.1181103! + Me.lblFirmaEmail.Height = 0.1606299! Me.lblFirmaEmail.HyperLink = Nothing Me.lblFirmaEmail.Left = 2.697638! Me.lblFirmaEmail.Name = "lblFirmaEmail" Me.lblFirmaEmail.Style = "font-size: 7pt; font-weight: normal; text-align: right; vertical-align: middle; d" & "do-char-set: 1" Me.lblFirmaEmail.Text = "rechnungsversand@verag.ag" - Me.lblFirmaEmail.Top = 0.7503937! + Me.lblFirmaEmail.Top = 0.7078741! Me.lblFirmaEmail.Width = 1.436614! ' 'lblFirmaWeb ' - Me.lblFirmaWeb.Height = 0.1181103! + Me.lblFirmaWeb.Height = 0.1598423! Me.lblFirmaWeb.HyperLink = Nothing Me.lblFirmaWeb.Left = 2.697638! Me.lblFirmaWeb.Name = "lblFirmaWeb" diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb index 8704be86..e111824d 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb @@ -177,27 +177,18 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU Private Sub cboLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboLand.SelectedIndexChanged Dim privatfirma As Boolean = False - Select Case cboLand._value + txtAnzahlAusdrucke.Text = 1 + + Select Case cboLand._value Case "PL" cbxPrintDateAndCity.Checked = False Case "NL" privatfirma = True Case "HR" privatfirma = True - txtAnzahlAusdrucke.Text = 10 - Case "AT" - txtAnzahlAusdrucke.Text = 10 - Case "LU" - txtAnzahlAusdrucke.Text = 5 - Case "IT" - txtAnzahlAusdrucke.Text = 1 Case Else privatfirma = False - txtAnzahlAusdrucke.Text = 1 - - - End Select If Not privatfirma Then diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 15100e11..b13904de 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 52d98160..3517cdda 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -125,6 +125,7 @@ Public Class frmMDM_USTVAntrag Case 4 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblMSEInvoices] as inv inner join tblMSECustomers on inv.customer_number = customer_id where invoice_date='" & r.Cells("UStVPo_ReDat").Value & "' and country='" & Antrag_LandKz & "' AND partner_customer_number = " & USTV_ANTRAG.UStVAn_KuNr & " AND daId is not null", "FMZOLL",,, -1) Case 5 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblUTAImportNew] where Rechnungsdatum='" & r.Cells("UStVPo_ReDat").Value & "' and Abrechnungsnummer='" & r.Cells("UStVPo_ReNr").Value & "' and Lieferland_ISO2='" & Antrag_LandKz & "' AND daId is not null", "FMZOLL",,, -1) Case 7 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & r.Cells("UStVPo_ReDat").Value & "' and rmc_reNr='" & r.Cells("UStVPo_ReNr").Value & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1) + Case 8 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) tblIDSInvoicesNew.daId FROM [tblIDSTransactionsNew] INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode LEFT JOIN tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber where tblIDSTransactionsNew.[YearMonthDay] ='" & r.Cells("UStVPo_ReDat").Value & "' and tblIDSTransactionsNew.[Paymentsummarynumber]='" & r.Cells("UStVPo_ReNr").Value & "' and tbl_IDS_Länder.Lieferland_ISO2='" & Antrag_LandKz & "' AND tblIDSInvoicesNew.daId is not null", "FMZOLL",,, -1) End Select If da_id > 0 Then @@ -165,7 +166,9 @@ Public Class frmMDM_USTVAntrag GET_Antraege = cUTA.GET_Antraege_UTA(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, USTV_ANTRAG.UStVAn_Währungscode, False) antraegeVearbeitet = True Case "ids" - MsgBox("Funktion noch nicht implementiert") + Dim dt As New DataTable + GET_Antraege = cIDS.GET_Antraege_IDS(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, False) + antraegeVearbeitet = True End Select If antraegeVearbeitet Then @@ -333,7 +336,8 @@ Public Class frmMDM_USTVAntrag loadUSTVFrom_UTA(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked) init() ElseIf item.Name = "ids" Then - MsgBox(item.Name.ToUpper & " noch nicht implementiert!") + loadUSTVFrom_IDS(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked) + init() End If End If @@ -497,7 +501,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_ReNr = r.Item("invoice_number") & " - " & kdNr USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr - If Not alreadyExistsMitLeistungsBez(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then + If Not alreadyExists(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") @@ -610,6 +614,68 @@ Public Class frmMDM_USTVAntrag End Try End Function + Shared Function loadUSTVFrom_IDS(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean + Try + Dim bytSchnittstellenNr = 8 'damit von alter Schnittstelle und neue Schnittstelle keine Daten doppelt importiert werden + Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID) + Dim dt As New DataTable + Dim GET_Antraege = cIDS.GET_Antraege_IDS(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) + + If GET_Antraege Then + + For Each r As DataRow In dt.Rows + + Dim kdnr = r.Item("Kundennummer") + + Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen + USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] + USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_ReDat = r.Item("Rechnungsdatum") + USTV_POS.UStVPo_ReNr = r.Item("Rechnungsnummer") + USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr + + If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then + + USTV_POS.UStVPo_Schnittstelle = True + USTV_POS.UStVPo_Leistungsbezeichnung = "Diesel" + USTV_POS.UStVPo_Leistender = "IDS EUROPE BV" + USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + USTV_POS.UStVPo_Zeitstempel = Now() + + + Dim umrechKurs As Double = 1 + + Dim UST_org = CDbl(r.Item("Steuerbetrag")) + Dim UST_EUR = CDbl(r.Item("Steuerbetrag")) 'ist immer EUR + + If (UST_org > 0 AndAlso UST_org <> UST_EUR) Then + + umrechKurs = (UST_org / UST_EUR * 100 + 0.5) / 100 + + End If + + If UST_org > 0 Then + USTV_POS.UStVPo_USteuerbetragEUR = UST_org 'Math.Round((UST_org / umrechKurs), 2) + USTV_POS.UStVPo_Umrechnungskurs = umrechKurs + USTV_POS.UStVPo_USteuerbetrag = UST_org + End If + + If USTV_POS.INSERT() Then + cIDS.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdnr, Antrag_LandKz, USTV_POS.UStVAn_ID) + End If + 'tblUStVPositionen + End If + + Next + + End If + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + End Function + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index 326cf967..4be16121 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -256,22 +256,25 @@ .Columns.Clear() 'Exit Sub 'MsgBox(.sql) - Dim sqlstring = "Select " & top & " [Kundennummer], [Lieferland_ISO2], [Rechnungsdatum], [Abrechnungsnummer], sum([Gesamtbetrag_Brutto_in_Darstellwährung]) as [Gesamtbetrag_Brutto_in_Darstellwährung], sum([Gesamtbetrag_Umsatzsteuer_in_Darstellwährung]) as [Gesamtbetrag_Umsatzsteuer_in_Darstellwährung], daId FROM [tblUTAImportNew] + Dim sqlstring = "Select " & top & " [Kundennummer],Adressen.[Name 1], [Lieferland_ISO2], [Rechnungsdatum], [Abrechnungsnummer], sum([Gesamtbetrag_Brutto_in_Darstellwährung]) as [Gesamtbetrag_Brutto_in_Darstellwährung], sum([Gesamtbetrag_Umsatzsteuer_in_Darstellwährung]) as [Gesamtbetrag_Umsatzsteuer_in_Darstellwährung], daId + FROM [tblUTAImportNew] + INNER JOIN Adressen on Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer where cast([Rechnungsdatum] As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' And [archiv] <> 1 " & sqlwhere & - "group by [Rechnungsdatum], Kundennummer, [Lieferland_ISO2], [Abrechnungsnummer], daId " + " group by Kundennummer,Adressen.[Name 1],[Rechnungsdatum], [Lieferland_ISO2], [Abrechnungsnummer], daId " .SET_SQL(sqlstring, "FMZOLL") .LOAD() If .Columns.Count > 0 Then .Columns("Kundennummer").HeaderText = "KdNr" + .Columns("Name 1").HeaderText = "Kunde" .Columns("Lieferland_ISO2").HeaderText = "Land" .Columns("Rechnungsdatum").HeaderText = "RE-Datum" .Columns("Abrechnungsnummer").HeaderText = "RE-Nr" .Columns("Gesamtbetrag_Brutto_in_Darstellwährung").HeaderText = "Gesamtsumme Euro" .Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro" .Columns("daId").Visible = False - .Columns("Kundennummer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells End If @@ -309,58 +312,86 @@ Dim sqlwhere = "" If kdnr > 0 Then - sqlwhere &= " and Kundennummer = " & kdnr + sqlwhere &= " and tblIDSTransactionsNew.KdNrVERAG = " & kdnr End If - MsgBox(LIEFERANT & " nocht nicht implementiert!") + With MyDatagridview1 + .Columns.Clear() + 'Exit Sub + 'MsgBox(.sql) + Dim sqlstring = "SELECT + tblIDSTransactionsNew.KdNrVERAG, + Adressen.[Name 1], + tbl_IDS_Länder.OutletCountry as Land, + tblIDSTransactionsNew.[YearMonthDay] AS Rechnungsdatum, + ISNULL(tblIDSTransactionsNew.[OBONumber],ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) AS Rechnungsnummer, + SUM(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, + isNULL(tblIDSInvoicesNew.daId,0) as daId + FROM + tblIDSTransactionsNew + INNER JOIN + tbl_IDS_Länder + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + INNER JOIN + Adressen on Adressen.AdressenNr = tblIDSTransactionsNew.KdNrVERAG + LEFT JOIN + tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber + WHERE + tblIDSTransactionsNew.[YearMonthDay] BETWEEN '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' " & sqlwhere & " + AND tblIDSTransactionsNew.[VATAmount] <> 0 + AND tblIDSTransactionsNew.UStVAn_ID IS NULL + GROUP BY + tblIDSTransactionsNew.KdNrVERAG, + Adressen.[Name 1], + tbl_IDS_Länder.OutletCountry, + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])), + tblIDSInvoicesNew.daId + ORDER BY + tblIDSTransactionsNew.KdNrVERAG, + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]));" + .SET_SQL(sqlstring, "FMZOLL") + .LOAD() + If .Columns.Count > 0 Then - 'With MyDatagridview1 - ' .Columns.Clear() - ' 'Exit Sub - ' 'MsgBox(.sql) - ' Dim sqlstring = "Select " & top & " [Kundennummer], [Lieferland_ISO2], [Rechnungsdatum], [Abrechnungsnummer], sum([Gesamtbetrag_Brutto_in_Darstellwährung]) as [Gesamtbetrag_Brutto_in_Darstellwährung], sum([Gesamtbetrag_Umsatzsteuer_in_Darstellwährung]) as [Gesamtbetrag_Umsatzsteuer_in_Darstellwährung], daId FROM [tblUTAImportNew] - ' where cast([Rechnungsdatum] As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' And [archiv] <> 1 " & sqlwhere & - ' "group by [Rechnungsdatum], Kundennummer, [Lieferland_ISO2], [Abrechnungsnummer], daId " + .Columns("KdNrVERAG").HeaderText = "KdNr" + .Columns("Name 1").HeaderText = "Kunde" + .Columns("Land").HeaderText = "Land" + .Columns("Rechnungsdatum").HeaderText = "RE-Datum" + .Columns("Rechnungsnummer").HeaderText = "RE-Nr" + .Columns("Steuerbetrag").HeaderText = "MWSt Euro" + .Columns("daId").Visible = False + .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells - ' .SET_SQL(sqlstring, "FMZOLL") - ' .LOAD() - ' If .Columns.Count > 0 Then + End If - ' .Columns("Kundennummer").HeaderText = "KdNr" - ' .Columns("Lieferland_ISO2").HeaderText = "Land" - ' .Columns("Rechnungsdatum").HeaderText = "RE-Datum" - ' .Columns("Abrechnungsnummer").HeaderText = "RE-Nr" - ' .Columns("Gesamtbetrag_Brutto_in_Darstellwährung").HeaderText = "Gesamtsumme Euro" - ' .Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro" - ' .Columns("daId").Visible = False - ' .Columns("Kundennummer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - ' .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + Dim sumMwSt As Double = 0 - ' End If + Dim c As New DataGridViewImageColumn + c.Name = "clmnPDF" : c.HeaderText = "RE" + ' c.Image = Nothing + c.DefaultCellStyle.NullValue = Nothing + c.ImageLayout = DataGridViewImageCellLayout.Zoom + c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + 'c.DefaultCellStyle.Tag = "Therefore anzeigen" - ' Dim sumMwSt As Double = 0 - - ' Dim c As New DataGridViewImageColumn - ' c.Name = "clmnPDF" : c.HeaderText = "RE" - ' ' c.Image = Nothing - ' c.DefaultCellStyle.NullValue = Nothing - ' c.ImageLayout = DataGridViewImageCellLayout.Zoom - ' c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White - ' 'c.DefaultCellStyle.Tag = "Therefore anzeigen" - - ' .Columns.Add(c) + .Columns.Add(c) - ' For Each r As DataGridViewRow In .Rows - ' sumMwSt += If(IsNumeric(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), CDbl(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), 0) - ' If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf - ' Next + For Each r As DataGridViewRow In .Rows + sumMwSt += If(IsNumeric(r.Cells("Steuerbetrag").Value), CDbl(r.Cells("Steuerbetrag").Value), 0) + If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf + Next - ' txtAnzahl.Text = .Rows.Count - ' txtMWST.Text = sumMwSt + txtAnzahl.Text = .Rows.Count + txtMWST.Text = sumMwSt - 'End With + End With End Sub diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 0a1d7045..1f597fb6 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -384,6 +384,12 @@ Public Class usrCntlUSTV ContextMenuStrip2.Items.Add(uta) End If + If Not ContextMenuStrip2.Items.ContainsKey("ids") Then + Dim ids = New ToolStripMenuItem() With {.Text = "IDS", .Name = "ids", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + AddHandler ids.Click, AddressOf mnuItemAuftrauege_Clicked + ContextMenuStrip2.Items.Add(ids) + End If + ContextMenuStrip2.Show(Cursor.Position) @@ -459,6 +465,18 @@ Public Class usrCntlUSTV MsgBox("Fertig!") End If + ElseIf item.Name = "ids" Then + + If vbYes = MsgBox("Es werden " & item.Text & " Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then + For Each r As DataGridViewRow In dgvUSTV.Rows + If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then + frmMDM_USTVAntrag.loadUSTVFrom_IDS(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False) + End If + Next + init() + MsgBox("Fertig!") + End If + Else MsgBox("Funktion nicht implementiert!") End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 4c16d3db..32a7adac 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -391,6 +391,8 @@ Public Class usrcntlKundeBearbeitenFull btnCreditsafe.Visible = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CREDITSAFE_Prüfung", "SDL") PictureBox5.Visible = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CREDITSAFE_Prüfung", "SDL") + initTabs() + Me.Cursor = Cursors.Default End Sub @@ -953,207 +955,8 @@ Public Class usrcntlKundeBearbeitenFull Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tbcntrDetails.SelectedIndexChanged - If KUNDE Is Nothing OrElse KUNDE.KundenNr <= 0 Then Exit Sub - - If tbcntrDetails.SelectedTab Is tbUmsatz Then - With dgvUmsatzbericht - .DataSource = sql.loadDgvBySql("SELECT [KundenNr],[Jahr],[steuerpflichtig],[steuerfrei],[Nettoumsatz],[MwSt],[Bruttoumsatz],[Währung],[Rechnungen],[Gutschriften],[Datum],[Nummer]" & - " FROM [tblKundenumsatz] " & - " WHERE [KundenNr]='" & KUNDE.KundenNr & "' ORDER BY Jahr DESC", "FMZOLL") - .Columns(0).Visible = False - .Columns(11).Visible = False - .Columns(1).Width = 40 - .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns(2).Width = 75 - .Columns(2).DefaultCellStyle.Format = "N2" - .Columns(2).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns(3).Width = 75 - .Columns(3).DefaultCellStyle.Format = "N2" - .Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns(4).Width = 75 - .Columns(4).DefaultCellStyle.Format = "N2" - .Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns(5).Width = 55 - .Columns(5).DefaultCellStyle.Format = "N2" - .Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns(6).Width = 75 - .Columns(6).DefaultCellStyle.Format = "N2" - .Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns(7).Width = 60 - .Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns(8).Width = 55 - .Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns(8).HeaderText = "Rechng." - .Columns(9).Width = 53 - .Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns(9).HeaderText = "Gutschr." - .Columns(10).MinimumWidth = 65 - .Columns(10).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - - ' If .RowCount > 0 Then - 'txtUmsatzJahr.Text = String.Format("{0:n}", .Rows(0).Cells("Nettoumsatz").Value) - ' Label29.Text = "Umsatz " & .Rows(0).Cells("Jahr").Value & ":" - ' Else - ' txtUmsatzJahr.Text = "" - ' End If - End With - - End If - If tbcntrDetails.SelectedTab Is tbOP Then - With dgvOffenePosten - .DataSource = sql.loadDgvBySql("SELECT [Kontonummer] as KdNr,[Belegdatum] as Datum,[Belegnummer] as Nummer,[Bruttobetrag] as Betrag,[Gesamtausstand] as [OP-Saldo],[Waehrung] as Währung,[KumSaldoEUR] ,[Buchungstext] as Referenz " & - " FROM [Offene Posten] " & - " WHERE [Kontonummer]='" & KUNDE.KundenNr & "' ORDER BY Belegdatum DESC", "FMZOLL") - .Columns(0).Visible = False - - .Columns(1).Width = 65 - .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - - .Columns(3).Width = 75 - .Columns(3).DefaultCellStyle.Format = "N2" - .Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - - .Columns(4).Width = 75 - .Columns(4).DefaultCellStyle.Format = "N2" - .Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - - .Columns(5).Width = 60 - .Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - - .Columns(6).Width = 80 - .Columns(6).DefaultCellStyle.Format = "N2" - .Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - - .Columns(7).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - - ' If .RowCount > 0 Then - ' txtOffenePosten.Text = String.Format("C2", .Rows(0).Cells("KumSaldoEUR").Value) - ' txtOffenePosten.Text = String.Format("{0:n}", .Rows(0).Cells("KumSaldoEUR").Value) - 'Else - ' txtOffenePosten.Text = "" - ' End If - End With - End If - - If tbcntrDetails.SelectedTab Is tbBank Then - - initdgvKreditkarten() - - - End If - - If tbcntrDetails.SelectedTab Is tbUmsatzsteuer Then - - With dgvUstv_LaenderUndSteuernummern - - cBinding_dgvUStV.initBinding(" SELECT [AdressenNr],LandNr,[StNrFürRückerstattungUSt],[StNrGültigkeitsdatum] ,[UStV],[VertretungsvollmachtAusgestelltAm],[VertretungsvollmachtErhaltenAm],[AuszahlungsvollmachtAusgestelltAm],[AuszahlungsvollmachtErhaltenAm] ,[Bemerkung] " & - " FROM [tblSteuernummern] " & - " WHERE AdressenNr = '" & KUNDE.KundenNr & "' ", "tblSteuernummern") - - - AddHandler btnUStVAendSpeichern.Click, - Sub(send As Object, evnt As EventArgs) - If cBinding_dgvUStV.updateBinding() Then - send.Enabled = False - End If - End Sub - - AddHandler cBinding_dgvUStV.bindingdataTable.ColumnChanged, - Sub(send As Object, evnt As EventArgs) - btnUStVAendSpeichern.Enabled = True - End Sub - - AddHandler .UserDeletedRow, - Sub(send As Object, evnt As DataGridViewRowEventArgs) - btnUStVAendSpeichern.Enabled = True - End Sub - - - .DataSource = cBinding_dgvUStV.bindingdataTable - - FUNC.dgvCellToCbo(dgvUstv_LaenderUndSteuernummern, 1, "Land", "LandNr", "SELECT LandNr, LandBez FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY LandBez ", "FMZOLL") - - - .DataSource.Columns("AdressenNr").DefaultValue = KUNDE.KundenNr - .DataSource.Columns("UStV").DefaultValue = False - - .Columns(0).Visible = False - - .Columns(1).Width = 120 - .Columns(1).HeaderText = "Land" - ' .Columns(1).CellType = DataGridViewComboBoxColumn - .Columns(2).Width = 120 - .Columns(2).HeaderText = "Steuernummer" - ' .Columns(2).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(3).Width = 75 - .Columns(3).HeaderText = "gültig bis" - .Columns(4).Width = 40 - - .Columns(5).Width = 80 - .Columns(5).HeaderText = "Vetret.-VM" & vbNewLine & "ausgestellt am" - .Columns(6).Width = 80 - .Columns(6).HeaderText = "Vetret.-VM" & vbNewLine & "erhalten am" - .Columns(7).Width = 80 - .Columns(7).HeaderText = "Auszzahl.-VM" & vbNewLine & "ausgestellt am" - .Columns(8).Width = 80 - .Columns(8).HeaderText = "Auszzahl.-VM" & vbNewLine & "erhalten am" - .Columns(9).Width = 200 - - End With - End If - - If tbcntrDetails.SelectedTab Is tbSonstiges Then - With dgvSonst_IDSKunden - - cBinding_dgvSonst_IDSKunden.initBinding(" SELECT [KdNrVERAG],[CustomerCode],[KdNrAlt],[Zeitstempel],[Sachbearbeiter] " & - " FROM [tbl_IDS_Kunden] " & - " WHERE KdNrVERAG = '" & KUNDE.KundenNr & "' ", "tbl_IDS_Kunden") - - AddHandler btnSonstAendSpeichern.Click, - Sub(send As Object, evnt As EventArgs) - If cBinding_dgvSonst_IDSKunden.updateBinding() Then - send.Enabled = False - End If - End Sub - - AddHandler cBinding_dgvSonst_IDSKunden.bindingdataTable.ColumnChanged, - Sub(send As Object, evnt As EventArgs) - btnSonstAendSpeichern.Enabled = True - End Sub - - AddHandler .UserDeletedRow, - Sub(send As Object, evnt As DataGridViewRowEventArgs) - btnSonstAendSpeichern.Enabled = True - - End Sub - - - - .DataSource = cBinding_dgvSonst_IDSKunden.bindingdataTable - - ' dgvCellToCbo(dgvUstv_LaenderUndSteuernummern, "Land", "LandNr", "SELECT LandNr, LandBez FROM [VERAG].[dbo].[Länderverzeichnis für die Außenhandelsstatistik] ORDER BY LandBez ") - - - .DataSource.Columns("KdNrVERAG").DefaultValue = KUNDE.KundenNr - .DataSource.Columns("Zeitstempel").DefaultValue = Now - .DataSource.Columns("Sachbearbeiter").DefaultValue = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - - .Columns(0).Visible = False - .Columns(1).HeaderText = "IDS-Kunden-Nummer" - - .Columns(2).ReadOnly = False - .Columns(3).ReadOnly = False - .Columns(4).ReadOnly = False - .Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - End With - End If - - If tbcntrDetails.SelectedTab Is tbBankverbindungen Then - initdgvBankverbindungen(bankverbindungBearbeiten) - End If - + initTabs() End Sub @@ -2132,4 +1935,232 @@ Public Class usrcntlKundeBearbeitenFull End Sub + Private Sub dgvinitLaenderUndSteuernummern() + + + + With dgvUstv_LaenderUndSteuernummern + + cBinding_dgvUStV.initBinding(" SELECT [AdressenNr],LandNr,[StNrFürRückerstattungUSt],[StNrGültigkeitsdatum] ,[UStV],[VertretungsvollmachtAusgestelltAm],[VertretungsvollmachtErhaltenAm],[AuszahlungsvollmachtAusgestelltAm],[AuszahlungsvollmachtErhaltenAm] ,[Bemerkung] " & + " FROM [tblSteuernummern] " & + " WHERE AdressenNr = '" & KUNDE.KundenNr & "' ", "tblSteuernummern") + + + AddHandler btnUStVAendSpeichern.Click, + Sub(send As Object, evnt As EventArgs) + If cBinding_dgvUStV.updateBinding() Then + send.Enabled = False + End If + End Sub + + AddHandler cBinding_dgvUStV.bindingdataTable.ColumnChanged, + Sub(send As Object, evnt As EventArgs) + btnUStVAendSpeichern.Enabled = True + End Sub + + AddHandler .UserDeletedRow, + Sub(send As Object, evnt As DataGridViewRowEventArgs) + btnUStVAendSpeichern.Enabled = True + End Sub + + + .DataSource = cBinding_dgvUStV.bindingdataTable + + FUNC.dgvCellToCbo(dgvUstv_LaenderUndSteuernummern, 1, "Land", "LandNr", "SELECT LandNr, LandBez FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY LandBez ", "FMZOLL") + + + .DataSource.Columns("AdressenNr").DefaultValue = KUNDE.KundenNr + .DataSource.Columns("UStV").DefaultValue = False + + .Columns(0).Visible = False + + .Columns(1).Width = 120 + .Columns(1).HeaderText = "Land" + ' .Columns(1).CellType = DataGridViewComboBoxColumn + .Columns(2).Width = 120 + .Columns(2).HeaderText = "Steuernummer" + ' .Columns(2).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns(3).Width = 75 + .Columns(3).HeaderText = "gültig bis" + .Columns(4).Width = 40 + + .Columns(5).Width = 80 + .Columns(5).HeaderText = "Vetret.-VM" & vbNewLine & "ausgestellt am" + .Columns(6).Width = 80 + .Columns(6).HeaderText = "Vetret.-VM" & vbNewLine & "erhalten am" + .Columns(7).Width = 80 + .Columns(7).HeaderText = "Auszzahl.-VM" & vbNewLine & "ausgestellt am" + .Columns(8).Width = 80 + .Columns(8).HeaderText = "Auszzahl.-VM" & vbNewLine & "erhalten am" + .Columns(9).Width = 200 + + End With + + + End Sub + + Private Sub initdgvIDSKunden() + + With dgvSonst_IDSKunden + + cBinding_dgvSonst_IDSKunden.initBinding(" SELECT [KdNrVERAG],[CustomerCode],[KdNrAlt],[Zeitstempel],[Sachbearbeiter] " & + " FROM [tbl_IDS_Kunden] " & + " WHERE KdNrVERAG = '" & KUNDE.KundenNr & "' ", "tbl_IDS_Kunden") + + AddHandler btnSonstAendSpeichern.Click, + Sub(send As Object, evnt As EventArgs) + If cBinding_dgvSonst_IDSKunden.updateBinding() Then + send.Enabled = False + End If + End Sub + + AddHandler cBinding_dgvSonst_IDSKunden.bindingdataTable.ColumnChanged, + Sub(send As Object, evnt As EventArgs) + btnSonstAendSpeichern.Enabled = True + End Sub + + AddHandler .UserDeletedRow, + Sub(send As Object, evnt As DataGridViewRowEventArgs) + btnSonstAendSpeichern.Enabled = True + + End Sub + + + + .DataSource = cBinding_dgvSonst_IDSKunden.bindingdataTable + + ' dgvCellToCbo(dgvUstv_LaenderUndSteuernummern, "Land", "LandNr", "SELECT LandNr, LandBez FROM [VERAG].[dbo].[Länderverzeichnis für die Außenhandelsstatistik] ORDER BY LandBez ") + + + .DataSource.Columns("KdNrVERAG").DefaultValue = KUNDE.KundenNr + .DataSource.Columns("Zeitstempel").DefaultValue = Now + .DataSource.Columns("Sachbearbeiter").DefaultValue = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + + .Columns(0).Visible = False + .Columns(1).HeaderText = "IDS-Kunden-Nummer" + + .Columns(2).ReadOnly = False + .Columns(3).ReadOnly = False + .Columns(4).ReadOnly = False + .Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + End With + + End Sub + + Private Sub initdgvOP() + + With dgvOffenePosten + .DataSource = sql.loadDgvBySql("SELECT [Kontonummer] as KdNr,[Belegdatum] as Datum,[Belegnummer] as Nummer,[Bruttobetrag] as Betrag,[Gesamtausstand] as [OP-Saldo],[Waehrung] as Währung,[KumSaldoEUR] ,[Buchungstext] as Referenz " & + " FROM [Offene Posten] " & + " WHERE [Kontonummer]='" & KUNDE.KundenNr & "' ORDER BY Belegdatum DESC", "FMZOLL") + .Columns(0).Visible = False + + .Columns(1).Width = 65 + .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + .Columns(3).Width = 75 + .Columns(3).DefaultCellStyle.Format = "N2" + .Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + .Columns(4).Width = 75 + .Columns(4).DefaultCellStyle.Format = "N2" + .Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + .Columns(5).Width = 60 + .Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + .Columns(6).Width = 80 + .Columns(6).DefaultCellStyle.Format = "N2" + .Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + .Columns(7).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + ' If .RowCount > 0 Then + ' txtOffenePosten.Text = String.Format("C2", .Rows(0).Cells("KumSaldoEUR").Value) + ' txtOffenePosten.Text = String.Format("{0:n}", .Rows(0).Cells("KumSaldoEUR").Value) + 'Else + ' txtOffenePosten.Text = "" + ' End If + End With + + End Sub + + Private Sub initdgvUmsatzbericht() + + With dgvUmsatzbericht + .DataSource = sql.loadDgvBySql("SELECT [KundenNr],[Jahr],[steuerpflichtig],[steuerfrei],[Nettoumsatz],[MwSt],[Bruttoumsatz],[Währung],[Rechnungen],[Gutschriften],[Datum],[Nummer]" & + " FROM [tblKundenumsatz] " & + " WHERE [KundenNr]='" & KUNDE.KundenNr & "' ORDER BY Jahr DESC", "FMZOLL") + .Columns(0).Visible = False + .Columns(11).Visible = False + .Columns(1).Width = 40 + .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns(2).Width = 75 + .Columns(2).DefaultCellStyle.Format = "N2" + .Columns(2).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + .Columns(3).Width = 75 + .Columns(3).DefaultCellStyle.Format = "N2" + .Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + .Columns(4).Width = 75 + .Columns(4).DefaultCellStyle.Format = "N2" + .Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + .Columns(5).Width = 55 + .Columns(5).DefaultCellStyle.Format = "N2" + .Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + .Columns(6).Width = 75 + .Columns(6).DefaultCellStyle.Format = "N2" + .Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + .Columns(7).Width = 60 + .Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns(8).Width = 55 + .Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns(8).HeaderText = "Rechng." + .Columns(9).Width = 53 + .Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns(9).HeaderText = "Gutschr." + .Columns(10).MinimumWidth = 65 + .Columns(10).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + ' If .RowCount > 0 Then + 'txtUmsatzJahr.Text = String.Format("{0:n}", .Rows(0).Cells("Nettoumsatz").Value) + ' Label29.Text = "Umsatz " & .Rows(0).Cells("Jahr").Value & ":" + ' Else + ' txtUmsatzJahr.Text = "" + ' End If + End With + End Sub + + + Private Sub initTabs() + + If KUNDE Is Nothing OrElse KUNDE.KundenNr <= 0 Then Exit Sub + + If tbcntrDetails.SelectedTab Is tbUmsatz Then + initdgvUmsatzbericht() + + End If + If tbcntrDetails.SelectedTab Is tbOP Then + initdgvOP() + End If + + If tbcntrDetails.SelectedTab Is tbBank Then + initdgvKreditkarten() + End If + + If tbcntrDetails.SelectedTab Is tbUmsatzsteuer Then + dgvinitLaenderUndSteuernummern() + End If + + If tbcntrDetails.SelectedTab Is tbSonstiges Then + initdgvIDSKunden() + End If + + If tbcntrDetails.SelectedTab Is tbBankverbindungen Then + initdgvBankverbindungen(bankverbindungBearbeiten) + End If + + + End Sub + End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 43cb806a..a696dbe9 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1,6 +1,7 @@ Imports System.Data.OleDb Imports System.IO Imports Challenge +Imports com.sun.org.glassfish.external.probe.provider.annotations Imports MDM_Worker Imports TAlex.WPF.Helpers Imports VERAG_PROG_ALLGEMEIN @@ -71,6 +72,7 @@ Public Class frmMDMDatenverarbetiung Sub init() txtAnzahl.Text = "" txtPruefsummeNetto.Text = "" + Button1.Enabled = True Select Case LIEFERANT Case "PLOSE" : initDgv_PLOSE() @@ -81,6 +83,7 @@ Public Class frmMDMDatenverarbetiung btnDatenLaden.Text = "Daten laden" Case "IDS" : initDgv_IDS() btnDatenLaden.Text = "Daten laden" + Button1.Enabled = False Case "MSE" : initDgv_MSE() btnDatenLaden.Text = "Daten laden" End Select @@ -91,16 +94,14 @@ Public Class frmMDMDatenverarbetiung Dim errorTmp = False If test Then - If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub - End If Select Case LIEFERANT Case "PLOSE" Dim ploseParam As New cPLOSE ploseParam.initImportPfade() If genRGAtt_PLOSE(ploseParam) Then - If MautD_Befuellen() Then + If Not test AndAlso MautD_Befuellen() Then setFakturiert(LIEFERANT) End If End If @@ -128,9 +129,7 @@ Public Class frmMDMDatenverarbetiung If datum = Nothing Then datum = SQL.getValueTxtBySql("select top (1) Abrechnungsdatum from Abrechnungsdatum", "ASFINAG") End If - Dim inputKdNr = "" 'InputBox("Wenn einzelner Kunde abgerechnet werde soll, bitte KdNr eingeben" & vbNewLine & "Wenn keine KdNr angegeben wird, dann werden alle Kunden abgerechnet:", "Asfinag abrechen") - If genRGAtt_ASFINAG(abrechnungsDatum, datum, inputKdNr, asfinagParam) Then MautD_Befuellen(inputKdNr) End If @@ -242,34 +241,6 @@ Public Class frmMDMDatenverarbetiung datum = SQL.getValueTxtBySql("select top (1) Abrechnungsdatum from Abrechnungsdatum", "ASFINAG") End If - 'umschreiben, damit er die Daten nicht aus TTRBody sondern tblMautAsfinag holt.... - - ' sqlstr &= " SELECT dbo.TTRBody.CardNumber,Adressen.AdressenNr AS KundenNr,Adressen.[Name 1], dbo.CLFArchiv.vehicleLicensePlate,dbo.TTRBody.DeliveryDate, 'ASFINAG ' + ISNULL(dbo.tblWarenarten.WarenartDE, dbo.tblWarenarten.ProductCode) as ProductCode,dbo.TTRBody.amountInclVAT - dbo.TTRBody.VATAmount as Netamount,dbo.TTRBody.VATAmount,dbo.TTRBody.amountInclVAT - ' FROM dbo.CLFArchiv RIGHT OUTER JOIN - ' dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.InfoField LEFT OUTER JOIN - ' dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode - 'INNER JOIN [VERAG].[dbo].Kreditkarten ON dbo.TTRBody.CardNumber = Kreditkarten.KartenNr - 'INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr - ' WHERE (dbo.TTRBody.PKHistory = 0) AND (dbo.TTRBody.PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (TTRBody.abrechnungsdatum = '" & datum.ToShortDateString & "') - ' ORDER BY dbo.TTRBody.CardNumber" - - - ' sqlstr &= "select [cardnumber] as CardNumber - ',Adressen.AdressenNr AS KundenNr - ',Adressen.[Name 1] - ' ,[licenceplate] as vehicleLicensePlate - ' ,[turnoverdate] as DeliveryDate - ' ,[contractPartner] as ProductCode - ' ,[netAmount] - ' ,[VATamount] - ' ,[additionalData] - ' ,[totalAmount] as amountInclVAT - 'FROM [VERAG].[dbo].[tblAsfinagMaut] - 'INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr - 'INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr" - - - sqlstr &= "select [cardnumber] as CardNumber ,Adressen.AdressenNr AS KundenNr ,Adressen.[Name 1] @@ -940,7 +911,7 @@ Public Class frmMDMDatenverarbetiung left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode And Kunde.KdNrAlt = 0 left join tbl_IDS_Kunden_ohne_Rabatt as KundeOhneR on KundeOhneR.CustomerCode = trans.CustomerCode left join tbl_IDS_Produkte as prod on prod.ProductTypeCode = trans.ProductTypeCode - where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and trans.UStVAn_ID is null and trans.charged <> 1 ", "FMZOLL") + where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and trans.charged <> 1 AND trans.[UStVAn_ID] is null ", "FMZOLL") .LOAD() @@ -1158,6 +1129,12 @@ Public Class frmMDMDatenverarbetiung Return False End If Dim cnt = 0 + + If ploseParam.ANLAGEN IsNot Nothing AndAlso Not Directory.Exists(ploseParam.ANLAGEN) Then + MsgBox("Pfad für " & LIEFERANT & "-Anlagen nicht verfügbar" & IIf(ploseParam.ANLAGEN IsNot Nothing, vbNewLine & ploseParam.ANLAGEN, "")) + Return False + End If + 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 = ploseParam.ANLAGEN & Now.ToShortDateString @@ -1166,7 +1143,7 @@ Public Class frmMDMDatenverarbetiung For Each R_PLOSE 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(R_PLOSE("AdressenNr"), SPEDBUCH, "PLOSE", R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString) Then verarbOK = False If Not gen_RECHNUNG_BySPEDBUCH(R_PLOSE("AdressenNr"), SPEDBUCH, "PLOSE", R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value, dat_Sum_Bis.Value) Then verarbOK = False ' ANHÄNGE WERDEN NCIHT BENÖTIGT::genPLOSEAttachmentByKdNr(R_PLOSE("AdressenNr"), R_PLOSE("PLOSEKundenNr"), dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString, dir) @@ -1232,10 +1209,20 @@ Public Class frmMDMDatenverarbetiung MsgBox("Keine Daten!") Return False End If + If utaParam.ANLAGEN IsNot Nothing AndAlso Not Directory.Exists(utaParam.ANLAGEN) Then + MsgBox("Pfad für " & LIEFERANT & "-Anlagen nicht verfügbar" & IIf(utaParam.ANLAGEN IsNot Nothing, vbNewLine & utaParam.ANLAGEN, "")) + Return False + End If + + If utaParam.ARCHIV IsNot Nothing AndAlso Not Directory.Exists(utaParam.ARCHIV) Then + MsgBox("Pfad für " & LIEFERANT & "-Archiv nicht verfügbar" & IIf(utaParam.ARCHIV IsNot Nothing, vbNewLine & utaParam.ARCHIV, "")) + Return False + End If + 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 = IIf(test, utaParam.ARCHIV & "TEST\", utaParam.ARCHIV) & Now.ToShortDateString & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") + Dim dir = IIf(test, utaParam.ARCHIV & "TEST\", utaParam.ARCHIV) & Now.ToShortDateString & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test\", "") If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "") Directory.CreateDirectory(dir) @@ -1304,6 +1291,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 = IIf(test, utaParam.ANLAGEN & "TEST\", utaParam.ANLAGEN) @@ -1318,10 +1307,6 @@ Public Class frmMDMDatenverarbetiung File.Copy(f, dirAnhang & (New FileInfo(f)).Name) Next - 'IN FMZOLL / DB MautD einfügen --> Mautbericht - 'genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString) - - pbPloseAnh_Proz.Value = 100 txtPloseAnh_Einarbeitung.Text = dt_Main.Rows.Count & " / " & dt_Main.Rows.Count lblPloseAnh_Proz.Text = "100.00 %" @@ -1334,7 +1319,7 @@ Public Class frmMDMDatenverarbetiung Function genRGAtt_MSE(mseParam As cMSEAPI) 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 sqlWhere = "" 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 @@ -1352,10 +1337,21 @@ Public Class frmMDMDatenverarbetiung MsgBox("Keine Daten!") Return False End If + + If mseParam.ARCHIV Is Nothing OrElse Not Directory.Exists(mseParam.ARCHIV) Then + MsgBox("Pfad für " & LIEFERANT & "-Archiv nicht verfügbar" & IIf(mseParam.ARCHIV IsNot Nothing, vbNewLine & mseParam.ARCHIV, "")) + Return False + End If + + If mseParam.ANLAGEN Is Nothing OrElse Not Directory.Exists(mseParam.ANLAGEN) Then + MsgBox("Pfad für " & LIEFERANT & "-Anlagen nicht verfügbar" & IIf(mseParam.ANLAGEN IsNot Nothing, vbNewLine & mseParam.ANLAGEN, "")) + Return False + End If + 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 = IIf(test, "C:\Users\d.breimaier\Desktop\MSE\", mseParam.ARCHIV) & Now.ToShortDateString & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") + Dim dir = IIf(test, mseParam.ARCHIV & "TEST\", mseParam.ARCHIV) & Now.ToShortDateString & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test\", "") If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "") @@ -1363,8 +1359,6 @@ Public Class frmMDMDatenverarbetiung Directory.CreateDirectory(dir) - - Dim displayView = New DataView(dt_Main, "MSEExportCSV = 1", "Customer ID", DataViewRowState.CurrentRows) Dim distinctDT_CSV As DataTable = displayView.ToTable(True, "Customer ID", "Customer Nr") @@ -1442,7 +1436,7 @@ Public Class frmMDMDatenverarbetiung ' ANHÄNGE WERDEN NCIHT BENÖTIGT:: 'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren - Dim dirAnhang = mseParam.ANLAGEN & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString + Dim dirAnhang = IIf(test, mseParam.ANLAGEN & "TEST\", mseParam.ANLAGEN) & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") & Now.ToShortDateString If Directory.Exists(dirAnhang) Then 'Directory.Delete(dirAnhang, True) For Each f In Directory.GetFiles(dirAnhang) File.Delete(f) @@ -1493,7 +1487,7 @@ Public Class frmMDMDatenverarbetiung LEFT JOIN tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber - WHERE cast(tblIDSTransactionsNew.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND [UStVAn_ID] is null" & sqlWhere & " + WHERE cast(tblIDSTransactionsNew.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null " & sqlWhere & " order by tblIDSTransactionsNew.KdNrVERAG" Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200) @@ -1503,56 +1497,27 @@ Public Class frmMDMDatenverarbetiung MsgBox("Keine Daten!") Return False End If + + + If idsParam.ANLAGEN Is Nothing OrElse Not Directory.Exists(idsParam.ANLAGEN) Then + MsgBox("Pfad für " & LIEFERANT & "-Anlagen nicht verfügbar" & IIf(idsParam.ANLAGEN IsNot Nothing, vbNewLine & idsParam.ANLAGEN, "")) + Return False + End If + + If idsParam.ARCHIV Is Nothing OrElse Not Directory.Exists(idsParam.ARCHIV) Then + MsgBox("Pfad für " & LIEFERANT & "-Archiv nicht verfügbar" & IIf(idsParam.ARCHIV IsNot Nothing, vbNewLine & idsParam.ARCHIV, "")) + Return False + End If + 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 = IIf(test, idsParam.ARCHIV & "TEST\", idsParam.ARCHIV) & Now.ToShortDateString & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test", "") - If Directory.Exists(dir) Then - 'dir &= "_" & Now.ToShortTimeString.Replace(":", "") + If Not Directory.Exists(dir) Then + Directory.CreateDirectory(dir) End If - Directory.CreateDirectory(dir) - 'Dim displayView = New DataView(dt_Main, "", "KdNrVERAG", DataViewRowState.CurrentRows) - 'Dim distinctDT_CSV As DataTable = displayView.ToTable(True, "KdNrVERAG") - - - 'For Each csv As DataRow In distinctDT_CSV.Rows - - ' Dim dt_CSV_selected = SQL.loadDgvBySql_Param(" - ' 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] - ' 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.charged <> 1 and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & csv.Item("Customer ID"), "FMZOLL") - - ' dt_CSV_selected.ParentRelations.Clear() - ' dt_CSV_selected.ChildRelations.Clear() - ' dt_CSV_selected.Constraints.Clear() - - - ' Dim fn As String = dir & "\" & csv.Item("Customer Nr") & "_Maut_MSE.csv" - ' Dim outFile As System.IO.StreamWriter = My.Computer.FileSystem.OpenTextFileWriter(fn, False) - ' Dim clmns As String = "" - ' For i = 0 To dt_CSV_selected.Columns.Count - 1 - ' clmns &= dt_CSV_selected.Columns(i).ColumnName.ToString().Replace(";", ", ") & ";" - ' Next - ' outFile.WriteLine(clmns) - ' For i = 0 To dt_CSV_selected.Rows.Count - 1 - ' clmns = "" - ' For j = 0 To dt_CSV_selected.Columns.Count - 1 - ' clmns &= dt_CSV_selected.Rows(i)(j).ToString.Replace(";", ", ") & ";" - ' Next - ' outFile.WriteLine(clmns) - ' Next - ' outFile.Close() - 'Next For Each IDS In dt_Main.Rows @@ -1569,14 +1534,13 @@ Public Class frmMDMDatenverarbetiung If IDS("InvoiceID") > 0 Then Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(IDS("InvoiceID")) - File.Copy(DS.GET_TOP1_PATH, dir & "\" & IDS("KdNrVERAG") & "_" & (DS.da_name)) + File.Copy(DS.GET_TOP1_PATH, dir & "\" & IDS("KdNrVERAG") & "_" & (DS.da_name), False) End If If verarbOK Then - 'Update Fakturiert SQL.doSQL("UPDATE [tblIDSTransactionsNew] Set chargedDatetime = GETDATE() - where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' AND [UStVAn_ID] is null and tblIDSTransactionsNew.KdNrVERAG = " & IDS("KdNrVERAG") & sqlWhere, "FMZOLL") + where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null and tblIDSTransactionsNew.KdNrVERAG = " & IDS("KdNrVERAG") & sqlWhere, "FMZOLL") End If If True Then 'cnt Mod 10 = 0 Then @@ -1649,6 +1613,13 @@ Public Class frmMDMDatenverarbetiung WHERE Adressen.ASFINAGExportCSV = 1 " & sqlWhere & " ORDER BY Adressen.AdressenNr, Maut.cardnumber, Maut.licenceplate, Maut.turnoverdate", "FMZOLL") + + If asfinagParam.ANLAGEN Is Nothing OrElse Not Directory.Exists(asfinagParam.ANLAGEN) Then + MsgBox("Pfad für " & LIEFERANT & "-Anlagen nicht verfügbar" & IIf(asfinagParam.ANLAGEN IsNot Nothing, vbNewLine & asfinagParam.ANLAGEN, "")) + Return False + End If + + Dim cnt = 0 Dim displayViewKunden = New DataView(dt_Main, "", "KundenNr", DataViewRowState.CurrentRows) @@ -1663,7 +1634,8 @@ Public Class frmMDMDatenverarbetiung End If If vbYes = MsgBox(Info & vbNewLine & "Möchten Sie die Rechnungen + Anhänge erstellen?", vbYesNoCancel) Then - Dim dir = asfinagParam.ANLAGEN & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "\Test", "") '"C:\Users\d.breimaier\Desktop\Asfinag\Mautberichte" + + Dim dir = asfinagParam.ANLAGEN & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "\Test", "") If Not Directory.Exists(dir) Then Directory.CreateDirectory(dir) @@ -1721,7 +1693,7 @@ Public Class frmMDMDatenverarbetiung For Each R_ASFINAG In distinctDT_distKunden.Rows Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing - Dim verarbOK = True + Dim verarbOK = IIf(test, False, True) If Not gen_SPEDBUCH_ByKdNr(R_ASFINAG("KundenNr"), SPEDBUCH, "ASFINAG") Then verarbOK = False If Not gen_RECHNUNG_BySPEDBUCH(R_ASFINAG("KundenNr"), SPEDBUCH, "ASFINAG") Then verarbOK = False @@ -1755,15 +1727,9 @@ Public Class frmMDMDatenverarbetiung cnt += 1 Next - ' ANHÄNGE WERDEN NCIHT BENÖTIGT:: - 'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren: - 'Dim dirAnhang = "F:\FMZoll\Maut\PLOSE\Anlagen\" - 'If Directory.Exists(dirAnhang) Then 'Directory.Delete(dirAnhang, True) - ' For Each f In Directory.GetFiles(dirAnhang) - ' File.Delete(f) - ' Next - 'End If - 'If Not Directory.Exists(dirAnhang) Then Directory.CreateDirectory(dirAnhang) + If test Then Return True + + Dim dirCSV = asfinagParam.ANLAGEN & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "Test\", "") If Not Directory.Exists(dirCSV) Then @@ -1853,19 +1819,6 @@ Public Class frmMDMDatenverarbetiung Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10,@P11,@P12) " ' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";" Using Command As New OleDbCommand(SQLQuery, con) - 'Command.Parameters.AddWithValue("@P1", r(0).ToString) - 'Command.Parameters.AddWithValue("@P2", CInt(r(1))) - 'Command.Parameters.AddWithValue("@P3", r(2).ToString) - 'Command.Parameters.AddWithValue("@P4", CDate(r(3))) - 'Command.Parameters.AddWithValue("@P5", r(4).ToString) - 'Command.Parameters.AddWithValue("@P6", r(5).ToString) - 'Command.Parameters.AddWithValue("@P7", r(6).ToString) - 'Command.Parameters.AddWithValue("@P8", r(7).ToString) - 'Command.Parameters.AddWithValue("@P9", r(8).ToString) - 'Command.Parameters.AddWithValue("@P10", CDbl(r(9))) - 'Command.Parameters.AddWithValue("@P11", CDbl(r(10))) - 'Command.Parameters.AddWithValue("@P12", CDbl(r(11))) - ' .Parameters.AddWithValue("@P13", r(12)) Command.Parameters.AddWithValue("@P1", r(0)) Command.Parameters.AddWithValue("@P2", r(1)) @@ -1884,25 +1837,6 @@ Public Class frmMDMDatenverarbetiung Command.Dispose() End Using - 'cmd = New OleDbCommand(SQLQuery, con) - 'With cmd - ' .Parameters.AddWithValue("@P1", r(0)) - ' .Parameters.AddWithValue("@P2", r(1)) - ' .Parameters.AddWithValue("@P3", r(2)) - ' .Parameters.AddWithValue("@P4", r(3)) - ' .Parameters.AddWithValue("@P5", r(4)) - ' .Parameters.AddWithValue("@P6", r(5)) - ' .Parameters.AddWithValue("@P7", r(6)) - ' .Parameters.AddWithValue("@P8", r(7)) - ' .Parameters.AddWithValue("@P9", r(8)) - ' .Parameters.AddWithValue("@P10", r(9)) - ' .Parameters.AddWithValue("@P11", r(10)) - ' .Parameters.AddWithValue("@P12", r(11)) - ' ' .Parameters.AddWithValue("@P13", r(12)) - ' cmd.Dispose() - ' .ExecuteNonQuery() - 'End With - Catch ex2 As System.Exception MsgBox("err: " & ex2.Message & ex2.StackTrace) @@ -3611,7 +3545,7 @@ Public Class frmMDMDatenverarbetiung INNER Join Adressen On tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr - WHERE cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' AND [UStVAn_ID] is null and tblIDSTransactionsNew.KdNrVERAG = " & KdNr & sqlWhere & " + WHERE cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null and tblIDSTransactionsNew.KdNrVERAG = " & KdNr & sqlWhere & " GROUP BY tblIDSTransactionsNew.KdNrVERAG, Leistungen.LeistungsNr, @@ -4183,7 +4117,7 @@ Public Class frmMDMDatenverarbetiung pruefData_IDS = True Try - Dim RechnenWertNichtEingetragen As Integer = CInt((New SQL).getValueTxtBySql("select count(*) from [tblIDSTransactionsNew] WHERE cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND [UStVAn_ID] is null AND [Rechenwert] is null ", "FMZOLL")) + Dim RechnenWertNichtEingetragen As Integer = CInt((New SQL).getValueTxtBySql("select count(*) from [tblIDSTransactionsNew] WHERE cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null AND [Rechenwert] is null ", "FMZOLL")) If RechnenWertNichtEingetragen > 0 Then pruefData_IDS = False @@ -4203,7 +4137,7 @@ Public Class frmMDMDatenverarbetiung Dim OBONumberOderVRNumberfehlern As Integer = 0 - OBONumberOderVRNumberfehlern = CInt((New SQL).getValueTxtBySql("select count(*) from [tblIDSTransactionsNew] WHERE cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND [UStVAn_ID] is null AND [VRNumber] is null AND [OBONumber] is null", "FMZOLL")) + OBONumberOderVRNumberfehlern = CInt((New SQL).getValueTxtBySql("select count(*) from [tblIDSTransactionsNew] WHERE cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null AND [VRNumber] is null AND [OBONumber] is null", "FMZOLL")) If OBONumberOderVRNumberfehlern > 0 Then Dim hint As String = "" diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index 6faf0fc5..a7fbb107 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -65,6 +65,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label19 = New System.Windows.Forms.Label() Me.cboEZOLLMandant = New System.Windows.Forms.ComboBox() Me.Label29 = New System.Windows.Forms.Label() + Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboEZOLLStatus = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() Me.datEZOLLBis = New System.Windows.Forms.DateTimePicker() @@ -77,6 +78,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label17 = New System.Windows.Forms.Label() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Label36 = New System.Windows.Forms.Label() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button20 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() @@ -92,7 +94,9 @@ Partial Class usrCntlZOLLAuswertungen Me.Label28 = New System.Windows.Forms.Label() Me.Label30 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.cboDYDatumArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label95 = New System.Windows.Forms.Label() + Me.cboDY_NCTS = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxSplittungNachPos = New System.Windows.Forms.CheckBox() Me.cbxAnrechnungRefBetrag = New System.Windows.Forms.CheckBox() Me.Button8 = New System.Windows.Forms.Button() @@ -113,6 +117,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label98 = New System.Windows.Forms.Label() + Me.cboNCTSSystemDY = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.pic = New System.Windows.Forms.PictureBox() Me.Label88 = New System.Windows.Forms.Label() @@ -145,6 +150,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label76 = New System.Windows.Forms.Label() Me.grpVERIMEX = New System.Windows.Forms.GroupBox() Me.Label94 = New System.Windows.Forms.Label() + Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() @@ -187,6 +193,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label56 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() + Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label55 = New System.Windows.Forms.Label() Me.datEZOLL_TC_Bis = New System.Windows.Forms.DateTimePicker() Me.Label57 = New System.Windows.Forms.Label() @@ -224,8 +231,15 @@ Partial Class usrCntlZOLLAuswertungen Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() + Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() + Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox9 = New System.Windows.Forms.GroupBox() @@ -247,20 +261,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.pnl = New System.Windows.Forms.Panel() - Me.cboNCTSSystemDY = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboDYDatumArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboDY_NCTS = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() - Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() - Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() - Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.GroupBox1.SuspendLayout() Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -776,6 +776,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Label29.TabIndex = 19 Me.Label29.Text = "Mandant:" ' + 'cboEZOLLBrg + ' + Me.cboEZOLLBrg._allowedValuesFreiText = Nothing + Me.cboEZOLLBrg._allowFreiText = False + Me.cboEZOLLBrg._value = "" + Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEZOLLBrg.DropDownWidth = 350 + Me.cboEZOLLBrg.FormattingEnabled = True + Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) + Me.cboEZOLLBrg.Name = "cboEZOLLBrg" + Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) + Me.cboEZOLLBrg.TabIndex = 12 + ' 'cboEZOLLStatus ' Me.cboEZOLLStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -902,6 +916,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label36.TabIndex = 20 Me.Label36.Text = "Bürgschaft (keine Auswahl = Standard):" ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox1.DropDownWidth = 350 + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(186, 112) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(221, 21) + Me.MyComboBox1.TabIndex = 19 + ' 'Button20 ' Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -1065,6 +1092,19 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox5.TabIndex = 19 Me.GroupBox5.TabStop = False ' + 'cboDYDatumArt + ' + Me.cboDYDatumArt._allowedValuesFreiText = Nothing + Me.cboDYDatumArt._allowFreiText = False + Me.cboDYDatumArt._value = "" + Me.cboDYDatumArt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDYDatumArt.DropDownWidth = 350 + Me.cboDYDatumArt.FormattingEnabled = True + Me.cboDYDatumArt.Location = New System.Drawing.Point(439, 9) + Me.cboDYDatumArt.Name = "cboDYDatumArt" + Me.cboDYDatumArt.Size = New System.Drawing.Size(234, 21) + Me.cboDYDatumArt.TabIndex = 39 + ' 'Label95 ' Me.Label95.AutoSize = True @@ -1074,6 +1114,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label95.TabIndex = 23 Me.Label95.Text = "NCTS-SYSTEM:" ' + 'cboDY_NCTS + ' + Me.cboDY_NCTS._allowedValuesFreiText = Nothing + Me.cboDY_NCTS._allowFreiText = False + Me.cboDY_NCTS._value = "" + Me.cboDY_NCTS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDY_NCTS.DropDownWidth = 350 + Me.cboDY_NCTS.FormattingEnabled = True + Me.cboDY_NCTS.Location = New System.Drawing.Point(148, 117) + Me.cboDY_NCTS.Name = "cboDY_NCTS" + Me.cboDY_NCTS.Size = New System.Drawing.Size(252, 21) + Me.cboDY_NCTS.TabIndex = 22 + ' 'cbxSplittungNachPos ' Me.cbxSplittungNachPos.AutoSize = True @@ -1249,7 +1302,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1262, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1245, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1292,7 +1345,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1254, 1803) + Me.TabPage1.Size = New System.Drawing.Size(1237, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1306,6 +1359,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label98.TabIndex = 39 Me.Label98.Text = "NCTS-SYSTEM (DAKOSY):" ' + 'cboNCTSSystemDY + ' + Me.cboNCTSSystemDY._allowedValuesFreiText = Nothing + Me.cboNCTSSystemDY._allowFreiText = False + Me.cboNCTSSystemDY._value = "" + Me.cboNCTSSystemDY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboNCTSSystemDY.DropDownWidth = 350 + Me.cboNCTSSystemDY.FormattingEnabled = True + Me.cboNCTSSystemDY.Location = New System.Drawing.Point(448, 706) + Me.cboNCTSSystemDY.Name = "cboNCTSSystemDY" + Me.cboNCTSSystemDY.Size = New System.Drawing.Size(252, 21) + Me.cboNCTSSystemDY.TabIndex = 38 + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.Label3) @@ -1646,6 +1712,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label94.TabIndex = 18 Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex._allowedValuesFreiText = Nothing + Me.cboBRG_Verimex._allowFreiText = False + Me.cboBRG_Verimex._value = "" + Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBRG_Verimex.DropDownWidth = 350 + Me.cboBRG_Verimex.FormattingEnabled = True + Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) + Me.cboBRG_Verimex.Name = "cboBRG_Verimex" + Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) + Me.cboBRG_Verimex.TabIndex = 17 + ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2079,6 +2158,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Label53.TabIndex = 13 Me.Label53.Text = "Bürgschaft (keine Auswahl = alle):" ' + 'cboBrgEZollTC + ' + Me.cboBrgEZollTC._allowedValuesFreiText = Nothing + Me.cboBrgEZollTC._allowFreiText = False + Me.cboBrgEZollTC._value = "" + Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBrgEZollTC.DropDownWidth = 350 + Me.cboBrgEZollTC.FormattingEnabled = True + Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) + Me.cboBrgEZollTC.Name = "cboBrgEZollTC" + Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) + Me.cboBrgEZollTC.TabIndex = 12 + ' 'Label55 ' Me.Label55.AutoSize = True @@ -2449,11 +2542,29 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1271, 1803) + Me.TabPage2.Size = New System.Drawing.Size(1237, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True ' + 'UsrCntlAuswertungenUIDPruefung1 + ' + Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) + Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" + Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) + Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 + ' + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 + ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1) @@ -2462,22 +2573,62 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1271, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1237, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True ' + 'UsrCntlAuswertungenEV_Veranlagungen1 + ' + Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) + Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" + Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) + Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 + ' + 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 + ' + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenFiskalvertretung_42001 + ' + Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" + Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) + Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 + ' 'TabPage4 ' Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1) Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(1271, 1803) + Me.TabPage4.Size = New System.Drawing.Size(1237, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True ' + 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 + ' + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 + ' + 'UsrCntlAuswertungenAufschub_Abgabenliste1 + ' + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 + ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label60) @@ -2486,7 +2637,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(1271, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1237, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2694,160 +2845,9 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1262, 57) + Me.pnl.Size = New System.Drawing.Size(1245, 57) Me.pnl.TabIndex = 23 ' - 'cboNCTSSystemDY - ' - Me.cboNCTSSystemDY._allowedValuesFreiText = Nothing - Me.cboNCTSSystemDY._allowFreiText = False - Me.cboNCTSSystemDY._value = "" - Me.cboNCTSSystemDY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboNCTSSystemDY.DropDownWidth = 350 - Me.cboNCTSSystemDY.FormattingEnabled = True - Me.cboNCTSSystemDY.Location = New System.Drawing.Point(448, 706) - Me.cboNCTSSystemDY.Name = "cboNCTSSystemDY" - Me.cboNCTSSystemDY.Size = New System.Drawing.Size(252, 21) - Me.cboNCTSSystemDY.TabIndex = 38 - ' - 'cboBRG_Verimex - ' - Me.cboBRG_Verimex._allowedValuesFreiText = Nothing - Me.cboBRG_Verimex._allowFreiText = False - Me.cboBRG_Verimex._value = "" - Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBRG_Verimex.DropDownWidth = 350 - Me.cboBRG_Verimex.FormattingEnabled = True - Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) - Me.cboBRG_Verimex.Name = "cboBRG_Verimex" - Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) - Me.cboBRG_Verimex.TabIndex = 17 - ' - 'cboBrgEZollTC - ' - Me.cboBrgEZollTC._allowedValuesFreiText = Nothing - Me.cboBrgEZollTC._allowFreiText = False - Me.cboBrgEZollTC._value = "" - Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBrgEZollTC.DropDownWidth = 350 - Me.cboBrgEZollTC.FormattingEnabled = True - Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) - Me.cboBrgEZollTC.Name = "cboBrgEZollTC" - Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) - Me.cboBrgEZollTC.TabIndex = 12 - ' - 'cboDYDatumArt - ' - Me.cboDYDatumArt._allowedValuesFreiText = Nothing - Me.cboDYDatumArt._allowFreiText = False - Me.cboDYDatumArt._value = "" - Me.cboDYDatumArt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDYDatumArt.DropDownWidth = 350 - Me.cboDYDatumArt.FormattingEnabled = True - Me.cboDYDatumArt.Location = New System.Drawing.Point(439, 9) - Me.cboDYDatumArt.Name = "cboDYDatumArt" - Me.cboDYDatumArt.Size = New System.Drawing.Size(234, 21) - Me.cboDYDatumArt.TabIndex = 39 - ' - 'cboDY_NCTS - ' - Me.cboDY_NCTS._allowedValuesFreiText = Nothing - Me.cboDY_NCTS._allowFreiText = False - Me.cboDY_NCTS._value = "" - Me.cboDY_NCTS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDY_NCTS.DropDownWidth = 350 - Me.cboDY_NCTS.FormattingEnabled = True - Me.cboDY_NCTS.Location = New System.Drawing.Point(148, 117) - Me.cboDY_NCTS.Name = "cboDY_NCTS" - Me.cboDY_NCTS.Size = New System.Drawing.Size(252, 21) - Me.cboDY_NCTS.TabIndex = 22 - ' - 'cboEZOLLBrg - ' - Me.cboEZOLLBrg._allowedValuesFreiText = Nothing - Me.cboEZOLLBrg._allowFreiText = False - Me.cboEZOLLBrg._value = "" - Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboEZOLLBrg.DropDownWidth = 350 - Me.cboEZOLLBrg.FormattingEnabled = True - Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) - Me.cboEZOLLBrg.Name = "cboEZOLLBrg" - Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) - Me.cboEZOLLBrg.TabIndex = 12 - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox1.DropDownWidth = 350 - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(186, 112) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(221, 21) - Me.MyComboBox1.TabIndex = 19 - ' - 'UsrCntlAuswertungenUIDPruefung1 - ' - Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) - Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" - Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) - Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 - ' - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 - ' - 'UsrCntlAuswertungenEV_Veranlagungen1 - ' - Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) - Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" - Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) - Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 - ' - 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 - ' - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenFiskalvertretung_42001 - ' - Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" - Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) - Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 - ' - 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 - ' - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 - ' - 'UsrCntlAuswertungenAufschub_Abgabenliste1 - ' - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 - ' 'usrCntlZOLLAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2857,7 +2857,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(1262, 1174) + Me.Size = New System.Drawing.Size(1245, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.grpDurmaz.ResumeLayout(False) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 9142391c..3bb9571d 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -332,6 +332,89 @@ Public Class cIDS End Function + Public Shared Function GET_Antraege_IDS(ByRef dt As DataTable, von As Date, bis As Date, KundenNr As Integer, LandKZ As String, Optional Archiv As Object = Nothing) As Boolean + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + + Using cmd As New SqlCommand("SELECT + tblIDSTransactionsNew.KdNrVERAG as Kundennummer, + ISNULL(tblIDSTransactionsNew.[OBONumber],ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) AS Rechnungsnummer, + tblIDSTransactionsNew.[YearMonthDay] AS Rechnungsdatum, + SUM(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag + FROM + + tblIDSTransactionsNew + INNER JOIN + tbl_IDS_Länder + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + WHERE + tblIDSTransactionsNew.[YearMonthDay] BETWEEN @von AND @bis + AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr + AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ + AND tblIDSTransactionsNew.[VATAmount] <> 0 + AND UStVAn_ID is null + GROUP BY + tblIDSTransactionsNew.KdNrVERAG, + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) + ORDER BY + tblIDSTransactionsNew.KdNrVERAG, + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]));", conn) + + cmd.Parameters.AddWithValue("@LandKZ", LandKZ) + cmd.Parameters.AddWithValue("@von", von) + cmd.Parameters.AddWithValue("@bis", bis) + cmd.Parameters.AddWithValue("@AdressenNr", KundenNr) + 'If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0)) + + Dim dr = cmd.ExecuteReader() + dt.Load(dr) + 'While dr.Read + ' dt.Load(dr) + 'End While + dr.Close() + + End Using + End Using + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return False + + End Function + + Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, ids_kdNr As Integer, country As String, UStVAn_ID As Integer) As Boolean + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reDat", reDat)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reNr", reNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ids_kdNr", ids_kdNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("country", country)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_ID", UStVAn_ID)) + + + Return SQL.doSQLVarList("update tblIDSTransactionsNew set UStVAn_ID = @UStVAn_ID + FROM tblIDSTransactionsNew + INNER JOIN tbl_IDS_Länder + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + WHERE + tblIDSTransactionsNew.[YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = @reNr + AND tblIDSTransactionsNew.KdNrVERAG = @ids_kdNr + AND tbl_IDS_Länder.[Lieferland_ISO2] = @country", "FMZOLL",, list) + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + Public Class Paramter diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index b7a990a5..3256be86 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -1274,7 +1274,7 @@ Public Class cUTA Return SQL.doSQLVarList(" - UPDATE [tblUTAImportNew] set abgerechnet=1, [abgerechnetDatum]=GETDATE(), UStVAn_ID = @ustvaId + UPDATE [tblUTAImportNew] set archiv=1, [archiviertDatum]=GETDATE(), UStVAn_ID = @ustvaId WHERE cast(Rechnungsdatum as date) = @reDat and Rechnungsnummer_pro_Lieferland = @reNr and Kundennummer=@uta_kdNr ", "FMZOLL",, list) diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 5c2a8eb7..ec3a1903 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -7,6 +7,7 @@ Imports System.Text.RegularExpressions Imports System.Windows.Forms Imports iTextSharp.text.pdf Imports Spire.Pdf +Imports Spire.Pdf.Attachments Imports Spire.Pdf.Print @@ -2267,6 +2268,28 @@ Public Class DATENVERVER_OPTIONS Return "" End Function + + Public Shared Function addAttachementToPDF(File As String, attPath As String) As String + Try + + Dim pdf As New Spire.Pdf.PdfDocument() + + Dim docPdf As Spire.Pdf.PdfDocument = New Spire.Pdf.PdfDocument() + docPdf.LoadFromFile(File) + + Dim attachment As PdfAttachment = New PdfAttachment(attPath) + + docPdf.Attachments.Add(attachment) + docPdf.SaveToFile(File) + + Return File + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + Public Shared Function getFileExtensionFromBase64String(base64 As String) As String Dim list As List(Of KeyValuePair(Of String, String)) = New List(Of KeyValuePair(Of String, String)) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index ebbad64f..6d87cdb4 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -1363,13 +1363,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, 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, 'MAUT' as specification_page_name/*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, trans.original_currency) as temp + group by bills.invoice_date, bills.invoice_number, cust.[customer_id], /*bills.specification_page_name*/specification_page_name, trans.original_currency) as temp where temp.UST <> 0", conn) cmd.Parameters.AddWithValue("@von", von) diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index b8879c4d..93bf326e 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -473,6 +473,14 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Return SQL.getValueTxtBySql(sqlstr, "FMZOLL") End Function + Shared Function getISO2LandFromLandNr(LandNr As Integer) + If Not IsNumeric(LandNr) Then Return Nothing + If LandNr = 0 Then Return Nothing + Dim sqlstr = "SELECT TOP 1 isnull(LandKz,'') AS LandKzISO2 from [Länderverzeichnis für die Außenhandelsstatistik] where LandNr = '" & LandNr & "' " + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Return SQL.getValueTxtBySql(sqlstr, "FMZOLL") + End Function + Shared Function getISO2Land(LandKz As String) If LandKz Is Nothing Then Return Nothing Dim sqlstr = "SELECT TOP 1 isnull([Länderverzeichnis für die Außenhandelsstatistik].LandKz,'') AS LandKzISO2 FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN Währungstabelle ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = Währungstabelle.Währungsschlüssel WHERE Währungstabelle.LandKz='" & LandKz & "' "