From 2d8eef17bc1cc9f17732bf1e46e794f59c441a42 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 3 Dec 2024 11:37:47 +0100 Subject: [PATCH] MDM, USTVA, MDMFunctions, --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 144 ++++++------ SDL/USTV/frmMDM_USTVAntrag.vb | 160 ++++++++++--- SDL/USTV/usrCntlUSTV.Designer.vb | 212 +++++++++--------- SDL/USTV/usrCntlUSTV.vb | 16 +- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 77 ++++++- SDL/mdm/frmMDMDatenverarbetiung.vb | 19 +- .../Classes/USTV/cUSTVAntrag.vb | 8 + .../Classes/cMDMFunctionsAllgemein.vb | 21 +- VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb | 2 +- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 8 + 10 files changed, 430 insertions(+), 237 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index b8b9d136..d929cd8a 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -27,7 +27,7 @@ Partial Class frmMDM_USTVAntrag Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) Me.Panel3 = New System.Windows.Forms.Panel() Me.btnMail = New System.Windows.Forms.Button() - Me.Button14 = New System.Windows.Forms.Button() + Me.btnAntrageeinarbeiten = New System.Windows.Forms.Button() Me.cbxArchivierteEintracheNochmalsEinarbetien = New System.Windows.Forms.CheckBox() Me.Button1 = New System.Windows.Forms.Button() Me.lbl_EintrageVerarbetiet = New System.Windows.Forms.Label() @@ -71,12 +71,12 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnl = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() - Me.Button3 = New System.Windows.Forms.Button() - Me.Button2 = New System.Windows.Forms.Button() + Me.btnEintragloeschen = New System.Windows.Forms.Button() + Me.btnNeuerEintrag = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel3.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel9.SuspendLayout() @@ -96,7 +96,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.Panel3.Controls.Add(Me.btnMail) - Me.Panel3.Controls.Add(Me.Button14) + Me.Panel3.Controls.Add(Me.btnAntrageeinarbeiten) Me.Panel3.Controls.Add(Me.cbxArchivierteEintracheNochmalsEinarbetien) Me.Panel3.Controls.Add(Me.Button1) Me.Panel3.Controls.Add(Me.lbl_EintrageVerarbetiet) @@ -118,20 +118,20 @@ Partial Class frmMDM_USTVAntrag Me.btnMail.Text = "Anträge" Me.btnMail.UseVisualStyleBackColor = True ' - 'Button14 + 'btnAntrageeinarbeiten ' - Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button14.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) - Me.Button14.ForeColor = System.Drawing.Color.Black - Me.Button14.Image = Global.SDL.My.Resources.Resources.plus - Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button14.Location = New System.Drawing.Point(12, 29) - Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(168, 38) - Me.Button14.TabIndex = 1 - Me.Button14.Text = "Anträge übernehmen" - Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button14.UseVisualStyleBackColor = True + Me.btnAntrageeinarbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAntrageeinarbeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnAntrageeinarbeiten.ForeColor = System.Drawing.Color.Black + Me.btnAntrageeinarbeiten.Image = Global.SDL.My.Resources.Resources.plus + Me.btnAntrageeinarbeiten.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAntrageeinarbeiten.Location = New System.Drawing.Point(12, 29) + Me.btnAntrageeinarbeiten.Name = "btnAntrageeinarbeiten" + Me.btnAntrageeinarbeiten.Size = New System.Drawing.Size(168, 38) + Me.btnAntrageeinarbeiten.TabIndex = 1 + Me.btnAntrageeinarbeiten.Text = "Anträge übernehmen" + Me.btnAntrageeinarbeiten.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAntrageeinarbeiten.UseVisualStyleBackColor = True ' 'cbxArchivierteEintracheNochmalsEinarbetien ' @@ -745,6 +745,56 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1300, 269) Me.Panel2.TabIndex = 1 ' + 'Panel4 + ' + Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.btnEintragloeschen) + Me.Panel4.Controls.Add(Me.btnNeuerEintrag) + Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left + Me.Panel4.Location = New System.Drawing.Point(0, 0) + Me.Panel4.Name = "Panel4" + Me.Panel4.Size = New System.Drawing.Size(154, 269) + Me.Panel4.TabIndex = 0 + ' + 'btnEintragloeschen + ' + Me.btnEintragloeschen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnEintragloeschen.ForeColor = System.Drawing.Color.Black + Me.btnEintragloeschen.Image = Global.SDL.My.Resources.Resources.del + Me.btnEintragloeschen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnEintragloeschen.Location = New System.Drawing.Point(6, 50) + Me.btnEintragloeschen.Name = "btnEintragloeschen" + Me.btnEintragloeschen.Size = New System.Drawing.Size(135, 39) + Me.btnEintragloeschen.TabIndex = 1 + Me.btnEintragloeschen.Text = "Eintrag löschen" + Me.btnEintragloeschen.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnEintragloeschen.UseVisualStyleBackColor = True + ' + 'btnNeuerEintrag + ' + Me.btnNeuerEintrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNeuerEintrag.ForeColor = System.Drawing.Color.Black + Me.btnNeuerEintrag.Image = Global.SDL.My.Resources.Resources.plus + Me.btnNeuerEintrag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNeuerEintrag.Location = New System.Drawing.Point(6, 5) + Me.btnNeuerEintrag.Name = "btnNeuerEintrag" + Me.btnNeuerEintrag.Size = New System.Drawing.Size(135, 39) + Me.btnNeuerEintrag.TabIndex = 0 + Me.btnNeuerEintrag.Text = "Neuer Eintrag" + Me.btnNeuerEintrag.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnNeuerEintrag.UseVisualStyleBackColor = True + ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) + ' + 'ContextMenuStrip2 + ' + Me.ContextMenuStrip2.Name = "ContextMenuStrip1" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) + ' 'UstCntlUSTV_AntragPosition1 ' Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill @@ -753,58 +803,6 @@ Partial Class frmMDM_USTVAntrag Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267) Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 ' - 'Panel4 - ' - Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke - Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel4.Controls.Add(Me.Button3) - Me.Panel4.Controls.Add(Me.Button2) - Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left - Me.Panel4.Location = New System.Drawing.Point(0, 0) - Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(154, 269) - Me.Panel4.TabIndex = 0 - ' - 'Button3 - ' - Me.Button3.Enabled = False - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.ForeColor = System.Drawing.Color.Black - Me.Button3.Image = Global.SDL.My.Resources.Resources.del - Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(6, 50) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(135, 39) - Me.Button3.TabIndex = 1 - Me.Button3.Text = "Eintrag löschen" - Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button3.UseVisualStyleBackColor = True - ' - 'Button2 - ' - Me.Button2.Enabled = False - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.ForeColor = System.Drawing.Color.Black - Me.Button2.Image = Global.SDL.My.Resources.Resources.plus - Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(6, 5) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(135, 39) - Me.Button2.TabIndex = 0 - Me.Button2.Text = "Neuer Eintrag" - Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button2.UseVisualStyleBackColor = True - ' - 'ContextMenuStrip1 - ' - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 26) - ' - 'ContextMenuStrip2 - ' - Me.ContextMenuStrip2.Name = "ContextMenuStrip1" - Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -842,7 +840,7 @@ Partial Class frmMDM_USTVAntrag End Sub Friend WithEvents Panel3 As Panel - Friend WithEvents Button14 As Button + Friend WithEvents btnAntrageeinarbeiten As Button Friend WithEvents Panel1 As Panel Friend WithEvents lblFirma As Label Friend WithEvents pnlFilter As Panel @@ -857,9 +855,9 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents Button1 As Button Friend WithEvents pnl As Panel Friend WithEvents Panel2 As Panel - Friend WithEvents Button2 As Button + Friend WithEvents btnNeuerEintrag As Button Friend WithEvents Panel4 As Panel - Friend WithEvents Button3 As Button + Friend WithEvents btnEintragloeschen As Button Friend WithEvents txtBis As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtVon As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents UstCntlUSTV_AntragPosition1 As ustCntlUSTV_AntragPosition diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 3517cdda..5c556ffe 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1,5 +1,7 @@  Imports System.Reflection +Imports System.Web.UI.WebControls.Expressions +Imports jdk.nashorn.internal.objects.annotations 'Imports DocumentFormat.OpenXml.Drawing.Charts Imports Microsoft.Office.Interop @@ -122,8 +124,8 @@ Public Class frmMDM_USTVAntrag Select Case If(r.Cells("UStVPo_SchnittstellenNr").Value, -1) Case 6, 0 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [plInv_daId] FROM [tblPLOSE_Inv_Data] where plInv_SupplierRechnungsDatum='" & r.Cells("UStVPo_ReDat").Value & "' and plInv_SupplierRechnungsNr='" & r.Cells("UStVPo_ReNr").Value & "' and plInv_SupplierCountry='" & Antrag_LandKz & "' AND [plInv_daId] is not null", "FMZOLL",,, -1) - 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 4, 9 : 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 10 : 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 @@ -180,9 +182,6 @@ Public Class frmMDM_USTVAntrag End If - - - End Sub Sub setValue(USTV_ANTRAG As VERAG_PROG_ALLGEMEIN.cUSTVAntrag) @@ -222,6 +221,8 @@ Public Class frmMDM_USTVAntrag End If + + End If End Sub Function Me_Validate() As Boolean @@ -272,11 +273,23 @@ Public Class frmMDM_USTVAntrag setValue(USTV_ANTRAG) End If + + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then + btnAntrageeinarbeiten.Enabled = False + FlowLayoutPanel.Enabled = False + btnEintragloeschen.Enabled = False + btnNeuerEintrag.Enabled = False + UstCntlUSTV_AntragPosition1.Enabled = False + + End If + + + init() End Sub - Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click + Private Sub Button14_Click(sender As Object, e As EventArgs) Handles btnAntrageeinarbeiten.Click @@ -372,7 +385,7 @@ Public Class frmMDM_USTVAntrag Shared Function loadUSTVFrom_PLOSE(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean Try - Dim bytSchnittstellenNr = 6 'glaube noch frei? + Dim bytSchnittstellenNr = 6 Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID) Dim GET_Antraege = MDM_Worker.cPLOSE.GET_Antraege(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) @@ -420,7 +433,7 @@ Public Class frmMDM_USTVAntrag Shared Function loadUSTVFrom_RMC(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean Try - Dim bytSchnittstellenNr = 7 'glaube noch frei? + Dim bytSchnittstellenNr = 7 Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID) Dim dt As New DataTable Dim GET_Antraege = cRMC.GET_Antraege_RMC(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) @@ -483,7 +496,7 @@ Public Class frmMDM_USTVAntrag Shared Function loadUSTVFrom_MSE(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean Try - Dim bytSchnittstellenNr = 4 'damit von alter Schnittstelle und neue Schnittstelle keine Daten doppelt importiert werden + Dim bytSchnittstellenNr = 9 '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 = cMSEAPI.GET_Antraege_MSE(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, USTV_ANTRAG.UStVAn_Währungscode, ArchivierteEintracheNochmalsEinarbetien) @@ -549,7 +562,7 @@ Public Class frmMDM_USTVAntrag Shared Function loadUSTVFrom_UTA(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean Try - Dim bytSchnittstellenNr = 5 'damit von alter Schnittstelle und neue Schnittstelle keine Daten doppelt importiert werden + Dim bytSchnittstellenNr = 10 '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 = cUTA.GET_Antraege_UTA(dt, USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, USTV_ANTRAG.UStVAn_Währungscode, ArchivierteEintracheNochmalsEinarbetien) @@ -850,15 +863,107 @@ Public Class frmMDM_USTVAntrag cboStatus.changeItem(cUSTVStatus.STAT_STORNO) End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnNeuerEintrag.Click UstCntlUSTV_AntragPosition1.reset() UstCntlUSTV_AntragPosition1.UStV_POS = Nothing UstCntlUSTV_AntragPosition1.Enabled = True + + End Sub - Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnEintragloeschen.Click If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then - 'UstCntlUSTV_AntragPosition1.UStV_POS.delete() + + If UstCntlUSTV_AntragPosition1.cbxAPI IsNot Nothing AndAlso UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value IsNot Nothing Then + Dim updated As Boolean = False + Dim sqlText = "" + Dim test As Boolean = True + Select Case UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value + + Case 1 'VERAG 360 GmbH; 4975 Suben + 'UStV-Antragsnummer im Buchungssatz löschen. + sqlText = "Update tblTrdinInvoice SET tblTrdinInvoice.UStVAn_ID = NULL WHERE tblTrdinInvoice.Rechnungsdatum = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & " And tblTrdinInvoice.Rechnungsnummer = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 2 ' UStV-Antragsnummer im IDSDieseldatenArchiv löschen 'IDS alte Schnittstelle - OK + sqlText = "UPDATE tblDieselArchiv SET tblDieselArchiv.UStVAn_ID = NULL FROM tblDieselArchiv INNER JOIN tbl_IDS_Länder ON tblDieselArchiv.[Outlet Country Code] = tbl_IDS_Länder.OutletCountryCode WHERE (((tblDieselArchiv.[Year Month Day])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "') AND ((ISNULL([OBO Number],ISNULL([VR Number],[Payment summary number])))='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "') AND ((tblDieselArchiv.KdNrVERAG)=" & USTV_ANTRAG.UStVAn_KuNr & ") AND ((tbl_IDS_Länder.LandNr)=" & USTV_ANTRAG.UStVAn_LandNr & "))" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 3 'Telepass ' UStV-Antragsnummer in tblMautITArchiv löschen.- NICHT MEHR AKTIV + sqlText = "UPDATE tblMautITArchiv SET tblMautITArchiv.UStVAn_ID = NULL WHERE tblMautITArchiv.Verrechnungsdatum=" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' AND tblMautITArchiv.Code_Adressat_des_Kontoauszugs=" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " AND ([Betrag_mit_Preisnachlass_oder_Preisnachlass]-[Nicht_mehrwertsteuerpflichtiger_Betrag])<>0" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + + Case 4 'MS Europe BV; GC Rijswijk alte Schnittstelle UStV-Antragsnummer in tblMSETransactionsArchiv löschen. - OK + sqlText = "UPDATE tblMSETransactionsArchiv SET tblMSETransactionsArchiv.UStVAn_ID = NULL FROM tblMSETransactionsArchiv INNER JOIN Adressen ON tblMSETransactionsArchiv.[Customer ID] = Adressen.MSEKundenNr WHERE (((tblMSETransactionsArchiv.[Invoice Date])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "') AND ((tblMSETransactionsArchiv.[Invoice ID])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "') AND ((tblMSETransactionsArchiv.[Specification Page])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_Leistungsbezeichnung & "') AND ((Adressen.AdressenNr)=" & USTV_ANTRAG.UStVAn_KuNr & ") AND ((tblMSETransactionsArchiv.[Transaction Country])='" & UstCntlUSTV_AntragPosition1.Antrag_LandKz & "') AND ((tblMSETransactionsArchiv.[Original Currency])='" & USTV_ANTRAG.UStVAn_Währungscode & "') AND ((tblMSETransactionsArchiv.[Original VAT Amount])<>0))" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 5 'UNIONTANK - UTA - OK + ' UStV-Antragsnummer in tblUTAArchiv löschen. + sqlText = + "UPDATE tblUTAArchiv SET tblUTAArchiv.UStVAn_ID = [prmUStVAn_ID] FROM tblUTAArchiv INNER JOIN Adressen ON tblUTAArchiv.Kundennummer = Adressen.UTAKundenNr + WHERE tblUTAArchiv.Rechnungsdatum='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' + AND tblUTAArchiv.Rechnungsnummer_pro_Lieferland=" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " + AND tblUTAArchiv.Lieferland='" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO3LandFromLandNr(USTV_ANTRAG.UStVAn_LandNr) & "' + AND tblUTAArchiv.Lieferlandwährung_ISO='" & USTV_ANTRAG.UStVAn_Währungscode & "' + AND Adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " + AND ([Gesamtbetrag_Brutto_in_Lieferlandwährung]-[Gesamtbetrag_Netto_in_Lieferlandwährung])<>0" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 6 'PLOSE + sqlText = "Update [tblPLOSE_Details] + set plose_Archiv=0, [plose_ArchiviertDatum]=NULL, UStVAn_ID = NULL + From [tblPLOSE_Details] INNER Join Adressen On PLOSEKundenNr=plose_POLSEKundennummer + INNER Join [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode] + WHERE cast(plose_RechnungsDatum As Date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " AND plose_RechnungsNr = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "' + And plose_LieferantCode IN (0,1,7) " + + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 7 'RMC - neue Schnittstelle - OK + sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And rmc_reNr = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 8 'IDS neue Schnittstelle - OK + sqlText = "update tblIDSTransactionsNew set UStVAn_ID = NULL + From tblIDSTransactionsNew + INNER Join tbl_IDS_Länder + On tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + Where + tblIDSTransactionsNew.[YearMonthDay] = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "' + And tblIDSTransactionsNew.KdNrVERAG = " & USTV_ANTRAG.UStVAn_KuNr & " + And tbl_IDS_Länder.[Lieferland_ISO2] = '" & Antrag_LandKz & "'" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 9 'MSE neue Schnitttelle - OK + If UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr.ToString.Length >= 15 Then + Dim invoiceNo = UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr.ToString.Substring(0, 7) + Dim customerNo = UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr.ToString.Substring(10, 5) + sqlText = "UPDATE [tblMSEInvoices] set UStVAn_ID = NULL FROM [tblMSEInvoices] inner join [tblMSECustomers] on tblMSEInvoices.customer_number = tblMSECustomers.customer_id WHERE cast(invoice_date as date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And invoice_id = " & invoiceNo & " And tblMSECustomers.partner_customer_number= " & USTV_ANTRAG.UStVAn_KuNr & " And country = '" & UstCntlUSTV_AntragPosition1.Antrag_LandKz & "' and tblMSEInvoices.customer_number = " & customerNo + + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + End If + + Case 10 ' UTA neue Schnittstelle - OK + sqlText = "UPDATE [tblUTAImportNew] set UStVAn_ID = NULL from [tblUTAImportNew] INNER JOIN Adressen ON [tblUTAImportNew].Kundennummer = Adressen.UTAKundenNr WHERE cast(Rechnungsdatum as date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And Rechnungsnummer_pro_Lieferland = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " And Adressen.AdressenNr= " & USTV_ANTRAG.UStVAn_KuNr & " AND Lieferland_ISO2 = '" & UstCntlUSTV_AntragPosition1.Antrag_LandKz & "'" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + End Select + + If UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value IsNot Nothing AndAlso (UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value > 0 And UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value < 11) Then + If Not updated Then + If Not vbYes = MsgBox("Fehler beim zurücksetzen der USTVA-ID!" & vbNewLine & "Möchten Sie den Eintrag trotzdem löschen?", vbYesNoCancel) Then + Exit Sub + End If + End If + + End If + + UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) + init() + + End If + UstCntlUSTV_AntragPosition1.Enabled = False End If @@ -923,23 +1028,22 @@ Public Class frmMDM_USTVAntrag Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean - Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount - FROM [tblUStVPositionen] - inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] - inner join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID - where [tblUStVPositionen].UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID" + Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount + From [tblUStVPositionen] + inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] + inner Join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID + Where [tblUStVPositionen].UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID" - Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") + Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel) + Return True + Else + If feedback Then MsgBox("keine Daten vorhanden!") + Return False + End If - If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel) - Return True - Else - If feedback Then MsgBox("keine Daten vorhanden!") - Return False - End If - - End Function + End Function Private Sub mailmitExcelauswertung() diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index e9c1304a..c5a1a44b 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -28,6 +28,10 @@ Partial Class usrCntlUSTV Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.txtOPSaldo = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label11 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() Me.txtSumDiff = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnKundendatenaktualisieren = New System.Windows.Forms.Button() @@ -52,8 +56,8 @@ Partial Class usrCntlUSTV Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.cboJahr = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() - Me.Button14 = New System.Windows.Forms.Button() - Me.FlatButton2 = New System.Windows.Forms.Button() + Me.btnNeuerUSTVA = New System.Windows.Forms.Button() + Me.btnUSTVAloeschen = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnMail = New System.Windows.Forms.Button() @@ -62,10 +66,6 @@ Partial Class usrCntlUSTV Me.Button8 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label10 = New System.Windows.Forms.Label() - Me.txtOPSaldo = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label11 = New System.Windows.Forms.Label() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -148,6 +148,76 @@ Partial Class usrCntlUSTV Me.Panel1.Size = New System.Drawing.Size(1627, 108) Me.Panel1.TabIndex = 0 ' + 'txtRisiko + ' + Me.txtRisiko._DateTimeOnly = False + Me.txtRisiko._numbersOnly = False + Me.txtRisiko._numbersOnlyKommastellen = "" + Me.txtRisiko._numbersOnlyTrennzeichen = True + Me.txtRisiko._Prozent = False + Me.txtRisiko._ShortDateNew = False + Me.txtRisiko._ShortDateOnly = False + Me.txtRisiko._TimeOnly = False + Me.txtRisiko._TimeOnly_Seconds = False + Me.txtRisiko._value = "" + Me.txtRisiko._Waehrung = True + Me.txtRisiko._WaehrungZeichen = True + Me.txtRisiko.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtRisiko.ForeColor = System.Drawing.Color.Black + Me.txtRisiko.Location = New System.Drawing.Point(882, 45) + Me.txtRisiko.MaxLineLength = -1 + Me.txtRisiko.MaxLines_Warning = "" + Me.txtRisiko.MaxLines_Warning_Label = Nothing + Me.txtRisiko.Name = "txtRisiko" + Me.txtRisiko.ReadOnly = True + Me.txtRisiko.Size = New System.Drawing.Size(91, 20) + Me.txtRisiko.TabIndex = 56 + ' + 'Label10 + ' + Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(821, 48) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(36, 13) + Me.Label10.TabIndex = 55 + Me.Label10.Text = "Risiko" + ' + 'txtOPSaldo + ' + Me.txtOPSaldo._DateTimeOnly = False + Me.txtOPSaldo._numbersOnly = False + Me.txtOPSaldo._numbersOnlyKommastellen = "" + Me.txtOPSaldo._numbersOnlyTrennzeichen = True + Me.txtOPSaldo._Prozent = False + Me.txtOPSaldo._ShortDateNew = False + Me.txtOPSaldo._ShortDateOnly = False + Me.txtOPSaldo._TimeOnly = False + Me.txtOPSaldo._TimeOnly_Seconds = False + Me.txtOPSaldo._value = "" + Me.txtOPSaldo._Waehrung = True + Me.txtOPSaldo._WaehrungZeichen = True + Me.txtOPSaldo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtOPSaldo.ForeColor = System.Drawing.Color.Black + Me.txtOPSaldo.Location = New System.Drawing.Point(882, 25) + Me.txtOPSaldo.MaxLineLength = -1 + Me.txtOPSaldo.MaxLines_Warning = "" + Me.txtOPSaldo.MaxLines_Warning_Label = Nothing + Me.txtOPSaldo.Name = "txtOPSaldo" + Me.txtOPSaldo.ReadOnly = True + Me.txtOPSaldo.Size = New System.Drawing.Size(91, 20) + Me.txtOPSaldo.TabIndex = 54 + ' + 'Label11 + ' + Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(824, 32) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(52, 13) + Me.Label11.TabIndex = 53 + Me.Label11.Text = "OP-Saldo" + ' 'Label9 ' Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -529,35 +599,35 @@ Partial Class usrCntlUSTV Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button1.UseVisualStyleBackColor = True ' - 'Button14 + 'btnNeuerUSTVA ' - Me.Button14.Enabled = False - Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button14.ForeColor = System.Drawing.Color.Black - Me.Button14.Image = Global.SDL.My.Resources.Resources.plus - Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button14.Location = New System.Drawing.Point(7, 6) - Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(75, 39) - Me.Button14.TabIndex = 3 - Me.Button14.Text = "Neu" - Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button14.UseVisualStyleBackColor = True + Me.btnNeuerUSTVA.Enabled = False + Me.btnNeuerUSTVA.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNeuerUSTVA.ForeColor = System.Drawing.Color.Black + Me.btnNeuerUSTVA.Image = Global.SDL.My.Resources.Resources.plus + Me.btnNeuerUSTVA.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNeuerUSTVA.Location = New System.Drawing.Point(7, 6) + Me.btnNeuerUSTVA.Name = "btnNeuerUSTVA" + Me.btnNeuerUSTVA.Size = New System.Drawing.Size(75, 39) + Me.btnNeuerUSTVA.TabIndex = 3 + Me.btnNeuerUSTVA.Text = "Neu" + Me.btnNeuerUSTVA.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnNeuerUSTVA.UseVisualStyleBackColor = True ' - 'FlatButton2 + 'btnUSTVAloeschen ' - Me.FlatButton2.Enabled = False - Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Image = Global.SDL.My.Resources.Resources.del - Me.FlatButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.FlatButton2.Location = New System.Drawing.Point(88, 7) - Me.FlatButton2.Name = "FlatButton2" - Me.FlatButton2.Size = New System.Drawing.Size(86, 39) - Me.FlatButton2.TabIndex = 4 - Me.FlatButton2.Text = "Löschen" - Me.FlatButton2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.FlatButton2.UseVisualStyleBackColor = True + Me.btnUSTVAloeschen.Enabled = False + Me.btnUSTVAloeschen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUSTVAloeschen.ForeColor = System.Drawing.Color.Black + Me.btnUSTVAloeschen.Image = Global.SDL.My.Resources.Resources.del + Me.btnUSTVAloeschen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnUSTVAloeschen.Location = New System.Drawing.Point(88, 7) + Me.btnUSTVAloeschen.Name = "btnUSTVAloeschen" + Me.btnUSTVAloeschen.Size = New System.Drawing.Size(86, 39) + Me.btnUSTVAloeschen.TabIndex = 4 + Me.btnUSTVAloeschen.Text = "Löschen" + Me.btnUSTVAloeschen.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnUSTVAloeschen.UseVisualStyleBackColor = True ' 'Panel2 ' @@ -578,8 +648,8 @@ Partial Class usrCntlUSTV Me.Panel3.Controls.Add(Me.Button5) Me.Panel3.Controls.Add(Me.Button8) Me.Panel3.Controls.Add(Me.Button1) - Me.Panel3.Controls.Add(Me.Button14) - Me.Panel3.Controls.Add(Me.FlatButton2) + Me.Panel3.Controls.Add(Me.btnNeuerUSTVA) + Me.Panel3.Controls.Add(Me.btnUSTVAloeschen) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" @@ -652,76 +722,6 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'txtRisiko - ' - Me.txtRisiko._DateTimeOnly = False - Me.txtRisiko._numbersOnly = False - Me.txtRisiko._numbersOnlyKommastellen = "" - Me.txtRisiko._numbersOnlyTrennzeichen = True - Me.txtRisiko._Prozent = False - Me.txtRisiko._ShortDateNew = False - Me.txtRisiko._ShortDateOnly = False - Me.txtRisiko._TimeOnly = False - Me.txtRisiko._TimeOnly_Seconds = False - Me.txtRisiko._value = "" - Me.txtRisiko._Waehrung = True - Me.txtRisiko._WaehrungZeichen = True - Me.txtRisiko.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtRisiko.ForeColor = System.Drawing.Color.Black - Me.txtRisiko.Location = New System.Drawing.Point(882, 45) - Me.txtRisiko.MaxLineLength = -1 - Me.txtRisiko.MaxLines_Warning = "" - Me.txtRisiko.MaxLines_Warning_Label = Nothing - Me.txtRisiko.Name = "txtRisiko" - Me.txtRisiko.ReadOnly = True - Me.txtRisiko.Size = New System.Drawing.Size(91, 20) - Me.txtRisiko.TabIndex = 56 - ' - 'Label10 - ' - Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(821, 48) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(36, 13) - Me.Label10.TabIndex = 55 - Me.Label10.Text = "Risiko" - ' - 'txtOPSaldo - ' - Me.txtOPSaldo._DateTimeOnly = False - Me.txtOPSaldo._numbersOnly = False - Me.txtOPSaldo._numbersOnlyKommastellen = "" - Me.txtOPSaldo._numbersOnlyTrennzeichen = True - Me.txtOPSaldo._Prozent = False - Me.txtOPSaldo._ShortDateNew = False - Me.txtOPSaldo._ShortDateOnly = False - Me.txtOPSaldo._TimeOnly = False - Me.txtOPSaldo._TimeOnly_Seconds = False - Me.txtOPSaldo._value = "" - Me.txtOPSaldo._Waehrung = True - Me.txtOPSaldo._WaehrungZeichen = True - Me.txtOPSaldo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtOPSaldo.ForeColor = System.Drawing.Color.Black - Me.txtOPSaldo.Location = New System.Drawing.Point(882, 25) - Me.txtOPSaldo.MaxLineLength = -1 - Me.txtOPSaldo.MaxLines_Warning = "" - Me.txtOPSaldo.MaxLines_Warning_Label = Nothing - Me.txtOPSaldo.Name = "txtOPSaldo" - Me.txtOPSaldo.ReadOnly = True - Me.txtOPSaldo.Size = New System.Drawing.Size(91, 20) - Me.txtOPSaldo.TabIndex = 54 - ' - 'Label11 - ' - Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(824, 32) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(52, 13) - Me.Label11.TabIndex = 53 - Me.Label11.Text = "OP-Saldo" - ' 'usrCntlUSTV ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -746,8 +746,8 @@ Partial Class usrCntlUSTV Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents Panel2 As System.Windows.Forms.Panel Friend WithEvents Panel3 As System.Windows.Forms.Panel - Friend WithEvents Button14 As System.Windows.Forms.Button - Friend WithEvents FlatButton2 As System.Windows.Forms.Button + Friend WithEvents btnNeuerUSTVA As System.Windows.Forms.Button + Friend WithEvents btnUSTVAloeschen As System.Windows.Forms.Button Friend WithEvents Label2 As Label Friend WithEvents lblKunde As Label Friend WithEvents KdSearchBox1 As VERAG_PROG_ALLGEMEIN.KdSearchBox diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 1f597fb6..bfffd6cb 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -278,16 +278,20 @@ Public Class usrCntlUSTV cboJahrBis.changeItem(Now.Year) - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then 'FlatButton1.Enabled = False# - FlatButton2.Enabled = False - Button14.Enabled = False + btnUSTVAloeschen.Enabled = False + btnNeuerUSTVA.Enabled = False + btnPLOSEAlle.Enabled = False Else If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - FlatButton2.Enabled = True - Button14.Enabled = True + btnUSTVAloeschen.Enabled = True + btnNeuerUSTVA.Enabled = True + Else + btnUSTVAloeschen.Enabled = True + btnNeuerUSTVA.Enabled = True End If End If ' Panel3.Height = Me.Height / 2 + 300 @@ -658,4 +662,6 @@ Public Class usrCntlUSTV End If Me.Cursor = Cursors.Default End Sub + + End Class diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index 5baec5e7..b165df5f 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -2,13 +2,14 @@ Imports GrapeCity.ActiveReports.ReportsCore.Tools +Imports GrapeCity.DataVisualization.TypeScript Imports VERAG_PROG_ALLGEMEIN Public Class ustCntlUSTV_AntragPosition Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing Public UStV_Leist As VERAG_PROG_ALLGEMEIN.cUStVLeistender = Nothing Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - Dim Antrag_LandKz = "" + Public Antrag_LandKz = "" Dim kdnr = "" Public Event EV_PREV() @@ -28,10 +29,21 @@ Public Class ustCntlUSTV_AntragPosition txtRgDatum._value = "" txtRgNr._value = "" picSave.Visible = False + txtUmrechnungskurs._value = 1 + txtLeistungsbezeichnung._value = "" + txtUmrechnungskurs._value = 1 + txtUSTBetrag._value = 0 + txtUSTBetragEUR._value = 0 + cbxAPI.Checked = False + cboSchnittstellennr.changeItem("") + + End Sub Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender) + initSchnittstellenNR() + gridAktiv = False picSave.Visible = False Me.Antrag_LandKz = Antrag_LandKz @@ -49,6 +61,7 @@ Public Class ustCntlUSTV_AntragPosition txtUmrechnungskurs.Text = If(UStV_POS.UStVPo_Umrechnungskurs, "") txtUSTBetragEUR.Text = If(UStV_POS.UStVPo_USteuerbetragEUR, "") + If UStV_Leitender IsNot Nothing Then UStV_Leist = UStV_Leitender loadChangedDSToPanel(Not UStV_Leitender.UstV_Leistender_Adresse, UStV_Leitender) @@ -58,13 +71,17 @@ Public Class ustCntlUSTV_AntragPosition Select Case If(UStV_POS.UStVPo_SchnittstellenNr, -1) Case 6, 0 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [plInv_daId] FROM [tblPLOSE_Inv_Data] where plInv_SupplierRechnungsDatum='" & UStV_POS.UStVPo_ReDat & "' and plInv_SupplierRechnungsNr='" & UStV_POS.UStVPo_ReNr & "' and plInv_SupplierCountry='" & Antrag_LandKz & "' AND [plInv_daId] is not null", "FMZOLL",,, -1) Case 7 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1) - 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='" & UStV_POS.UStVPo_ReDat & "' and country='" & Antrag_LandKz & "' AND partner_customer_number = " & kdnr & " AND daId is not null", "FMZOLL",,, -1) - Case 5 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblUTAImportNew] where Rechnungsdatum='" & UStV_POS.UStVPo_ReDat & "' and Abrechnungsnummer='" & UStV_POS.UStVPo_ReNr & "' and Lieferland_ISO2='" & Antrag_LandKz & "' AND daId is not null", "FMZOLL",,, -1) + Case 4, 9 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblMSEInvoices] as inv inner join tblMSECustomers on inv.customer_number = customer_id where invoice_date='" & UStV_POS.UStVPo_ReDat & "' and country='" & Antrag_LandKz & "' AND partner_customer_number = " & kdnr & " AND daId is not null", "FMZOLL",,, -1) + Case 10 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblUTAImportNew] where Rechnungsdatum='" & UStV_POS.UStVPo_ReDat & "' and Abrechnungsnummer='" & UStV_POS.UStVPo_ReNr & "' and Lieferland_ISO2='" & Antrag_LandKz & "' AND 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] ='" & UStV_POS.UStVPo_ReDat & "' and tblIDSTransactionsNew.[Paymentsummarynumber]='" & UStV_POS.UStVPo_ReNr & "' and tbl_IDS_Länder.Lieferland_ISO2='" & Antrag_LandKz & "' AND tblIDSInvoicesNew.daId is not null", "FMZOLL",,, -1) + End Select scanSonstiges.INIT_daId(da_id) scanUSTVFABest.INIT(kdnr, "KUNDENDATEN", "FA_Bestaetigungen") scanUSTVVollmachten.INIT(kdnr, "KUNDENDATEN", "USTV_Vollmachten") + + gridAktiv = True End Sub @@ -74,12 +91,31 @@ Public Class ustCntlUSTV_AntragPosition UStV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME UStV_POS.UStVPo_Zeitstempel = Now - - 'TO DO-> aktuell nur RechnungsNr!!!!! If txtRgNr._value <> "" Then UStV_POS.UStVPo_ReNr = txtRgNr._value End If + If txtRgDatum._value <> "" AndAlso IsDate(txtRgDatum._value) Then + UStV_POS.UStVPo_ReDat = txtRgDatum._value + End If + If txtUSTBetrag._value <> "" Then + UStV_POS.UStVPo_USteuerbetrag = txtUSTBetrag._value + End If + + If txtUSTBetragEUR._value <> "" Then + UStV_POS.UStVPo_USteuerbetragEUR = txtUSTBetragEUR._value + End If + If txtLeistungsbezeichnung._value <> "" Then + UStV_POS.UStVPo_Leistungsbezeichnung = txtLeistungsbezeichnung._value + End If + If txtUmrechnungskurs._value <> "" Then + UStV_POS.UStVPo_Umrechnungskurs = txtUmrechnungskurs._value + End If + + UStV_POS.UStVPo_Schnittstelle = cbxAPI.Checked + + UStV_POS.UStVPo_SchnittstellenNr = IIf(cboSchnittstellennr.SelectedItem Is Nothing, cboSchnittstellennr.SelectedItem, -1) + End Sub @@ -110,7 +146,7 @@ Public Class ustCntlUSTV_AntragPosition Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtLeistungsbezeichnung.TextChanged, txtRgDatum.TextChanged, txtRgNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub If gridAktiv And Me.FindForm IsNot Nothing Then 'If sender Is txtLieferung Then @@ -130,7 +166,9 @@ Public Class ustCntlUSTV_AntragPosition Private Sub txtRgDatum_KeyUp(sender As Object, e As KeyEventArgs) Handles txtRgDatum.KeyUp, txtRgNr.KeyUp, txtUSTBetrag.KeyUp, txtUmrechnungskurs.KeyUp, txtUSTBetragEUR.KeyUp - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub + + + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub If gridAktiv And Me.FindForm IsNot Nothing Then If e.KeyValue = 9 Then @@ -180,12 +218,18 @@ Public Class ustCntlUSTV_AntragPosition Private Sub SomethingChanged(sender As Object, e As EventArgs) + picSave.Visible = True End Sub Private Sub picSave_Click(sender As Object, e As EventArgs) Handles picSave.Click If UStV_Leist Is Nothing Then Exit Sub + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then + MsgBox("keine Berechtigung!") + Exit Sub + End If + If UStV_Leist.UstV_Leistender_Adresse Then If Not vbYes = MsgBox("Bei diesem Leistendem ist bereits eine Adresse hinterlegt, soll diese Adresse wirklich geändert werden?", vbYesNo) Then Exit Sub @@ -217,5 +261,24 @@ Public Class ustCntlUSTV_AntragPosition End Sub + Private Sub initSchnittstellenNR() + + If cboSchnittstellennr.Items.Count = 0 Then + + cboSchnittstellennr.Items.Add(New MyListItem("", -1)) + cboSchnittstellennr.Items.Add(New MyListItem("VERAG 360", 1)) + cboSchnittstellennr.Items.Add(New MyListItem("IDS alt", 2)) + cboSchnittstellennr.Items.Add(New MyListItem("TELEPASS", 3)) + cboSchnittstellennr.Items.Add(New MyListItem("MSE alt", 4)) + cboSchnittstellennr.Items.Add(New MyListItem("UTA alt", 5)) + cboSchnittstellennr.Items.Add(New MyListItem("PLOSE", 6)) + cboSchnittstellennr.Items.Add(New MyListItem("RMC", 7)) + cboSchnittstellennr.Items.Add(New MyListItem("IDS neu", 8)) + cboSchnittstellennr.Items.Add(New MyListItem("MSE neu", 9)) + cboSchnittstellennr.Items.Add(New MyListItem("UTA neu", 10)) + End If + + End Sub + End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index a696dbe9..df4e2ad4 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2763,18 +2763,25 @@ Public Class frmMDMDatenverarbetiung Dim displayFilter = False Dim sqlstr As String = "" Dim sqlWhere As String = "" + Dim sqlSelect As String = "" + Dim sqlGroup As String = "" Select Case art - Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.[OutletCountryCode]<>740543" - Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.[OutletCountryCode]=740543" + Case "IDS" 'Offert17 + sqlWhere = " AND tblIDSTransactionsNew.[OutletCountryCode]<>740543" + sqlSelect = " tblIDSTransactionsNew.[OutletCountry]" + sqlGroup = " tblIDSTransactionsNew.[OutletCountry]" + + Case "IDS_AT" 'Offert21 + sqlWhere = " AND tblIDSTransactionsNew.[OutletCountryCode]=740543" + sqlSelect = " CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END AS OutletCountry" + sqlGroup = " CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END" End Select - - - sqlstr &= " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], tblIDSTransactionsNew.[OutletCountry], tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, Sum([TotalNetAmount])/Sum([TransactionVolume]) AS NettopreisProLiter, Sum(tblIDSTransactionsNew.Rabattbetrag) AS [SummevonRabattbetrag], Sum([Rabattbetrag])/Sum([TransactionVolume]) AS RabattbetragProLiter + sqlstr &= " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlSelect & ", tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, Sum([TotalNetAmount])/Sum([TransactionVolume]) AS NettopreisProLiter, Sum(tblIDSTransactionsNew.Rabattbetrag) AS [SummevonRabattbetrag], Sum([Rabattbetrag])/Sum([TransactionVolume]) AS RabattbetragProLiter FROM ((tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode) INNER JOIN tbl_IDS_Produkte ON tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode) INNER JOIN Adressen ON tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr WHERE tblIDSTransactionsNew.KdNrVERAG = " & KdNr & sqlWhere & " - GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], tblIDSTransactionsNew.[OutletCountry], tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz; + GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], " & sqlGroup & ", tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz; " Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index d6237f20..ab8564fb 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -392,4 +392,12 @@ Public Class cUStVPositionen End Try Return "" End Function + + + Public Function DELETE(UStVAn_ID, UStVPo_ID) As Boolean + + Dim sqlstr = " DELETE FROM tblUStVPositionen WITH(updlock,serializable) WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & Me.UStVPo_ID + Return SQL.doSQL(sqlstr, "FMZOLL") + + End Function End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index c9b7a231..30e5e654 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -201,21 +201,20 @@ Public Class cMDMFunctionsAllgemein curUStV_SummeVZBetragEUR = IIf(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeVorauszahlung").ToString <> "" AndAlso IsNumeric(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeVorauszahlung").ToString), CDbl(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeVorauszahlung").ToString), 0) End If Dim sumChanged As Boolean = False - Dim sumChangedOK As Boolean = False If Not ( - Math.Round(CDbl(r.Item("UStV_SummeUmsatzsteuerbetragEUR")), 2) = curUStV_SummeUmsatzsteuerbetragEUR And - Math.Round(CDbl(r.Item("UStV_SummeErstattungsbetragEUR")), 2) = curUStV_SummeErstattungsbetragEUR And - Math.Round(CDbl(r.Item("UStV_Summe3470BetragEUR")), 2) = curUStV_Summe3470BetragEUR And - Math.Round(CDbl(r.Item("UStV_SummeVZBetragEUR")), 2) = curUStV_SummeVZBetragEUR And - Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_VERAG")), 2) = curUStV_SummeVorschaubetragEUR_VERAG And - Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_IDS")), 2) = curUStV_SummeVorschaubetragEUR_IDS And - Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_IT")), 2) = curUStV_SummeVorschaubetragEUR_IT And - Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_MSE")), 2) = curUStV_SummeVorschaubetragEUR_MSE And - Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_UTA")), 2) = curUStV_SummeVorschaubetragEUR_UTA And - Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR")), 2) = curUStV_SummeVorschaubetragEUR) Then + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeUmsatzsteuerbetragEUR")), 0, r.Item("UStV_SummeUmsatzsteuerbetragEUR"))), 2) = curUStV_SummeUmsatzsteuerbetragEUR And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeErstattungsbetragEUR")), 0, r.Item("UStV_SummeUmsatzsteuerbetragEUR"))), 2) = curUStV_SummeErstattungsbetragEUR And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_Summe3470BetragEUR")), 0, r.Item("UStV_Summe3470BetragEUR"))), 2) = curUStV_Summe3470BetragEUR And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVZBetragEUR")), 0, r.Item("UStV_SummeVZBetragEUR"))), 2) = curUStV_SummeVZBetragEUR And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_VERAG")), 0, r.Item("UStV_SummeVorschaubetragEUR_VERAG"))), 2) = curUStV_SummeVorschaubetragEUR_VERAG And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_IDS")), 0, r.Item("UStV_SummeVorschaubetragEUR_IDS"))), 2) = curUStV_SummeVorschaubetragEUR_IDS And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_IT")), 0, r.Item("UStV_SummeVorschaubetragEUR_IT"))), 2) = curUStV_SummeVorschaubetragEUR_IT And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_MSE")), 0, r.Item("UStV_SummeVorschaubetragEUR_MSE"))), 2) = curUStV_SummeVorschaubetragEUR_MSE And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_UTA")), 0, r.Item("UStV_SummeVorschaubetragEUR_UTA"))), 2) = curUStV_SummeVorschaubetragEUR_UTA And + Math.Round(CDbl(IIf(IsDBNull(r.Item("UStV_SummeVorschaubetragEUR")), 0, r.Item("UStV_SummeVorschaubetragEUR"))), 2) = curUStV_SummeVorschaubetragEUR) Then sumChanged = True sumChangedOK = False End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index d845b8a6..d988ceec 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -209,7 +209,7 @@ Public Class cRMC Return SQL.doSQLVarList(" - UPDATE [tblRMCImport] set rmc_archiv=1, [rmc_archiviertDatum]=GETDATE(), + UPDATE [tblRMCImport] set rmc_archiv=1, [rmc_archiviertDatum]=GETDATE(), UStVAn_ID = @UStVAn_ID WHERE cast(rmc_reDatum as date) = @reDat and rmc_reNr = @reNr and rmc_kdNr=@rmc_kdNr ", "FMZOLL",, list) diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 93bf326e..a0348488 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -481,6 +481,14 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Return SQL.getValueTxtBySql(sqlstr, "FMZOLL") End Function + Shared Function getISO3LandFromLandNr(LandNr As Integer) + If Not IsNumeric(LandNr) Then Return Nothing + If LandNr = 0 Then Return Nothing + Dim sqlstr = "SELECT TOP 1 isnull(LandKz_ISO_3,'') AS LandKzISO3 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 & "' "