From 34e5df70a40d8e409e7d6a53736f5e6739c11863 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 12 Aug 2026 11:13:54 +0200 Subject: [PATCH] fremdrechnungen, etc. --- SDL/Fakturierung/cAutomailversand.vb | 6 +- SDL/mdm/usrcntlFremdrechnungen.Designer.vb | 209 ++++++++++-------- SDL/mdm/usrcntlFremdrechnungen.resx | 3 + SDL/mdm/usrcntlFremdrechnungen.vb | 141 ++++++++++-- VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb | 19 +- VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb | 14 +- VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb | 16 +- .../Schnittstellen/MSE/cMSEAPI.vb | 20 +- 8 files changed, 298 insertions(+), 130 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index d6df874b..a1fbbf64 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -283,7 +283,7 @@ Public Class cAutomailversand If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - MailTo = "" + MailTo = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email MailtoCC = "" MailtoBCC = setAccountToSend(FirmaID) Else @@ -1201,7 +1201,7 @@ Public Class cAutomailversand Dim isAT = spedbuch.DokumentId_Mitteilung IsNot Nothing If FiskalMail Then - attachments.Clear() 'liste leeren + If attachments IsNot Nothing Then attachments.Clear() 'liste leeren End If If isAT Then @@ -1622,7 +1622,7 @@ Public Class cAutomailversand End If If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - MailTo = "" + MailTo = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email MailCC = "" End If diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index 4db66d63..8a34ef8a 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -22,6 +22,7 @@ Partial Class usrcntlFremdrechnungen 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.PDFHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -35,14 +36,14 @@ Partial Class usrcntlFremdrechnungen Me.btnVERAGCardNew = New System.Windows.Forms.Button() Me.btnSDL_PLOSE = New System.Windows.Forms.Button() Me.btnSDL_RMC = New System.Windows.Forms.Button() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RechnungsanhangHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RechnungsanhangloeschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() - Me.lblmissingPDFs = New System.Windows.Forms.Label() + Me.lblmissingInvoices_new = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() - Me.lblCountMissingInvoices = New System.Windows.Forms.Label() + Me.lblCountMissingPDFs = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() @@ -50,8 +51,6 @@ Partial Class usrcntlFremdrechnungen Me.lblCountOrigRechnungen = New System.Windows.Forms.Label() Me.cbxTest = New System.Windows.Forms.CheckBox() Me.Label7 = New System.Windows.Forms.Label() - Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label6 = New System.Windows.Forms.Label() Me.lblSumBto = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() @@ -70,9 +69,13 @@ Partial Class usrcntlFremdrechnungen Me.Button8 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.dgvLFRechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.dgvDetails = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel4 = New System.Windows.Forms.Panel() + Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) + Me.pc_missingInvoices = New System.Windows.Forms.PictureBox() + Me.dgvLFRechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvDetails = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -81,9 +84,10 @@ Partial Class usrcntlFremdrechnungen Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + Me.Panel4.SuspendLayout() + CType(Me.pc_missingInvoices, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvLFRechnung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvDetails, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel4.SuspendLayout() Me.SuspendLayout() ' 'PDFHochladenToolStripMenuItem @@ -301,9 +305,10 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel1.Controls.Add(Me.lblmissingPDFs) + Me.Panel1.Controls.Add(Me.pc_missingInvoices) + Me.Panel1.Controls.Add(Me.lblmissingInvoices_new) Me.Panel1.Controls.Add(Me.Label10) - Me.Panel1.Controls.Add(Me.lblCountMissingInvoices) + Me.Panel1.Controls.Add(Me.lblCountMissingPDFs) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Controls.Add(Me.Label2) Me.Panel1.Controls.Add(Me.Label9) @@ -335,49 +340,49 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.Size = New System.Drawing.Size(260, 907) Me.Panel1.TabIndex = 23 ' - 'lblmissingPDFs + 'lblmissingInvoices_new ' - Me.lblmissingPDFs.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblmissingPDFs.BackColor = System.Drawing.Color.White - Me.lblmissingPDFs.Location = New System.Drawing.Point(173, 88) - Me.lblmissingPDFs.Name = "lblmissingPDFs" - Me.lblmissingPDFs.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.lblmissingPDFs.Size = New System.Drawing.Size(74, 13) - Me.lblmissingPDFs.TabIndex = 69 - Me.lblmissingPDFs.Text = "0" - Me.lblmissingPDFs.TextAlign = System.Drawing.ContentAlignment.TopRight - Me.lblmissingPDFs.Visible = False + Me.lblmissingInvoices_new.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblmissingInvoices_new.BackColor = System.Drawing.Color.White + Me.lblmissingInvoices_new.Location = New System.Drawing.Point(173, 88) + Me.lblmissingInvoices_new.Name = "lblmissingInvoices_new" + Me.lblmissingInvoices_new.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblmissingInvoices_new.Size = New System.Drawing.Size(74, 13) + Me.lblmissingInvoices_new.TabIndex = 69 + Me.lblmissingInvoices_new.Text = "0" + Me.lblmissingInvoices_new.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblmissingInvoices_new.Visible = False ' 'Label10 ' Me.Label10.AutoSize = True Me.Label10.Location = New System.Drawing.Point(4, 88) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(80, 13) + Me.Label10.Size = New System.Drawing.Size(116, 13) Me.Label10.TabIndex = 68 - Me.Label10.Text = "fehlende PDFs:" + Me.Label10.Text = "fehlende Rechnungen:" Me.Label10.Visible = False ' - 'lblCountMissingInvoices + 'lblCountMissingPDFs ' - Me.lblCountMissingInvoices.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblCountMissingInvoices.BackColor = System.Drawing.Color.White - Me.lblCountMissingInvoices.Location = New System.Drawing.Point(173, 66) - Me.lblCountMissingInvoices.Name = "lblCountMissingInvoices" - Me.lblCountMissingInvoices.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.lblCountMissingInvoices.Size = New System.Drawing.Size(74, 13) - Me.lblCountMissingInvoices.TabIndex = 67 - Me.lblCountMissingInvoices.Text = "0" - Me.lblCountMissingInvoices.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblCountMissingPDFs.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblCountMissingPDFs.BackColor = System.Drawing.Color.White + Me.lblCountMissingPDFs.Location = New System.Drawing.Point(173, 66) + Me.lblCountMissingPDFs.Name = "lblCountMissingPDFs" + Me.lblCountMissingPDFs.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblCountMissingPDFs.Size = New System.Drawing.Size(48, 13) + Me.lblCountMissingPDFs.TabIndex = 67 + Me.lblCountMissingPDFs.Text = "0" + Me.lblCountMissingPDFs.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(3, 66) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(116, 13) + Me.Label1.Size = New System.Drawing.Size(80, 13) Me.Label1.TabIndex = 66 - Me.Label1.Text = "fehlende Rechnungen:" + Me.Label1.Text = "fehlende PDFs:" ' 'Label2 ' @@ -438,52 +443,6 @@ Partial Class usrcntlFremdrechnungen Me.Label7.TabIndex = 60 Me.Label7.Text = "-" ' - 'txtKundenNrbis - ' - Me.txtKundenNrbis._DateTimeOnly = False - Me.txtKundenNrbis._numbersOnly = True - Me.txtKundenNrbis._numbersOnlyKommastellen = "" - Me.txtKundenNrbis._numbersOnlyTrennzeichen = False - Me.txtKundenNrbis._Prozent = False - Me.txtKundenNrbis._ShortDateNew = False - Me.txtKundenNrbis._ShortDateOnly = False - Me.txtKundenNrbis._TimeOnly = False - Me.txtKundenNrbis._TimeOnly_Seconds = False - Me.txtKundenNrbis._value = "" - Me.txtKundenNrbis._Waehrung = False - Me.txtKundenNrbis._WaehrungZeichen = False - Me.txtKundenNrbis.ForeColor = System.Drawing.Color.Black - Me.txtKundenNrbis.Location = New System.Drawing.Point(146, 190) - Me.txtKundenNrbis.MaxLineLength = -1 - Me.txtKundenNrbis.MaxLines_Warning = "" - Me.txtKundenNrbis.MaxLines_Warning_Label = Nothing - Me.txtKundenNrbis.Name = "txtKundenNrbis" - Me.txtKundenNrbis.Size = New System.Drawing.Size(98, 20) - Me.txtKundenNrbis.TabIndex = 59 - ' - 'txtKundenNrvon - ' - Me.txtKundenNrvon._DateTimeOnly = False - Me.txtKundenNrvon._numbersOnly = True - Me.txtKundenNrvon._numbersOnlyKommastellen = "" - Me.txtKundenNrvon._numbersOnlyTrennzeichen = False - Me.txtKundenNrvon._Prozent = False - Me.txtKundenNrvon._ShortDateNew = False - Me.txtKundenNrvon._ShortDateOnly = False - Me.txtKundenNrvon._TimeOnly = False - Me.txtKundenNrvon._TimeOnly_Seconds = False - Me.txtKundenNrvon._value = "" - Me.txtKundenNrvon._Waehrung = False - Me.txtKundenNrvon._WaehrungZeichen = False - Me.txtKundenNrvon.ForeColor = System.Drawing.Color.Black - Me.txtKundenNrvon.Location = New System.Drawing.Point(11, 190) - Me.txtKundenNrvon.MaxLineLength = -1 - Me.txtKundenNrvon.MaxLines_Warning = "" - Me.txtKundenNrvon.MaxLines_Warning_Label = Nothing - Me.txtKundenNrvon.Name = "txtKundenNrvon" - Me.txtKundenNrvon.Size = New System.Drawing.Size(98, 20) - Me.txtKundenNrvon.TabIndex = 58 - ' 'Label6 ' Me.Label6.AutoSize = True @@ -693,6 +652,33 @@ Partial Class usrcntlFremdrechnungen Me.SplitContainer1.SplitterDistance = 559 Me.SplitContainer1.TabIndex = 13 ' + 'Panel4 + ' + Me.Panel4.BackColor = System.Drawing.Color.White + Me.Panel4.Controls.Add(Me.FlowLayoutPanel) + Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel4.Location = New System.Drawing.Point(0, 0) + Me.Panel4.Name = "Panel4" + Me.Panel4.Size = New System.Drawing.Size(1356, 108) + Me.Panel4.TabIndex = 11 + ' + 'ImageList1 + ' + Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit + Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16) + Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent + ' + 'pc_missingInvoices + ' + Me.pc_missingInvoices.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo + Me.pc_missingInvoices.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.pc_missingInvoices.Location = New System.Drawing.Point(227, 64) + Me.pc_missingInvoices.Name = "pc_missingInvoices" + Me.pc_missingInvoices.Size = New System.Drawing.Size(28, 19) + Me.pc_missingInvoices.TabIndex = 72 + Me.pc_missingInvoices.TabStop = False + Me.pc_missingInvoices.Visible = False + ' 'dgvLFRechnung ' Me.dgvLFRechnung.AKTUALISIERUNGS_INTERVALL = 1000 @@ -728,15 +714,51 @@ Partial Class usrcntlFremdrechnungen Me.dgvDetails.Size = New System.Drawing.Size(1352, 228) Me.dgvDetails.TabIndex = 30 ' - 'Panel4 + 'txtKundenNrbis ' - Me.Panel4.BackColor = System.Drawing.Color.White - Me.Panel4.Controls.Add(Me.FlowLayoutPanel) - Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel4.Location = New System.Drawing.Point(0, 0) - Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1356, 108) - Me.Panel4.TabIndex = 11 + Me.txtKundenNrbis._DateTimeOnly = False + Me.txtKundenNrbis._numbersOnly = True + Me.txtKundenNrbis._numbersOnlyKommastellen = "" + Me.txtKundenNrbis._numbersOnlyTrennzeichen = False + Me.txtKundenNrbis._Prozent = False + Me.txtKundenNrbis._ShortDateNew = False + Me.txtKundenNrbis._ShortDateOnly = False + Me.txtKundenNrbis._TimeOnly = False + Me.txtKundenNrbis._TimeOnly_Seconds = False + Me.txtKundenNrbis._value = "" + Me.txtKundenNrbis._Waehrung = False + Me.txtKundenNrbis._WaehrungZeichen = False + Me.txtKundenNrbis.ForeColor = System.Drawing.Color.Black + Me.txtKundenNrbis.Location = New System.Drawing.Point(146, 190) + Me.txtKundenNrbis.MaxLineLength = -1 + Me.txtKundenNrbis.MaxLines_Warning = "" + Me.txtKundenNrbis.MaxLines_Warning_Label = Nothing + Me.txtKundenNrbis.Name = "txtKundenNrbis" + Me.txtKundenNrbis.Size = New System.Drawing.Size(98, 20) + Me.txtKundenNrbis.TabIndex = 59 + ' + 'txtKundenNrvon + ' + Me.txtKundenNrvon._DateTimeOnly = False + Me.txtKundenNrvon._numbersOnly = True + Me.txtKundenNrvon._numbersOnlyKommastellen = "" + Me.txtKundenNrvon._numbersOnlyTrennzeichen = False + Me.txtKundenNrvon._Prozent = False + Me.txtKundenNrvon._ShortDateNew = False + Me.txtKundenNrvon._ShortDateOnly = False + Me.txtKundenNrvon._TimeOnly = False + Me.txtKundenNrvon._TimeOnly_Seconds = False + Me.txtKundenNrvon._value = "" + Me.txtKundenNrvon._Waehrung = False + Me.txtKundenNrvon._WaehrungZeichen = False + Me.txtKundenNrvon.ForeColor = System.Drawing.Color.Black + Me.txtKundenNrvon.Location = New System.Drawing.Point(11, 190) + Me.txtKundenNrvon.MaxLineLength = -1 + Me.txtKundenNrvon.MaxLines_Warning = "" + Me.txtKundenNrvon.MaxLines_Warning_Label = Nothing + Me.txtKundenNrvon.Name = "txtKundenNrvon" + Me.txtKundenNrvon.Size = New System.Drawing.Size(98, 20) + Me.txtKundenNrvon.TabIndex = 58 ' 'usrcntlFremdrechnungen ' @@ -756,9 +778,10 @@ Partial Class usrcntlFremdrechnungen Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + Me.Panel4.ResumeLayout(False) + CType(Me.pc_missingInvoices, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvLFRechnung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvDetails, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel4.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -805,10 +828,12 @@ Partial Class usrcntlFremdrechnungen Friend WithEvents Label2 As Label Friend WithEvents Label9 As Label Friend WithEvents dat_Sum_Bis As DateTimePicker - Friend WithEvents lblCountMissingInvoices As Label + Friend WithEvents lblCountMissingPDFs As Label Friend WithEvents Label1 As Label Friend WithEvents RechnungsanhangHochladenToolStripMenuItem As ToolStripMenuItem Friend WithEvents RechnungsanhangloeschenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents lblmissingPDFs As Label + Friend WithEvents lblmissingInvoices_new As Label Friend WithEvents Label10 As Label + Friend WithEvents pc_missingInvoices As PictureBox + Friend WithEvents ImageList1 As ImageList End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.resx b/SDL/mdm/usrcntlFremdrechnungen.resx index 279a4474..6d14d724 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.resx +++ b/SDL/mdm/usrcntlFremdrechnungen.resx @@ -120,4 +120,7 @@ 17, 17 + + 173, 17 + \ No newline at end of file diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index a25b69b3..4e46b57d 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -1,6 +1,8 @@ Imports System.IO Imports System.Reflection +Imports com.sun.org.apache.xml.internal.utils Imports com.sun.xml.internal.rngom +Imports DAKOSY_Worker.DEERRE Imports MDM_Worker Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -622,7 +624,8 @@ Public Class usrcntlFremdrechnungen missingInvoices += rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text) missingInvoices += ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text) missingInvoices += mse.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then @@ -643,12 +646,23 @@ Public Class usrcntlFremdrechnungen missingInvoices += rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) missingInvoices += ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) missingInvoices += mse.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices End If End Sub + Private Sub enableMissingPDFInvoicesButton(missingInvoices As Integer) + + If missingInvoices > 0 And Not aktLieferant = "ALLE" Then + pc_missingInvoices.Visible = True + Else + pc_missingInvoices.Visible = False + End If + + End Sub + Private Sub btnSDL_IDS_Click(sender As Object, e As EventArgs) Handles btnSDL_IDS.Click 'SET_SDL("IDS") @@ -660,7 +674,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = ids.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,, txtKundenNrvon.Text, txtKundenNrbis.Text) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then @@ -671,7 +686,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = ids.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices End If @@ -690,7 +706,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = uta.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then @@ -701,7 +718,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = uta.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices End If @@ -733,7 +751,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,, txtKundenNrvon.Text, txtKundenNrbis.Text) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then @@ -744,7 +763,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices End If @@ -763,7 +783,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = MSE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then @@ -774,7 +795,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = MSE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices End If @@ -832,7 +854,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,, txtKundenNrvon.Text, txtKundenNrbis.Text) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then @@ -843,7 +866,8 @@ Public Class usrcntlFremdrechnungen countbtcNotSet = btcNotSet Dim missingInvoices As Integer = rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value) - lblCountMissingInvoices.Text = missingInvoices + enableMissingPDFInvoicesButton(missingInvoices) + lblCountMissingPDFs.Text = missingInvoices countMissingInvoices = missingInvoices End If @@ -1846,9 +1870,9 @@ Public Class usrcntlFremdrechnungen End If - ContextMenuStrip1.Show(Cursor.Position) + ContextMenuStrip1.Show(Cursor.Position) - End If + End If @@ -1926,7 +1950,7 @@ Public Class usrcntlFremdrechnungen Else - If Not RMC.hasEntry Then MsgBox("Es konnte kein Eintrag gefunden werden") : Exit Sub + If Not RMC.hasEntry Then MsgBox("Es konnte kein Eintrag gefunden werden") : Exit Sub If RMC.rmc_daId_InvAtt Is Nothing Then MsgBox("Eintrag besitzt keinen Rechnungsanhang!") : Exit Sub End If @@ -1940,5 +1964,92 @@ Public Class usrcntlFremdrechnungen End Select End Sub + Private Sub pc_missingInvoices_Click(sender As Object, e As EventArgs) Handles pc_missingInvoices.Click + Dim SQLString = "" + Dim dt As New DataTable + Select Case aktLieferant + Case "UTA" + + Dim uta As cUTA + + If txtKundenNrvon.Text <> "" AndAlso txtKundenNrvon.Text.Length = 6 AndAlso IsNumeric(txtKundenNrvon.Text) AndAlso txtKundenNrbis.Text <> "" AndAlso txtKundenNrbis.Text.Length = 6 AndAlso IsNumeric(txtKundenNrbis.Text) Then + 'SET_SDL("UTA", txtKundenNrvon.Text, txtKundenNrbis.Text) + uta.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text, True, dt) + ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then + + 'SET_SDL("UTA") + uta.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,,,, True, dt) + + + End If + + Case "RMC" + + Dim rmc As cRMC + If txtKundenNrvon.Text <> "" AndAlso txtKundenNrvon.Text.Length = 6 AndAlso IsNumeric(txtKundenNrvon.Text) AndAlso txtKundenNrbis.Text <> "" AndAlso txtKundenNrbis.Text.Length = 6 AndAlso IsNumeric(txtKundenNrbis.Text) Then + 'SET_SDL("RMC", txtKundenNrvon.Text, txtKundenNrbis.Text) + rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,, txtKundenNrvon.Text, txtKundenNrbis.Text, True, dt) + + + ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then + 'SET_SDL("RMC") + rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,,,, True, dt) + + + End If + + + Case "MSE" + + Dim MSE As cMSEAPI + + If txtKundenNrvon.Text <> "" AndAlso txtKundenNrvon.Text.Length = 6 AndAlso IsNumeric(txtKundenNrvon.Text) AndAlso txtKundenNrbis.Text <> "" AndAlso txtKundenNrbis.Text.Length = 6 AndAlso IsNumeric(txtKundenNrbis.Text) Then + 'SET_SDL("MSE", txtKundenNrvon.Text, txtKundenNrbis.Text) + MSE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text, True, dt) + + ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then + + 'SET_SDL("MSE") + MSE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,,,, True, dt) + + End If + + Case "PLOSE" + + Dim ploseRE As cPLOSE_Inv_Data + If txtKundenNrvon.Text <> "" AndAlso txtKundenNrvon.Text.Length = 6 AndAlso IsNumeric(txtKundenNrvon.Text) AndAlso txtKundenNrbis.Text <> "" AndAlso txtKundenNrbis.Text.Length = 6 AndAlso IsNumeric(txtKundenNrbis.Text) Then + ' SET_SDL("PLOSE", txtKundenNrvon.Text, txtKundenNrbis.Text) + ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,, txtKundenNrvon.Text, txtKundenNrbis.Text, True, dt) + + + ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then + 'SET_SD + ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,,,, True, dt) + + + End If + + Case "IDS" + + Dim ids As New cIDS + If txtKundenNrvon.Text <> "" AndAlso txtKundenNrvon.Text.Length = 6 AndAlso IsNumeric(txtKundenNrvon.Text) AndAlso txtKundenNrbis.Text <> "" AndAlso txtKundenNrbis.Text.Length = 6 AndAlso IsNumeric(txtKundenNrbis.Text) Then + ' SET_SDL("IDS", txtKundenNrvon.Text, txtKundenNrbis.Text) + ids.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,, txtKundenNrvon.Text, txtKundenNrbis.Text, True, dt) + + + ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then + + 'SET_SDL("IDS") + ids.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value,,,, True, dt) + + End If + + End Select + + If dt.Rows.Count > 0 Then + cProgramFunctions.genExcelFromDT_NEW(dt,,,,,,,,, True) + End If + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index a9da1483..6ddd193d 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -669,7 +669,7 @@ Public Class cIDS Return "" End Function - Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1) As Integer + Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1, Optional getDetailsInDatatable As Boolean = False, Optional ByRef dt_missingInvoices As DataTable = Nothing) As Integer Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -687,19 +687,25 @@ Public Class cIDS If dt IsNot Nothing Then Dim SQLstr = "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 " & sqlTime & sqlAdressenNr & " group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay, kde_keineMWSt" dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + dt_missingInvoices = dt Return dt.Rows.Count Else - Dim SQLstr = "select count(*) 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 " & sqlTime & sqlAdressenNr - Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + If getDetailsInDatatable Then + Dim SQLstr = "select count(*) 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 " & sqlTime & sqlAdressenNr + dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + Return dt_missingInvoices.Rows.Count + + Else + Dim SQLstr = "select count(*) 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 " & sqlTime & sqlAdressenNr + Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + End If + End If - - - Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -708,6 +714,7 @@ Public Class cIDS End Function + Public Shared Function checkPartInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1) As Integer Try 'Prüft, ob es zu Gesamtrechnungen Teilrechnungen gibt! diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index 539f028e..f1152937 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -367,7 +367,7 @@ Public Class cRMC End Function - Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1) As Integer + Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1, Optional getDetailsInDatatable As Boolean = False, Optional ByRef dt_missingInvoices As DataTable = Nothing) As Integer Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -385,12 +385,18 @@ Public Class cRMC If dt IsNot Nothing Then Dim SQLstr = "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 " & sqlTime & sqlAdressenNr & " group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt" dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + dt_missingInvoices = dt Return dt.Rows.Count Else - Dim SQLstr = "Select count(*) 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 " & sqlTime & sqlAdressenNr - Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) - + If getDetailsInDatatable Then + Dim SQLstr = "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 " & sqlTime & sqlAdressenNr + dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + Return dt_missingInvoices.Rows.Count + Else + Dim SQLstr = "Select count(*) 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 " & sqlTime & sqlAdressenNr + Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + End If End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index 8993d28a..6a0d2074 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -49,7 +49,7 @@ Public Class cUTA Return SQL.getValueTxtBySql(" SELECT count(*) FROM [tblUTAImportNew] U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer where U.InvToCustomer Is null AND A.AdressenNr between " & AdressenNrVon & " AND " & AdressenNrBis, "FMZOLL",,, -1) End Function - Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1) As Integer + Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1, Optional getDetailsInDatatable As Boolean = False, Optional ByRef dt_missingInvoices As DataTable = Nothing) As Integer Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -67,11 +67,21 @@ Public Class cUTA If dt IsNot Nothing Then Dim SQLstr = "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 " & sqlTime & sqlAdressenNr & " 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" dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + dt_missingInvoices = dt Return dt.Rows.Count Else - Dim SQLstr = "Select count(*) 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 " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM')" - Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + If getDetailsInDatatable Then + Dim SQLstr = "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 " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM')" + dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + Return dt_missingInvoices.Rows.Count + Else + Dim SQLstr = "Select count(*) 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 " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM')" + Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + + End If + + End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 31118020..777b0094 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -88,7 +88,7 @@ Public Class cMSEAPI Return SQL.getValueTxtBySql("SELECT count(*) FROM [tblMSEInvoices] inner join [tblMSECustomers] On [customer_number] = [customer_id] INNER JOIN Adressen On Adressen.MSEKundenNr = [customer_number] where InvToCustomer Is null AND Adressen.AdressenNr between " & AdressenNrVon & " AND " & AdressenNrBis, "FMZOLL",,, -1) End Function - Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1) As Integer + Public Shared Function checkPDFInvoices(Optional reDatVon As Date = Nothing, Optional reDatBis As Date = Nothing, Optional dt As DataTable = Nothing, Optional AdressenNrVon As Integer = -1, Optional AdressenNrBis As Integer = -1, Optional getDetailsInDatatable As Boolean = False, Optional ByRef dt_missingInvoices As DataTable = Nothing) As Integer Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -107,16 +107,22 @@ Public Class cMSEAPI If dt IsNot Nothing Then Dim SQLstr = "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 " & sqlTime & sqlAdressenNr & " group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date, kde_keineMWSt" dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + dt_missingInvoices = dt Return dt.Rows.Count Else - Dim SQLstr = "Select count(*) 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 " & sqlTime & sqlAdressenNr - Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + + If getDetailsInDatatable Then + Dim SQLstr = "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 " & sqlTime & sqlAdressenNr + dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + Return dt_missingInvoices.Rows.Count + Else + Dim SQLstr = "Select count(*) 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 " & sqlTime & sqlAdressenNr + Return SQL.getValueTxtBySql(SQLstr, "FMZOLL",,, 0) + End If + + End If - - - - Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try