From b58e047d2d8cc8ac6b2347c5943f276535e37490 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 22 Jan 2026 11:29:58 +0100 Subject: [PATCH] MDM Auswertung, Fakt, etc. --- SDL/Fakturierung/cFakturierung.vb | 3 +- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 6 +- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/USTV/frmUSTVoffeneAntraege.vb | 10 +- SDL/mdm/usrCntlMDMAuswertungen.Designer.vb | 15 +++ SDL/mdm/usrCntlMDMAuswertungen.vb | 103 ++++----------------- SDL/mdm/usrcntlFremdrechnungen.vb | 2 +- 7 files changed, 47 insertions(+), 96 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 9d556031..71905104 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2618,10 +2618,11 @@ Public Class cFakturierung ElseIf rpt.txtLeistung.Text.Contains("00") Then rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00", MonthStart & IIf(MonthEnd <> "", "-" & MonthEnd, "")) End If + If rpt.txtLeistung.Text.Contains(" DL") Then rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace(" DL", " ") End If - End If + End If End If diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 201e4728..0268e383 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1487,7 +1487,7 @@ Public Class usrCntlFaktAbrechnung Dim isMWSTBearb As Boolean = False Select Case r.Cells("LeistungsNr").Value - Case 124, 125, 126, 117, 118, 119, bearbNrRMC : isMWSTBearb = True + Case 123, 124, 125, 126, 117, 118, 119, bearbNrRMC : isMWSTBearb = True End Select @@ -2899,9 +2899,9 @@ Public Class usrCntlFaktAbrechnung For Each row As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows If row.Cells("LeistungsNr").Value = BGebLeistungsNr And row.Cells("BerechnungsartNr").Value = 9 Then - Dim preisecChanged = row.Cells("Preis").Value + Dim preiseChanged = row.Cells("Preis").Value - If preisecChanged <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then + If preiseChanged <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then ' If row.Cells("Preis").Value = curBGebBetrag * 2 AndAlso minBetragRMCUsed Then 'wenn RMCPOS und MIND-BERTAG 2x verrechnet -> nur 1x berechnen v diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index d370e0f4..ed5e3b7f 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/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index 687acdca..09be87e5 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -1090,11 +1090,11 @@ Public Class frmUSTVoffeneAntraege Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Dim SQLQuery As String = "" Select Case LIEFERANT.ToString.ToLower - Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum" - Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum " - Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number] where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date" - Case "uta" : SQLQuery = "select tblUTAImportNew.Abrechnungsnummer as RechnungNr,[Rechnungsdatum] AS Rechnungsdatum ,Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblUTAImportNew INNER JOIN Adressen on Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer where daId is null and cast([Rechnungsdatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and Lieferland <> 'ROM' and Steuerliches_Lieferland <> 'ROM' group by tblUTAImportNew.Abrechnungsnummer, Rechnungsdatum,Adressen.AdressenNr, Adressen.[Name 1] " - Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay" + Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum, kde_keineMWSt" + Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt " + Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt as keineMWST from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number] INNER JOIN tblKundenErweitert on AdressenNr = kde_KundenNr where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date, kde_keineMWSt" + Case "uta" : SQLQuery = " SELECT U.Abrechnungsnummer AS Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum AS date) AS Rechnungsdatum,A.AdressenNr AS KundenNr,A.UTAKundenNr AS UTAKundenNr,A.[Name 1] AS Kunde,A.LandKz, kde_keineMWSt as keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A ON A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert on A.AdressenNr = kde_KundenNr WHERE U.daId IS NULL AND CAST(U.Rechnungsdatum AS date) BETWEEN '" & dat_Sum_Von.Value & "' AND '" & dat_Sum_Bis.Value & "' AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum" + Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde, kde_keineMWSt from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG INNER JOIN tblKundenErweitert on Adressen.AdressenNr = kde_KundenNr where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay, kde_keineMWSt" Case Else : SQLQuery = "" End Select diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index ca1bed4d..1eda5f41 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -189,6 +189,7 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() + Me.cbxExcel = New System.Windows.Forms.CheckBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1839,6 +1840,7 @@ Partial Class usrCntlMDMAuswertungen ' 'GroupBox17 ' + Me.GroupBox17.Controls.Add(Me.cbxExcel) Me.GroupBox17.Controls.Add(Me.Label55) Me.GroupBox17.Controls.Add(Me.Button16) Me.GroupBox17.Location = New System.Drawing.Point(6, 367) @@ -2068,6 +2070,18 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' + 'cbxExcel + ' + Me.cbxExcel.AutoSize = True + Me.cbxExcel.Checked = True + Me.cbxExcel.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxExcel.Location = New System.Drawing.Point(150, 36) + Me.cbxExcel.Name = "cbxExcel" + Me.cbxExcel.Size = New System.Drawing.Size(68, 17) + Me.cbxExcel.TabIndex = 56 + Me.cbxExcel.Text = "als Excel" + Me.cbxExcel.UseVisualStyleBackColor = True + ' 'usrCntlMDMAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2306,4 +2320,5 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents PictureBox6 As PictureBox Friend WithEvents Label63 As Label Friend WithEvents Button19 As Button + Friend WithEvents cbxExcel As CheckBox End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 5a407b43..3c5a6b34 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1342,93 +1342,28 @@ Public Class usrCntlMDMAuswertungen Exit Sub End If - dgv.DataSource = dt + If cbxExcel.Checked Then + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt) + Else + + dgv.DataSource = dt + + If dgv IsNot Nothing Then + frm.Size = New Size(1400, 1000) + dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) + dgv.Dock = DockStyle.Fill + dgv.Anchor = AnchorStyles.Left + dgv.Anchor = AnchorStyles.Top + dgv.ReadOnly = True + frm.Controls.Add(dgv) + frm.StartPosition = FormStartPosition.CenterScreen + frm.ShowDialog() + End If + - If dgv IsNot Nothing Then - frm.Size = New Size(1400, 1000) - dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) - dgv.Dock = DockStyle.Fill - dgv.Anchor = AnchorStyles.Left - dgv.Anchor = AnchorStyles.Top - dgv.ReadOnly = True - frm.Controls.Add(dgv) - frm.StartPosition = FormStartPosition.CenterScreen - frm.ShowDialog() End If - - - 'Dim print As New frmPrintLayout - 'print.Text = "ASFINAG" - - 'Dim rpt As New rptASFINAG_TransaktionenSumary - - 'rpt.DataSource = dt - - - - - - 'Dim sum = 0 - 'rpt.lblUeberschrift.Text = "ASFINAG Transaktionssummen " & CDate(dat_Sum_Bis.Value.ToShortDateString) - 'rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME - - 'rpt.Label10.Visible = False - 'Label1.Text = "Dateiname" - 'Label8.Text = "Erstellungsdatum" - ''Dim cnt As Integer = 0 - 'rpt.lblDat.Text = Now.ToLongDateString - - - - - - 'Dim sumNetto As Double = 0 - 'Dim sumMWST As Double = 0 - 'Dim sumBrutto As Double = 0 - - 'Dim sumperKdNrNetto As Double = 0 - 'Dim sumperKdNrMWST As Double = 0 - 'Dim sumperKdNrBrutto As Double = 0 - - - 'AddHandler rpt.Detail.Format, Sub() - - - ' rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("PKFileName").Value, "") - ' rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("FileCreationDate").Value, "") - ' rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Abrechnungsdatum").Value, "") - - ' rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "") - ' rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 2, "") - ' rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 2, "") - - - ' rpt.lblSumNet.Visible = False - ' rpt.lblSumVat.Visible = False - ' rpt.lblSumBrt.Visible = False - - ' sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 4, 0) - ' sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 4, 0) - ' sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 4, 0) - - - ' End Sub - - - 'AddHandler rpt.ReportFooter1.Format, Sub() - - ' rpt.lblSumNetto.Text = sumNetto.ToString("N2") - ' rpt.lblSumMwst.Text = sumMWST.ToString("N2") - ' rpt.lblSumBrutto.Text = sumBrutto.ToString("N2") - - ' End Sub - - 'print.Viewer.LoadDocument(rpt) - 'print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous - 'print.Show() - - Catch ex As System.Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 3aaba876..ec1bafbf 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -1583,7 +1583,7 @@ Public Class usrcntlFremdrechnungen Case "UTA" Dim DS_Import As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", aktLieferant & "_MANUELL", Now.Year, interneKundenNr, interneKundenNr & "_" & ReNr & "_" & LieferlandISO2) - If DS_Import.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") <> "" Then + If DS_Import.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then SQL.doSQL("Update [tblUTAImportNew] SET [daId]=" & DS_Import.da_id & ", daIdgesetztDatum = getdate(), PDFsetmanually = getdate() where Rechnungsnummer_pro_Lieferland = '" & ReNr & "' AND cast(Rechnungsdatum as Date) = '" & CDate(ReDat).ToShortDateString & "' AND Kundennummer =" & KundenNr & " and Lieferland_ISO2 ='" & LieferlandISO2 & "' and daId is null", "FMZOLL") MsgBox("Dokument gesetzt! -> " & ReNr & " " & CDate(ReDat).ToShortDateString) SET_SDL(aktLieferant)