diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 35501df4..52c13e7a 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/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 17a3be98..78f53851 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -4018,7 +4018,7 @@ Public Class frmMDMDatenverarbetiung Dim fehlendeRechnungen As Integer = 0 - fehlendeRechnungen = CInt((New SQL).getValueTxtBySql("select count(*) from tblUTAImportNew where daId is null and cast([Rechnungsdatum] as Date) = '" & DateTimePicker2.Text & "'", "FMZOLL")) + fehlendeRechnungen = CInt((New SQL).getValueTxtBySql("select count(distinct(tblUTAImportNew.Abrechnungsnummer)) as Anzahl from tblUTAImportNew where daId is null and cast([Rechnungsdatum] as Date) = '" & DateTimePicker2.Text & "'", "FMZOLL")) If fehlendeRechnungen > 0 Then pruefData_UTA = False diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index 08030299..7cf0ca36 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -22,6 +22,7 @@ Partial Class usrCntlMDMAuswertungen 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlMDMAuswertungen)) Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.lblAuswertungAb = New System.Windows.Forms.Label() @@ -133,6 +134,7 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Label61 = New System.Windows.Forms.Label() Me.GroupBox19 = New System.Windows.Forms.GroupBox() + Me.lblAnzahlMautberichte = New System.Windows.Forms.Label() Me.cbxDateMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label69 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() @@ -208,7 +210,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.lblAnzahlMautberichte = New System.Windows.Forms.Label() + Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -243,6 +245,7 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox15.SuspendLayout() Me.GroupBox14.SuspendLayout() Me.pnl.SuspendLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -1478,7 +1481,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label61.AutoSize = True Me.Label61.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label61.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label61.Location = New System.Drawing.Point(19, 135) + Me.Label61.Location = New System.Drawing.Point(15, 131) Me.Label61.Name = "Label61" Me.Label61.Size = New System.Drawing.Size(310, 17) Me.Label61.TabIndex = 13 @@ -1486,6 +1489,7 @@ Partial Class usrCntlMDMAuswertungen ' 'GroupBox19 ' + Me.GroupBox19.Controls.Add(Me.MyDatagridview1) Me.GroupBox19.Controls.Add(Me.lblAnzahlMautberichte) Me.GroupBox19.Controls.Add(Me.cbxDateMautbericht) Me.GroupBox19.Controls.Add(Me.Label69) @@ -1493,12 +1497,20 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox19.Controls.Add(Me.cbxMautbericht) Me.GroupBox19.Controls.Add(Me.Label62) Me.GroupBox19.Controls.Add(Me.Button18) - Me.GroupBox19.Location = New System.Drawing.Point(18, 146) + Me.GroupBox19.Location = New System.Drawing.Point(14, 142) Me.GroupBox19.Name = "GroupBox19" - Me.GroupBox19.Size = New System.Drawing.Size(697, 84) + Me.GroupBox19.Size = New System.Drawing.Size(697, 195) Me.GroupBox19.TabIndex = 12 Me.GroupBox19.TabStop = False ' + 'lblAnzahlMautberichte + ' + Me.lblAnzahlMautberichte.AutoSize = True + Me.lblAnzahlMautberichte.Location = New System.Drawing.Point(481, 57) + Me.lblAnzahlMautberichte.Name = "lblAnzahlMautberichte" + Me.lblAnzahlMautberichte.Size = New System.Drawing.Size(0, 13) + Me.lblAnzahlMautberichte.TabIndex = 33 + ' 'cbxDateMautbericht ' Me.cbxDateMautbericht._allowedValuesFreiText = Nothing @@ -1564,7 +1576,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label44.AutoSize = True Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label44.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label44.Location = New System.Drawing.Point(15, 287) + Me.Label44.Location = New System.Drawing.Point(15, 340) Me.Label44.Name = "Label44" Me.Label44.Size = New System.Drawing.Size(436, 17) Me.Label44.TabIndex = 11 @@ -1592,7 +1604,7 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox13.Controls.Add(Me.Label63) Me.GroupBox13.Controls.Add(Me.Label45) Me.GroupBox13.Controls.Add(Me.Button14) - Me.GroupBox13.Location = New System.Drawing.Point(14, 298) + Me.GroupBox13.Location = New System.Drawing.Point(14, 351) Me.GroupBox13.Name = "GroupBox13" Me.GroupBox13.Size = New System.Drawing.Size(697, 278) Me.GroupBox13.TabIndex = 10 @@ -2297,13 +2309,15 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'lblAnzahlMautberichte + 'MyDatagridview1 ' - Me.lblAnzahlMautberichte.AutoSize = True - Me.lblAnzahlMautberichte.Location = New System.Drawing.Point(481, 57) - Me.lblAnzahlMautberichte.Name = "lblAnzahlMautberichte" - Me.lblAnzahlMautberichte.Size = New System.Drawing.Size(0, 13) - Me.lblAnzahlMautberichte.TabIndex = 33 + Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 + Me.MyDatagridview1.BackgroundColor = System.Drawing.SystemColors.Window + Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.MyDatagridview1.Location = New System.Drawing.Point(4, 71) + Me.MyDatagridview1.Name = "MyDatagridview1" + Me.MyDatagridview1.Size = New System.Drawing.Size(471, 124) + Me.MyDatagridview1.TabIndex = 34 ' 'usrCntlMDMAuswertungen ' @@ -2374,6 +2388,7 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox14.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -2563,4 +2578,5 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents Label72 As Label Friend WithEvents Button20 As Button Friend WithEvents lblAnzahlMautberichte As Label + Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 3de0ec04..b165ccf2 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -2595,6 +2595,26 @@ Public Class usrCntlMDMAuswertungen End If + End Sub + + + + Private Sub cbxDateMautbericht_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxDateMautbericht.SelectedValueChanged + With MyDatagridview1 + + + .Columns.Clear() + .SET_SQL("SELECT [Datenquelle] as Lieferant,sum([Net Amount]) as Netto,sum([VAT Amount]) as VAT,sum([Total Amount]) as Brutto + FROM [VERAG].[dbo].[tblMautbericht] + where cast([Billingdate] as date) = '" & cbxDateMautbericht._value & "' + group by [Datenquelle]", "FMZOLL") + .LOAD() + + + End With + + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 2f5cc2b2..97305f4c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -323,7 +323,7 @@ Public Class cIDS MsgBox("Verabreitungspfad nicht gesetzt!") End If - Return True + Return Paramter.getFTPConenction(API_STRING, API, programName) End Function