From 890818df47bacff79dfebf17ff4b8a812ca9a8fc Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 4 Dec 2024 11:04:21 +0100 Subject: [PATCH] MDM, IDS, USTVA --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 18 ++-- SDL/USTV/frmMDM_USTVAntrag.vb | 9 +- .../ustCntlUSTV_AntragPosition.Designer.vb | 21 +++-- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 27 ++++-- .../usrcntlKundeBearbeitenFull.Designer.vb | 90 +++++++++---------- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 2 +- SDL/mdm/frmMDMDatenverarbetiung.Designer.vb | 82 ++++++++--------- SDL/mdm/frmMDMDatenverarbetiung.vb | 35 +++++--- ...erarbeitungAuswertungen_divers.Designer.vb | 14 +-- ...MDMDatenverarbeitungAuswertungen_divers.vb | 19 ++-- VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb | 5 -- .../Schnittstellen/MSE/cMSEAPI.vb | 3 + 12 files changed, 177 insertions(+), 148 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index d929cd8a..150586d9 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -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.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() @@ -745,6 +745,14 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1300, 269) Me.Panel2.TabIndex = 1 ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -795,14 +803,6 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index e7620d42..3771b9a0 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -220,9 +220,6 @@ Public Class frmMDM_USTVAntrag USTV_ANTRAG.UStVAn_3470 = Nothing End If - - - End If End Sub Function Me_Validate() As Boolean @@ -694,7 +691,7 @@ Public Class frmMDM_USTVAntrag getValue(USTV_ANTRAG) If USTV_ANTRAG.SAVE Then - Me.Close() + init() End If End Sub @@ -913,9 +910,9 @@ Public Class frmMDM_USTVAntrag 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 + 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 & "' + 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") diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb index b3848272..61143390 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb @@ -441,7 +441,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUSTBetrag.MaxLines_Warning_Label = Nothing Me.txtUSTBetrag.Name = "txtUSTBetrag" Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20) - Me.txtUSTBetrag.TabIndex = 10 + Me.txtUSTBetrag.TabIndex = 16 ' 'Label11 ' @@ -475,7 +475,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUmrechnungskurs.MaxLines_Warning_Label = Nothing Me.txtUmrechnungskurs.Name = "txtUmrechnungskurs" Me.txtUmrechnungskurs.Size = New System.Drawing.Size(108, 20) - Me.txtUmrechnungskurs.TabIndex = 11 + Me.txtUmrechnungskurs.TabIndex = 17 ' 'Label12 ' @@ -509,7 +509,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUSTBetragEUR.MaxLines_Warning_Label = Nothing Me.txtUSTBetragEUR.Name = "txtUSTBetragEUR" Me.txtUSTBetragEUR.Size = New System.Drawing.Size(154, 20) - Me.txtUSTBetragEUR.TabIndex = 12 + Me.txtUSTBetragEUR.TabIndex = 18 ' 'Label13 ' @@ -526,6 +526,9 @@ Partial Class ustCntlUSTV_AntragPosition Me.cboLeistungsgeber._allowedValuesFreiText = Nothing Me.cboLeistungsgeber._allowFreiText = True Me.cboLeistungsgeber._value = "" + Me.cboLeistungsgeber.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append + Me.cboLeistungsgeber.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.cboLeistungsgeber.DropDownWidth = 350 Me.cboLeistungsgeber.FormattingEnabled = True Me.cboLeistungsgeber.Location = New System.Drawing.Point(633, 49) Me.cboLeistungsgeber.Name = "cboLeistungsgeber" @@ -669,7 +672,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtStrasse.MaxLines_Warning_Label = Nothing Me.txtStrasse.Name = "txtStrasse" Me.txtStrasse.Size = New System.Drawing.Size(169, 20) - Me.txtStrasse.TabIndex = 24 + Me.txtStrasse.TabIndex = 10 ' 'txtUIDNr ' @@ -693,7 +696,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUIDNr.MaxLines_Warning_Label = Nothing Me.txtUIDNr.Name = "txtUIDNr" Me.txtUIDNr.Size = New System.Drawing.Size(106, 20) - Me.txtUIDNr.TabIndex = 32 + Me.txtUIDNr.TabIndex = 15 ' 'Label14 ' @@ -747,7 +750,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtLand.MaxLines_Warning_Label = Nothing Me.txtLand.Name = "txtLand" Me.txtLand.Size = New System.Drawing.Size(38, 20) - Me.txtLand.TabIndex = 30 + Me.txtLand.TabIndex = 14 ' 'txtPLZ ' @@ -771,7 +774,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtPLZ.MaxLines_Warning_Label = Nothing Me.txtPLZ.Name = "txtPLZ" Me.txtPLZ.Size = New System.Drawing.Size(59, 20) - Me.txtPLZ.TabIndex = 26 + Me.txtPLZ.TabIndex = 12 ' 'txtStrassenNr ' @@ -795,7 +798,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtStrassenNr.MaxLines_Warning_Label = Nothing Me.txtStrassenNr.Name = "txtStrassenNr" Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20) - Me.txtStrassenNr.TabIndex = 29 + Me.txtStrassenNr.TabIndex = 11 ' 'Label16 ' @@ -829,7 +832,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtOrt.MaxLines_Warning_Label = Nothing Me.txtOrt.Name = "txtOrt" Me.txtOrt.Size = New System.Drawing.Size(154, 20) - Me.txtOrt.TabIndex = 28 + Me.txtOrt.TabIndex = 13 ' 'Panel1 ' diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index b165df5f..a923e6b5 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -85,31 +85,44 @@ Public Class ustCntlUSTV_AntragPosition gridAktiv = True End Sub - Sub getValues(ByRef UStV_POS) - If UStV_POS Is Nothing Then UStV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen + Sub getValues(ByRef UStV_POS, ByRef save) + + If UStV_POS Is Nothing Then UStV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen() 'UStV_POS. UStV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME UStV_POS.UStVPo_Zeitstempel = Now If txtRgNr._value <> "" Then UStV_POS.UStVPo_ReNr = txtRgNr._value + Else + save = False End If If txtRgDatum._value <> "" AndAlso IsDate(txtRgDatum._value) Then UStV_POS.UStVPo_ReDat = txtRgDatum._value + Else + save = False End If If txtUSTBetrag._value <> "" Then UStV_POS.UStVPo_USteuerbetrag = txtUSTBetrag._value + Else + save = False End If If txtUSTBetragEUR._value <> "" Then UStV_POS.UStVPo_USteuerbetragEUR = txtUSTBetragEUR._value + Else + save = False End If If txtLeistungsbezeichnung._value <> "" Then UStV_POS.UStVPo_Leistungsbezeichnung = txtLeistungsbezeichnung._value + Else + save = False End If If txtUmrechnungskurs._value <> "" Then UStV_POS.UStVPo_Umrechnungskurs = txtUmrechnungskurs._value + Else + save = False End If UStV_POS.UStVPo_Schnittstelle = cbxAPI.Checked @@ -139,9 +152,11 @@ Public Class ustCntlUSTV_AntragPosition End Sub Function save() - getValues(UStV_POS) + Dim setSave As Boolean = True + getValues(UStV_POS, setSave) 'MsgBox("TEST") - Return UStV_POS.SAVE + If setSave Then Return UStV_POS.SAVE + Return False End Function Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtLeistungsbezeichnung.TextChanged, txtRgDatum.TextChanged, txtRgNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged @@ -166,8 +181,6 @@ 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_USTVA_bearbeiten", Me.FindForm) Then Exit Sub If gridAktiv And Me.FindForm IsNot Nothing Then @@ -231,7 +244,7 @@ Public Class ustCntlUSTV_AntragPosition 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 + If Not vbYes = MsgBox("Bei diesem Leistenden ist bereits eine Adresse hinterlegt, soll diese Adresse wirklich geändert werden?", vbYesNo) Then Exit Sub End If End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index e63614bf..cd4d0997 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -244,6 +244,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox() + Me.Label110 = New System.Windows.Forms.Label() Me.txtSumPLOSE = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSumUTA = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSumMSE = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -376,9 +379,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.ArchivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentHinzufügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Label110 = New System.Windows.Forms.Label() - Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox() - Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -3514,6 +3514,48 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'txtSumVerag + ' + Me.txtSumVerag._DateTimeOnly = False + Me.txtSumVerag._numbersOnly = True + Me.txtSumVerag._numbersOnlyKommastellen = "" + Me.txtSumVerag._numbersOnlyTrennzeichen = True + Me.txtSumVerag._Prozent = False + Me.txtSumVerag._ShortDateNew = False + Me.txtSumVerag._ShortDateOnly = False + Me.txtSumVerag._TimeOnly = False + Me.txtSumVerag._TimeOnly_Seconds = False + Me.txtSumVerag._value = "" + Me.txtSumVerag._Waehrung = False + Me.txtSumVerag._WaehrungZeichen = True + Me.txtSumVerag.ForeColor = System.Drawing.Color.Black + Me.txtSumVerag.Location = New System.Drawing.Point(254, 230) + Me.txtSumVerag.MaxLineLength = -1 + Me.txtSumVerag.MaxLines_Warning = "" + Me.txtSumVerag.MaxLines_Warning_Label = Nothing + Me.txtSumVerag.Name = "txtSumVerag" + Me.txtSumVerag.Size = New System.Drawing.Size(100, 20) + Me.txtSumVerag.TabIndex = 32 + ' + 'txtSonst_KdNrVerag + ' + Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(119, 231) + Me.txtSonst_KdNrVerag.MaxLength = 20 + Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag" + Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrVerag.TabIndex = 31 + ' + 'Label110 + ' + Me.Label110.AutoSize = True + Me.Label110.Enabled = False + Me.Label110.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label110.Location = New System.Drawing.Point(6, 233) + Me.Label110.Name = "Label110" + Me.Label110.Size = New System.Drawing.Size(82, 13) + Me.Label110.TabIndex = 30 + Me.Label110.Text = "KdNr bei Verag:" + ' 'txtSumPLOSE ' Me.txtSumPLOSE._DateTimeOnly = False @@ -5129,48 +5171,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.DokumentLöschenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) Me.DokumentLöschenToolStripMenuItem.Text = "Dokument löschen" ' - 'Label110 - ' - Me.Label110.AutoSize = True - Me.Label110.Enabled = False - Me.Label110.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label110.Location = New System.Drawing.Point(6, 233) - Me.Label110.Name = "Label110" - Me.Label110.Size = New System.Drawing.Size(82, 13) - Me.Label110.TabIndex = 30 - Me.Label110.Text = "KdNr bei Verag:" - ' - 'txtSonst_KdNrVerag - ' - Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(119, 231) - Me.txtSonst_KdNrVerag.MaxLength = 20 - Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag" - Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20) - Me.txtSonst_KdNrVerag.TabIndex = 31 - ' - 'txtSumVerag - ' - Me.txtSumVerag._DateTimeOnly = False - Me.txtSumVerag._numbersOnly = True - Me.txtSumVerag._numbersOnlyKommastellen = "" - Me.txtSumVerag._numbersOnlyTrennzeichen = True - Me.txtSumVerag._Prozent = False - Me.txtSumVerag._ShortDateNew = False - Me.txtSumVerag._ShortDateOnly = False - Me.txtSumVerag._TimeOnly = False - Me.txtSumVerag._TimeOnly_Seconds = False - Me.txtSumVerag._value = "" - Me.txtSumVerag._Waehrung = False - Me.txtSumVerag._WaehrungZeichen = True - Me.txtSumVerag.ForeColor = System.Drawing.Color.Black - Me.txtSumVerag.Location = New System.Drawing.Point(254, 230) - Me.txtSumVerag.MaxLineLength = -1 - Me.txtSumVerag.MaxLines_Warning = "" - Me.txtSumVerag.MaxLines_Warning_Label = Nothing - Me.txtSumVerag.Name = "txtSumVerag" - Me.txtSumVerag.Size = New System.Drawing.Size(100, 20) - Me.txtSumVerag.TabIndex = 32 - ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 32a7adac..b333d0d6 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -1970,7 +1970,7 @@ Public Class usrcntlKundeBearbeitenFull .DataSource.Columns("AdressenNr").DefaultValue = KUNDE.KundenNr - .DataSource.Columns("UStV").DefaultValue = False + .DataSource.Columns("UStV").DefaultValue = True .Columns(0).Visible = False diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 237cccf1..0fe9a2b7 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -338,14 +338,14 @@ Partial Class frmMDMDatenverarbetiung ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.pnlAsfinag) + Me.Panel1.Controls.Add(Me.Panel3) Me.Panel1.Controls.Add(Me.pnlIDS) Me.Panel1.Controls.Add(Me.lblTTRSum) Me.Panel1.Controls.Add(Me.txtTTRSum) Me.Panel1.Controls.Add(Me.lblProzPruef) Me.Panel1.Controls.Add(Me.PictureBox1) Me.Panel1.Controls.Add(Me.pic) - Me.Panel1.Controls.Add(Me.pnlAsfinag) - Me.Panel1.Controls.Add(Me.Panel3) Me.Panel1.Controls.Add(Me.Button5) Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Controls.Add(Me.btnKunde) @@ -360,46 +360,46 @@ Partial Class frmMDMDatenverarbetiung Me.Panel1.Controls.Add(Me.Button3) Me.Panel1.Controls.Add(Me.Button2) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel1.Location = New System.Drawing.Point(0, 677) + Me.Panel1.Location = New System.Drawing.Point(0, 647) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1163, 114) + Me.Panel1.Size = New System.Drawing.Size(1163, 151) Me.Panel1.TabIndex = 2 ' 'pnlIDS ' Me.pnlIDS.Controls.Add(Me.Button10) Me.pnlIDS.Controls.Add(Me.btnRechenwertesetzen) - Me.pnlIDS.Location = New System.Drawing.Point(616, 5) + Me.pnlIDS.Location = New System.Drawing.Point(933, 5) Me.pnlIDS.Name = "pnlIDS" - Me.pnlIDS.Size = New System.Drawing.Size(311, 32) + Me.pnlIDS.Size = New System.Drawing.Size(230, 36) Me.pnlIDS.TabIndex = 50 Me.pnlIDS.Visible = False ' 'Button10 ' Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button10.Location = New System.Drawing.Point(168, 5) + Me.Button10.Location = New System.Drawing.Point(114, 5) Me.Button10.Name = "Button10" - Me.Button10.Size = New System.Drawing.Size(140, 23) + Me.Button10.Size = New System.Drawing.Size(108, 25) Me.Button10.TabIndex = 49 - Me.Button10.Text = "Rechenw. zurücksetzen" + Me.Button10.Text = "RW zurücksetzen" Me.Button10.UseVisualStyleBackColor = True ' 'btnRechenwertesetzen ' Me.btnRechenwertesetzen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnRechenwertesetzen.Location = New System.Drawing.Point(10, 3) + Me.btnRechenwertesetzen.Location = New System.Drawing.Point(17, 5) Me.btnRechenwertesetzen.Name = "btnRechenwertesetzen" - Me.btnRechenwertesetzen.Size = New System.Drawing.Size(129, 23) + Me.btnRechenwertesetzen.Size = New System.Drawing.Size(91, 25) Me.btnRechenwertesetzen.TabIndex = 48 - Me.btnRechenwertesetzen.Text = "Rechenwerte setzen" + Me.btnRechenwertesetzen.Text = "RW setzen" Me.btnRechenwertesetzen.UseVisualStyleBackColor = True ' 'lblTTRSum ' Me.lblTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblTTRSum.AutoSize = True - Me.lblTTRSum.Location = New System.Drawing.Point(953, 95) + Me.lblTTRSum.Location = New System.Drawing.Point(953, 127) Me.lblTTRSum.Name = "lblTTRSum" Me.lblTTRSum.Size = New System.Drawing.Size(87, 13) Me.lblTTRSum.TabIndex = 52 @@ -422,7 +422,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtTTRSum._WaehrungZeichen = True Me.txtTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtTTRSum.ForeColor = System.Drawing.Color.Black - Me.txtTTRSum.Location = New System.Drawing.Point(1051, 92) + Me.txtTTRSum.Location = New System.Drawing.Point(1051, 124) Me.txtTTRSum.MaxLineLength = -1 Me.txtTTRSum.MaxLines_Warning = "" Me.txtTTRSum.MaxLines_Warning_Label = Nothing @@ -434,7 +434,7 @@ Partial Class frmMDMDatenverarbetiung ' 'lblProzPruef ' - Me.lblProzPruef.Location = New System.Drawing.Point(63, 92) + Me.lblProzPruef.Location = New System.Drawing.Point(63, 97) Me.lblProzPruef.Name = "lblProzPruef" Me.lblProzPruef.Size = New System.Drawing.Size(69, 13) Me.lblProzPruef.TabIndex = 41 @@ -445,7 +445,7 @@ Partial Class frmMDMDatenverarbetiung ' Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.ok Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(574, 88) + Me.PictureBox1.Location = New System.Drawing.Point(574, 93) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(23, 23) Me.PictureBox1.TabIndex = 50 @@ -456,7 +456,7 @@ Partial Class frmMDMDatenverarbetiung ' Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.ok Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(574, 62) + Me.pic.Location = New System.Drawing.Point(574, 67) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(23, 23) Me.pic.TabIndex = 49 @@ -467,18 +467,18 @@ Partial Class frmMDMDatenverarbetiung ' Me.pnlAsfinag.Controls.Add(Me.bntDatumzuruecksetzen) Me.pnlAsfinag.Controls.Add(Me.bntDatumsetzen) - Me.pnlAsfinag.Location = New System.Drawing.Point(616, 6) + Me.pnlAsfinag.Location = New System.Drawing.Point(896, 6) Me.pnlAsfinag.Name = "pnlAsfinag" - Me.pnlAsfinag.Size = New System.Drawing.Size(311, 32) + Me.pnlAsfinag.Size = New System.Drawing.Size(267, 30) Me.pnlAsfinag.TabIndex = 29 Me.pnlAsfinag.Visible = False ' 'bntDatumzuruecksetzen ' Me.bntDatumzuruecksetzen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.bntDatumzuruecksetzen.Location = New System.Drawing.Point(168, 5) + Me.bntDatumzuruecksetzen.Location = New System.Drawing.Point(123, 3) Me.bntDatumzuruecksetzen.Name = "bntDatumzuruecksetzen" - Me.bntDatumzuruecksetzen.Size = New System.Drawing.Size(140, 23) + Me.bntDatumzuruecksetzen.Size = New System.Drawing.Size(140, 25) Me.bntDatumzuruecksetzen.TabIndex = 49 Me.bntDatumzuruecksetzen.Text = "Abr-datum zurücksetzen" Me.bntDatumzuruecksetzen.UseVisualStyleBackColor = True @@ -486,9 +486,9 @@ Partial Class frmMDMDatenverarbetiung 'bntDatumsetzen ' Me.bntDatumsetzen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.bntDatumsetzen.Location = New System.Drawing.Point(10, 3) + Me.bntDatumsetzen.Location = New System.Drawing.Point(3, 4) Me.bntDatumsetzen.Name = "bntDatumsetzen" - Me.bntDatumsetzen.Size = New System.Drawing.Size(129, 23) + Me.bntDatumsetzen.Size = New System.Drawing.Size(114, 23) Me.bntDatumsetzen.TabIndex = 48 Me.bntDatumsetzen.Text = "Abr-datum setzen" Me.bntDatumsetzen.UseVisualStyleBackColor = True @@ -497,9 +497,9 @@ Partial Class frmMDMDatenverarbetiung ' Me.Panel3.BackColor = System.Drawing.Color.White Me.Panel3.Controls.Add(Me.Button6) - Me.Panel3.Location = New System.Drawing.Point(616, 3) + Me.Panel3.Location = New System.Drawing.Point(603, 9) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(311, 111) + Me.Panel3.Size = New System.Drawing.Size(313, 139) Me.Panel3.TabIndex = 48 ' 'Button6 @@ -515,7 +515,7 @@ Partial Class frmMDMDatenverarbetiung 'Button5 ' Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Location = New System.Drawing.Point(461, 88) + Me.Button5.Location = New System.Drawing.Point(461, 93) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(107, 23) Me.Button5.TabIndex = 47 @@ -525,7 +525,7 @@ Partial Class frmMDMDatenverarbetiung 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(461, 62) + Me.Button1.Location = New System.Drawing.Point(461, 67) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(107, 23) Me.Button1.TabIndex = 46 @@ -538,7 +538,7 @@ Partial Class frmMDMDatenverarbetiung Me.btnKunde.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnKunde.Image = Global.SDL.My.Resources.Resources.person1 Me.btnKunde.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKunde.Location = New System.Drawing.Point(461, 6) + Me.btnKunde.Location = New System.Drawing.Point(461, 11) Me.btnKunde.Name = "btnKunde" Me.btnKunde.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.btnKunde.Size = New System.Drawing.Size(136, 32) @@ -551,7 +551,7 @@ Partial Class frmMDMDatenverarbetiung ' Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(953, 72) + Me.Label4.Location = New System.Drawing.Point(953, 104) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(92, 13) Me.Label4.TabIndex = 44 @@ -573,7 +573,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtPruefsummeBrutto._WaehrungZeichen = True Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69) + Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 101) Me.txtPruefsummeBrutto.MaxLineLength = -1 Me.txtPruefsummeBrutto.MaxLines_Warning = "" Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing @@ -585,7 +585,7 @@ Partial Class frmMDMDatenverarbetiung 'cbx ' Me.cbx.AutoSize = True - Me.cbx.Location = New System.Drawing.Point(13, 73) + Me.cbx.Location = New System.Drawing.Point(13, 78) Me.cbx.Name = "cbx" Me.cbx.Size = New System.Drawing.Size(103, 17) Me.cbx.TabIndex = 42 @@ -602,7 +602,7 @@ Partial Class frmMDMDatenverarbetiung Me.Panel2.Controls.Add(Me.pbPloseAnh_Proz) Me.Panel2.Controls.Add(Me.lblPloseAnh_Proz) Me.Panel2.Enabled = False - Me.Panel2.Location = New System.Drawing.Point(154, 0) + Me.Panel2.Location = New System.Drawing.Point(154, 5) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(301, 114) Me.Panel2.TabIndex = 41 @@ -672,7 +672,7 @@ Partial Class frmMDMDatenverarbetiung ' Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(953, 46) + Me.Label3.Location = New System.Drawing.Point(953, 78) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(89, 13) Me.Label3.TabIndex = 38 @@ -694,7 +694,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtPruefsummeNetto._WaehrungZeichen = True Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43) + Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 75) Me.txtPruefsummeNetto.MaxLineLength = -1 Me.txtPruefsummeNetto.MaxLines_Warning = "" Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing @@ -707,7 +707,7 @@ Partial Class frmMDMDatenverarbetiung ' Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(953, 19) + Me.Label2.Location = New System.Drawing.Point(953, 51) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(42, 13) Me.Label2.TabIndex = 36 @@ -729,7 +729,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtAnzahl._WaehrungZeichen = True Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtAnzahl.ForeColor = System.Drawing.Color.Black - Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16) + Me.txtAnzahl.Location = New System.Drawing.Point(1051, 48) Me.txtAnzahl.MaxLineLength = -1 Me.txtAnzahl.MaxLines_Warning = "" Me.txtAnzahl.MaxLines_Warning_Label = Nothing @@ -741,7 +741,7 @@ Partial Class frmMDMDatenverarbetiung 'Button3 ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Location = New System.Drawing.Point(12, 43) + Me.Button3.Location = New System.Drawing.Point(12, 13) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(120, 23) Me.Button3.TabIndex = 29 @@ -751,7 +751,7 @@ Partial Class frmMDMDatenverarbetiung 'Button2 ' Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(12, 14) + Me.Button2.Location = New System.Drawing.Point(12, 42) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(120, 23) Me.Button2.TabIndex = 28 @@ -772,7 +772,7 @@ Partial Class frmMDMDatenverarbetiung Me.MyDatagridview1.ReadOnly = True Me.MyDatagridview1.RowHeadersWidth = 62 Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577) + Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 547) Me.MyDatagridview1.TabIndex = 0 ' 'ContextMenuStrip1 @@ -785,10 +785,10 @@ Partial Class frmMDMDatenverarbetiung Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1163, 791) + Me.ClientSize = New System.Drawing.Size(1163, 798) Me.Controls.Add(Me.MyDatagridview1) - Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.pnl) + Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmMDMDatenverarbetiung" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index df4e2ad4..b09e2867 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -457,7 +457,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country left join adressen ON cust.[customer_id] = Adressen.MSEKundenNr - where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 + where bills.invoice_date = '" & DateTimePicker2.Text & "' and isnull(trans.charged,0) = 0 GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type--, trans.device_product_number order by KundenNr" @@ -829,7 +829,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country Left Join adressen ON cust.[customer_id] = Adressen.MSEKundenNr - where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 + where bills.invoice_date = '" & DateTimePicker2.Text & "' and isnull(trans.charged,0) = 0 GROUP BY Adressen.AdressenNr, Adressen.[Name 1], trans.transaction_country, trans.device_product_type", "FMZOLL") .LOAD() @@ -911,7 +911,7 @@ Public Class frmMDMDatenverarbetiung left join tbl_IDS_Kunden as Kunde on Kunde.CustomerCode = trans.CustomerCode And Kunde.KdNrAlt = 0 left join tbl_IDS_Kunden_ohne_Rabatt as KundeOhneR on KundeOhneR.CustomerCode = trans.CustomerCode left join tbl_IDS_Produkte as prod on prod.ProductTypeCode = trans.ProductTypeCode - where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and trans.charged <> 1 AND trans.[UStVAn_ID] is null ", "FMZOLL") + where cast(trans.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' and isnull(trans.charged,0) = 0 AND trans.[UStVAn_ID] is null ", "FMZOLL") .LOAD() @@ -1199,7 +1199,7 @@ Public Class frmMDMDatenverarbetiung INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart - where abgerechnet <> 1 and [Rechnungsdatum] = '" & DateTimePicker2.Text & "' + where isnull(abgerechnet,0) = 0 and [Rechnungsdatum] = '" & DateTimePicker2.Text & "' group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck" Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200) @@ -1327,7 +1327,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country left join adressen ON cust.[customer_id] = Adressen.MSEKundenNr - where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 and (trans.transaction_gross_amount <> 0 or trans.[msts_fee_amount] <> 0) " & sqlWhere & " + where bills.invoice_date = '" & DateTimePicker2.Text & "' and isnull(trans.charged,0)= 0 and (trans.transaction_gross_amount <> 0 or trans.[msts_fee_amount] <> 0) " & sqlWhere & " order by cust.customer_id" Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200) @@ -1376,7 +1376,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country - where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged <> 1 and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & csv.Item("Customer ID"), "FMZOLL") + where bills.invoice_date = '" & DateTimePicker2.Text & "' and isnull(trans.charged,0)= 0 and (trans.transaction_gross_amount <> 0 or [msts_fee_amount] <> 0) and cust.[customer_id] = " & csv.Item("Customer ID"), "FMZOLL") dt_CSV_selected.ParentRelations.Clear() dt_CSV_selected.ChildRelations.Clear() @@ -1487,7 +1487,7 @@ Public Class frmMDMDatenverarbetiung LEFT JOIN tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber - WHERE cast(tblIDSTransactionsNew.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null " & sqlWhere & " + WHERE cast(tblIDSTransactionsNew.YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null and isnull(charged,0)= 0 and " & sqlWhere & " order by tblIDSTransactionsNew.KdNrVERAG" Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200) @@ -1534,7 +1534,7 @@ Public Class frmMDMDatenverarbetiung If IDS("InvoiceID") > 0 Then Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(IDS("InvoiceID")) - File.Copy(DS.GET_TOP1_PATH, dir & "\" & IDS("KdNrVERAG") & "_" & (DS.da_name), False) + File.Copy(DS.GET_TOP1_PATH, dir & "\" & IDS("KdNrVERAG") & "_" & (DS.da_name), True) End If @@ -3506,7 +3506,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left JOIN tblMSELeistungen ON (tblMSELeistungen.[Card Type] = trans.device_product_type) AND (tblMSELeistungen.[Transaction Country] = trans.transaction_country) left JOIN Offertenpositionen ON cust.partner_customer_number = Offertenpositionen.KundenNr and tblMSELeistungen.LeistungsNr = Offertenpositionen.LeistungsNr and Offertenpositionen.OffertenNr = " & OffertenNr & " - where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.charged = 0 and cust.[partner_customer_number] = " & KdNr & " + where bills.invoice_date = '" & DateTimePicker2.Text & "' and isnull(trans.charged,0) = 0 and cust.[partner_customer_number] = " & KdNr & " group by cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , Offertenpositionen.LeistungsBez ) as temp group by customer_id, LeistungsNr" Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", 1200) @@ -4142,6 +4142,15 @@ Public Class frmMDMDatenverarbetiung End If + Dim sqlStringfehlendeLeistungsNr = "select count(*) from (SELECT Leistungen.LeistungsNr, Leistungen.LeistungsBez,tblIDSTransactionsNew.KdNrVERAG FROM Leistungen INNER Join tbl_IDS_Länder On Leistungen.LeistungsNr = tbl_IDS_Länder.LeistungsNr INNER Join tblIDSTransactionsNew On tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode Left JOIN Offertenpositionen on Offertenpositionen.KundenNr IN (select tblIDSTransactionsNew.KdNrVERAG from tblIDSTransactionsNew where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "') and Leistungen.LeistungsNr = Offertenpositionen.LeistungsNr and ( Offertenpositionen.OffertenNr=17 or Offertenpositionen.OffertenNr=21) where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and Offertenpositionen.LeistungsNr is null Group by Leistungen.LeistungsNr, Leistungen.LeistungsBez,tblIDSTransactionsNew.KdNrVERAG ) as t1" 'Verag360 und VeragAG + + Dim fehlendeLeistungsNr As Integer = CInt((New SQL).getValueTxtBySql(sqlStringfehlendeLeistungsNr, "FMZOLL")) + If fehlendeLeistungsNr > 0 Then + pruefData_IDS = False + MsgBox("Bei " & fehlendeLeistungsNr & " Leistungen fehlt die Offertenzuweisung !" & vbNewLine & "Diese Offerten (von Rechnungsdatum " & DateTimePicker2.Text & ") müssen nachgetragen werden.") + Return False + End If + Dim OBONumberOderVRNumberfehlern As Integer = 0 OBONumberOderVRNumberfehlern = CInt((New SQL).getValueTxtBySql("select count(*) from [tblIDSTransactionsNew] WHERE cast(YearMonthDay as Date) = '" & DateTimePicker2.Text & "' AND tblIDSTransactionsNew.[UStVAn_ID] is null AND [VRNumber] is null AND [OBONumber] is null", "FMZOLL")) @@ -4293,7 +4302,7 @@ Public Class frmMDMDatenverarbetiung PictureBox1.Visible = True End If Case "UTA" - If SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnet=1 where abgerechnetDatum is not null and abgerechnet <> 1 And and tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "'", "FMZOLL") Then + If SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnet=1 where abgerechnetDatum is not null and isnull(abgerechnet,0) = 0 And and tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "'", "FMZOLL") Then PictureBox1.Visible = True End If Case "MSE" @@ -4301,21 +4310,21 @@ Public Class frmMDMDatenverarbetiung From [VERAG].[dbo].[tblMSESettlements] as bills inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] inner join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id - where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.chargedDatetime is not null and charged <> 1 ") Then + where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.chargedDatetime is not null and isnull(trans.charged) = 0 ", "FMZOLL") Then PictureBox1.Visible = True End If Case "IDS" If SQL.doSQL("UPDATE [VERAG].[dbo].[tblIDSTransactionsNew] Set charged = 1 FROM [VERAG].[dbo].[tblIDSTransactionsNew] - where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and chargedDatetime is not null and charged <> 1 and tblIDSTransactionsNew.OutletCountryCode <> 740543 ") Then + where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and chargedDatetime is not null and isnull(charged,0) = 0 and tblIDSTransactionsNew.OutletCountryCode <> 740543 ", "FMZOLL") Then PictureBox1.Visible = True End If Case "IDS_AT" If SQL.doSQL("UPDATE [VERAG].[dbo].[tblIDSTransactionsNew] Set charged = 1 FROM [VERAG].[dbo].[tblIDSTransactionsNew] - where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and chargedDatetime is not null and charged <> 1 and tblIDSTransactionsNew.OutletCountryCode = 740543 ") Then + where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & DateTimePicker2.Text & "' and chargedDatetime is not null and isnull(charged,0) = 0 and tblIDSTransactionsNew.OutletCountryCode = 740543 ", "FMZOLL") Then PictureBox1.Visible = True End If Case Else diff --git a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb index 0b13aabf..aaf70db4 100644 --- a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb +++ b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb @@ -35,7 +35,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button6.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(13, 6) + Me.Button6.Location = New System.Drawing.Point(6, 3) Me.Button6.Name = "Button6" Me.Button6.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Button6.Size = New System.Drawing.Size(149, 41) @@ -49,7 +49,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(13, 64) + Me.Button1.Location = New System.Drawing.Point(6, 61) Me.Button1.Name = "Button1" Me.Button1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Button1.Size = New System.Drawing.Size(149, 41) @@ -61,7 +61,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers 'cbxNurEULander ' Me.cbxNurEULander.AutoSize = True - Me.cbxNurEULander.Location = New System.Drawing.Point(67, 47) + Me.cbxNurEULander.Location = New System.Drawing.Point(60, 44) Me.cbxNurEULander.Name = "cbxNurEULander" Me.cbxNurEULander.Size = New System.Drawing.Size(95, 17) Me.cbxNurEULander.TabIndex = 50 @@ -74,7 +74,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(168, 6) + Me.Button2.Location = New System.Drawing.Point(161, 3) Me.Button2.Name = "Button2" Me.Button2.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Button2.Size = New System.Drawing.Size(130, 41) @@ -86,7 +86,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers 'cbxConsFakt ' Me.cbxConsFakt.AutoSize = True - Me.cbxConsFakt.Location = New System.Drawing.Point(231, 47) + Me.cbxConsFakt.Location = New System.Drawing.Point(224, 44) Me.cbxConsFakt.Name = "cbxConsFakt" Me.cbxConsFakt.Size = New System.Drawing.Size(70, 17) Me.cbxConsFakt.TabIndex = 52 @@ -100,7 +100,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(168, 64) + Me.Button3.Location = New System.Drawing.Point(161, 61) Me.Button3.Name = "Button3" Me.Button3.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Button3.Size = New System.Drawing.Size(130, 41) @@ -122,7 +122,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Button6) Me.Name = "usrCntlMDMDatenverarbeitungAuswertungen_divers" - Me.Size = New System.Drawing.Size(301, 114) + Me.Size = New System.Drawing.Size(295, 104) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb index 07f26978..7c60a7ee 100644 --- a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb +++ b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb @@ -53,10 +53,10 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Case "IDS" - Button6.Visible = False Button2.Visible = False - Button6.Text = "Nach Spezifikation" - Button2.Text = "Leistungsnummern" + Button6.Visible = True + Button2.Text = "Nach Spezifikation" + Button6.Text = "fehl. Offerten" Button1.Text = "Kunden" Button3.Text = "Ländercodes" Button3.Visible = True @@ -100,6 +100,10 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers genMSEBericht("SPEZ") + + Case "IDS" + genIDSBericht("OFFERTEN") + Case Else MsgBox("nicht definiert!") @@ -148,6 +152,7 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Case "MSE" genMSEBericht("LENR") + End Select @@ -596,9 +601,13 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers ORDER BY tblIDSTransactionsNew.[CustomerCode];" - Case "TRANS" + Case "OFFERTEN" - sqlstr = "" + sqlstr = "select Leistungen.LeistungsNr, Leistungen.LeistungsBez,tblIDSTransactionsNew.KdNrVERAG FROM Leistungen + INNER Join tbl_IDS_Länder On Leistungen.LeistungsNr = tbl_IDS_Länder.LeistungsNr + INNER Join tblIDSTransactionsNew On tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + Left JOIN Offertenpositionen on Offertenpositionen.KundenNr IN (select tblIDSTransactionsNew.KdNrVERAG from tblIDSTransactionsNew where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & MAIN.DateTimePicker2.Text & "') and Leistungen.LeistungsNr = Offertenpositionen.LeistungsNr and ( Offertenpositionen.OffertenNr=17 or Offertenpositionen.OffertenNr=21) + where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & MAIN.DateTimePicker2.Text & "' and Offertenpositionen.LeistungsNr is null Group by Leistungen.LeistungsNr, Leistungen.LeistungsBez,tblIDSTransactionsNew.KdNrVERAG" Case Else MsgBox("Auswertungsart nicht definiert!") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 3bb9571d..26b4376c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -3,11 +3,6 @@ Imports System.Data.SqlClient Imports System.IO Imports System.Net Imports System.Reflection -Imports System.Windows.Forms -Imports com.sun.tools.corba.se.idl.constExpr -Imports com.sun.xml.internal.ws.api.pipe -Imports javax.print.attribute.standard -Imports Microsoft.Office.Interop Public Class cIDS diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 6d87cdb4..bfb26728 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -964,6 +964,7 @@ Public Class cMSEAPI dt.Columns.Add("msts_vat_number", GetType(String)) dt.Columns.Add("invoice_id", GetType(String)) dt.Columns.Add("invoice_date", GetType(String)) + 'dt.Columns.Add("invoice_nr", GetType(String)) While j < num @@ -977,6 +978,7 @@ Public Class cMSEAPI R("msts_vat_number") = checkNullStr(invoice.StringOf("msts_vat_number")) R("invoice_id") = checkNullInteger(invoice.StringOf("invoice_id")) R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date")) + 'R("invoice_nr") = checkNullStr(invoice.StringOf("invoice_nr")) Dim invoice_date_string As String = invoice.StringOf("invoice_date") @@ -997,6 +999,7 @@ Public Class cMSEAPI inv.msts_vat_number = checkNullStr(R("msts_vat_number")) inv.invoice_id = checkNullInteger(R("invoice_id")) inv.invoice_date = checkNullDateNothing(R("invoice_date")) + 'inv.invoice_nr = checkNullStr(R("invoice_nr")) If nameString.Length > 13 AndAlso nameString.Contains("_") Then inv.customer_number = nameString.Substring(nameString.IndexOf("_") + 1, 5)