From 1c261053844b0ee6bdb9917afd05e726d8d31c5a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 17 Oct 2025 17:13:08 +0200 Subject: [PATCH] mdm-importcheck, IDS-Preise --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/frmKundenblatt.Designer.vb | 193 ++++++++++---------- SDL/kunden/usrCntlIDSPreise.Designer.vb | 18 ++ SDL/kunden/usrCntlIDSPreise.vb | 87 ++++----- SDL/mdm/frmMDMDatenverarbetiung.Designer.vb | 46 +++-- SDL/mdm/frmMDMDatenverarbetiung.vb | 70 ++++++- 6 files changed, 249 insertions(+), 169 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 6afe1248..f2d0a19d 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/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index c69f21a1..1f910f8e 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -53,7 +53,6 @@ Partial Class frmKundenblatt Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -150,10 +149,8 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -185,7 +182,6 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -196,7 +192,6 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() Me.btn_FIBU_speichern = New System.Windows.Forms.Button() Me.lblZNB_verrechnet = New System.Windows.Forms.Label() @@ -246,6 +241,11 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -334,7 +334,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 843) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 928) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -344,19 +344,9 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 837) + Me.Panel4.Size = New System.Drawing.Size(1638, 922) Me.Panel4.TabIndex = 0 ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 837) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -374,7 +364,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 872) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 957) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -415,7 +405,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 843) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 928) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -496,7 +486,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 255) + Me.TabControl1.Size = New System.Drawing.Size(718, 340) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -508,7 +498,7 @@ Partial Class frmKundenblatt Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(710, 229) + Me.TabPage1.Size = New System.Drawing.Size(710, 314) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -567,7 +557,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 197) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 282) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -600,7 +590,7 @@ Partial Class frmKundenblatt Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(710, 229) + Me.TabPage2.Size = New System.Drawing.Size(710, 314) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -645,7 +635,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 207) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 292) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -693,7 +683,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 229) + Me.TabPage3.Size = New System.Drawing.Size(710, 314) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -749,7 +739,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 206) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 291) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -1110,7 +1100,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 799) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 884) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1164,7 +1154,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 843) + Me.tbZoll.Size = New System.Drawing.Size(1644, 928) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1176,7 +1166,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 837) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 922) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1184,7 +1174,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 811) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 896) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1195,7 +1185,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 843) + Me.tbMdm.Size = New System.Drawing.Size(1644, 928) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1214,7 +1204,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 837) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 922) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1226,7 +1216,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 811) + Me.tbSDL.Size = New System.Drawing.Size(1630, 896) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1268,7 +1258,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 615) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 700) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1374,7 +1364,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 665) + Me.Panel5.Location = New System.Drawing.Point(3, 750) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 @@ -1768,21 +1758,11 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) + Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 896) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) - Me.usrcntlKarten.TabIndex = 0 - ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1790,7 +1770,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(178, 39) + Me.tbLKW.Size = New System.Drawing.Size(1630, 896) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1802,22 +1782,9 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) + Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 890) Me.pnlLKWRight.TabIndex = 2 ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) - Me.UsrCntlLKW1.TabIndex = 0 - ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1826,7 +1793,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 33) + Me.pnlLKW.Size = New System.Drawing.Size(306, 890) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1867,7 +1834,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 0) + Me.dgvLKW.Size = New System.Drawing.Size(306, 716) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1879,7 +1846,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 778) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -2020,7 +1987,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) + Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 896) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -2032,7 +1999,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(172, 33) + Me.Panel3.Size = New System.Drawing.Size(1624, 890) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -2050,7 +2017,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(178, 39) + Me.tbDokumente.Size = New System.Drawing.Size(1630, 896) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2250,7 +2217,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 896) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2259,7 +2226,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 896) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2270,27 +2237,17 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 843) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 928) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 843) - Me.UsrCntlOfferte1.TabIndex = 0 - ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 843) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 928) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2304,7 +2261,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 843) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 928) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2317,7 +2274,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 817) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 902) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2418,19 +2375,11 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 902) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'tbFIBU ' Me.tbFIBU.Controls.Add(Me.btn_FIBU_speichern) @@ -2448,7 +2397,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 843) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 945) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2592,7 +2541,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 843) + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 928) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2611,7 +2560,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 783) + Me.dgvRg.Size = New System.Drawing.Size(1644, 868) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2838,7 +2787,6 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -3000,13 +2948,64 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 922) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 890) + Me.usrcntlKarten.TabIndex = 0 + ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 890) + Me.UsrCntlLKW1.TabIndex = 0 + ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 928) + Me.UsrCntlOfferte1.TabIndex = 0 + ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 896) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1651, 1001) + Me.ClientSize = New System.Drawing.Size(1651, 1086) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index f869c568..cebead54 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -39,6 +39,7 @@ Partial Class usrCntlIDSPreise Me.Label1 = New System.Windows.Forms.Label() Me.btnRW = New System.Windows.Forms.Button() Me.btnAdd = New System.Windows.Forms.Button() + Me.btnExcel = New System.Windows.Forms.Button() CType(Me.dgvIDSData, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).BeginInit() @@ -253,6 +254,21 @@ Partial Class usrCntlIDSPreise Me.btnAdd.Tag = "" Me.btnAdd.UseVisualStyleBackColor = True ' + 'btnExcel + ' + Me.btnExcel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnExcel.ForeColor = System.Drawing.Color.Black + Me.btnExcel.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnExcel.ImageAlign = System.Drawing.ContentAlignment.TopLeft + Me.btnExcel.Location = New System.Drawing.Point(182, 514) + Me.btnExcel.Name = "btnExcel" + Me.btnExcel.Size = New System.Drawing.Size(45, 36) + Me.btnExcel.TabIndex = 38 + Me.btnExcel.Tag = "" + Me.btnExcel.UseVisualStyleBackColor = True + Me.btnExcel.Visible = False + ' 'usrCntlIDSPreise ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -268,6 +284,7 @@ Partial Class usrCntlIDSPreise Me.Controls.Add(Me.cbxTypes) Me.Controls.Add(Me.dgvIDS) Me.Controls.Add(Me.btnOfferteSpeichern) + Me.Controls.Add(Me.btnExcel) Me.Controls.Add(Me.btnEditIDS) Me.Controls.Add(Me.lblIDS) Me.Controls.Add(Me.dgvIDSData) @@ -297,4 +314,5 @@ Partial Class usrCntlIDSPreise Friend WithEvents Label1 As Label Friend WithEvents btnRW As Button Friend WithEvents btnAdd As Button + Friend WithEvents btnExcel As Button End Class diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 7ecf4238..a6cfb5be 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -21,14 +21,12 @@ Public Class usrCntlIDSPreise Dim dgvInitWait As Boolean = False Dim RW As Double = -1 Dim Kunde As Integer = -1 + Dim enableChanges As Boolean = False Sub New() InitializeComponent() End Sub - - - Public Sub init(Optional _isVerag360 As Boolean = False) edit = False handleEditMode(edit) @@ -246,6 +244,9 @@ Public Class usrCntlIDSPreise End If DGVHasChaged = False + + btnExcel.Visible = dgvIDSData.Rows.Count > 0 + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -410,24 +411,14 @@ Public Class usrCntlIDSPreise .Columns("OutletCountry").HeaderText = "Bezeichnung" .Columns("OutletCountryCode").Visible = False End With - 'EnableDoubleBuffered(dgvOfferteDetails) dgvIDSData.Columns.Clear() dgvIDS.ClearSelection() initDGVDieselpreiseDetails() - 'initFilter() initDGVWidth() - 'AddHandler OFFERTEBind.bindingdataTable.ColumnChanged, Sub(ev As EventArgs, change As DataColumnChangeEventArgs) - ' ' If change.Column.ColumnName="" - ' 'Dim r_index = dgvOfferteDetails.Rows.IndexOf(change.Row) - ' 'Dim c_index = dgvOfferteDetails.Columns.IndexOf(change.Column.ColumnName) - ' 'dgvOfferteDetails.Rows(change.Row) - - ' End Sub - End Sub Sub initDGVWidth() @@ -444,19 +435,6 @@ Public Class usrCntlIDSPreise ' End Sub - - - Private Sub AddOffert_Click(sender As Object, e As EventArgs) Handles DToolStripMenuItem.Click - If sender.name.contains("tsmiOffertNr_") Then - ' MsgBox(sender.name.ToString.Replace("tsmiSDLNr_", "")) - Dim OffertenNr As String = sender.tag - - - End If - - End Sub - - Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIDSData.CellValueChanged Try Select Case cbxTypes._value @@ -576,28 +554,12 @@ Public Class usrCntlIDSPreise End Sub - Private Sub cbxArchivierteOfferten_SelectedIndexChanged(sender As Object, e As EventArgs) - - checkPerimissionsDGVDetails() - - End Sub - - 'Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs) - - ' If dgvIDS.SelectedRows.Count = 0 Then Exit Sub - - ' initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value) - - - 'End Sub - - Private Sub checkPerimissionsDGVDetails() Try With dgvIDSData - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIESELPREISE_BEARBEITEN", "SDL") Then + If Not enableChanges Then For Each c As DataGridViewColumn In .Columns c.ReadOnly = True handleEditMode(False) @@ -651,14 +613,15 @@ Public Class usrCntlIDSPreise Private Sub checkPermissions() - - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIESELPREISE_BEARBEITEN", "SDL") Then + enableChanges = False btnEditIDS.Visible = False dgvIDS.ReadOnly = True + btnAdd.Visible = False Else + enableChanges = True dgvIDSData.AllowUserToAddRows = True dgvIDSData.AllowUserToDeleteRows = True dgvIDSData.RowHeadersVisible = True @@ -668,7 +631,6 @@ Public Class usrCntlIDSPreise If dgvIDS.SelectedRows.Count = 0 Then - End If End Sub @@ -897,7 +859,12 @@ Public Class usrCntlIDSPreise End If Next - btnAdd.Visible = enableButtonAdd + If Not enableChanges Then + btnAdd.Visible = False + Else + btnAdd.Visible = enableButtonAdd + End If + If dgvIDS.SelectedCells.Count > 0 Then @@ -1037,4 +1004,30 @@ Public Class usrCntlIDSPreise End If End Sub + + Private Sub btnExcel_Click(sender As Object, e As EventArgs) Handles btnExcel.Click + + If dgvIDSData.Rows.Count > 0 Then + + Dim dt As DataTable = CType(dgvIDSData.DataSource, DataTable) + Dim displayTable As DataTable = dt.Copy() + + If displayTable.Rows.Count > 0 Then + + + If displayTable.Columns.Contains("Sachbearbeiter") Then displayTable.Columns.Remove("Sachbearbeiter") + If displayTable.Columns.Contains("ID") Then + displayTable.PrimaryKey = Nothing + displayTable.Columns.Remove("ID") + End If + If displayTable.Columns.Contains("Zeitstempel") Then displayTable.Columns.Remove("Zeitstempel") + + cProgramFunctions.genExcelFromDT_NEW(displayTable) + + End If + + End If + + + End Sub End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 568ebda6..c66e8885 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmMDMDatenverarbetiung Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDMDatenverarbetiung)) Me.pnl = New System.Windows.Forms.Panel() + Me.cbxIDSmitVerag = New System.Windows.Forms.CheckBox() Me.Panel5 = New System.Windows.Forms.Panel() Me.Label5 = New System.Windows.Forms.Label() Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() @@ -33,6 +34,7 @@ Partial Class frmMDMDatenverarbetiung Me.cbxASFINAGAbgerechnet = New System.Windows.Forms.CheckBox() Me.cbxTestdaten = New System.Windows.Forms.CheckBox() Me.Panel4 = New System.Windows.Forms.Panel() + Me.pb_importOK = New System.Windows.Forms.PictureBox() Me.Label46 = New System.Windows.Forms.Label() Me.dat_Sum_Bis = New System.Windows.Forms.DateTimePicker() Me.Label45 = New System.Windows.Forms.Label() @@ -83,11 +85,11 @@ Partial Class frmMDMDatenverarbetiung Me.Button2 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.cbxIDSmitVerag = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() Me.Panel5.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() + CType(Me.pb_importOK, System.ComponentModel.ISupportInitialize).BeginInit() Me.FlowLayoutPanel.SuspendLayout() Me.Panel1.SuspendLayout() Me.pnlAsfinag.SuspendLayout() @@ -101,6 +103,7 @@ Partial Class frmMDMDatenverarbetiung ' 'pnl ' + Me.pnl.Controls.Add(Me.pb_importOK) Me.pnl.Controls.Add(Me.cbxIDSmitVerag) Me.pnl.Controls.Add(Me.Panel5) Me.pnl.Controls.Add(Me.PictureBox5) @@ -119,6 +122,19 @@ Partial Class frmMDMDatenverarbetiung Me.pnl.Size = New System.Drawing.Size(1163, 100) Me.pnl.TabIndex = 1 ' + 'cbxIDSmitVerag + ' + Me.cbxIDSmitVerag.AutoSize = True + Me.cbxIDSmitVerag.Checked = True + Me.cbxIDSmitVerag.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxIDSmitVerag.Location = New System.Drawing.Point(504, 74) + Me.cbxIDSmitVerag.Name = "cbxIDSmitVerag" + Me.cbxIDSmitVerag.Size = New System.Drawing.Size(153, 17) + Me.cbxIDSmitVerag.TabIndex = 131 + Me.cbxIDSmitVerag.Text = "Daten mit Verag/Verag360" + Me.cbxIDSmitVerag.UseVisualStyleBackColor = True + Me.cbxIDSmitVerag.Visible = False + ' 'Panel5 ' Me.Panel5.Controls.Add(Me.Label5) @@ -132,7 +148,7 @@ Partial Class frmMDMDatenverarbetiung 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(11, 12) + Me.Label5.Location = New System.Drawing.Point(3, 12) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(113, 13) Me.Label5.TabIndex = 23 @@ -204,6 +220,17 @@ Partial Class frmMDMDatenverarbetiung Me.Panel4.Size = New System.Drawing.Size(417, 33) Me.Panel4.TabIndex = 28 ' + 'pb_importOK + ' + Me.pb_importOK.BackgroundImage = Global.SDL.My.Resources.Resources.ok + Me.pb_importOK.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.pb_importOK.Location = New System.Drawing.Point(81, 42) + Me.pb_importOK.Name = "pb_importOK" + Me.pb_importOK.Size = New System.Drawing.Size(23, 19) + Me.pb_importOK.TabIndex = 53 + Me.pb_importOK.TabStop = False + Me.pb_importOK.Visible = False + ' 'Label46 ' Me.Label46.AutoSize = True @@ -797,19 +824,6 @@ Partial Class frmMDMDatenverarbetiung Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 547) Me.MyDatagridview1.TabIndex = 0 ' - 'cbxIDSmitVerag - ' - Me.cbxIDSmitVerag.AutoSize = True - Me.cbxIDSmitVerag.Checked = True - Me.cbxIDSmitVerag.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxIDSmitVerag.Location = New System.Drawing.Point(504, 74) - Me.cbxIDSmitVerag.Name = "cbxIDSmitVerag" - Me.cbxIDSmitVerag.Size = New System.Drawing.Size(153, 17) - Me.cbxIDSmitVerag.TabIndex = 131 - Me.cbxIDSmitVerag.Text = "Daten mit Verag/Verag360" - Me.cbxIDSmitVerag.UseVisualStyleBackColor = True - Me.cbxIDSmitVerag.Visible = False - ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -830,6 +844,7 @@ Partial Class frmMDMDatenverarbetiung CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel4.ResumeLayout(False) Me.Panel4.PerformLayout() + CType(Me.pb_importOK, System.ComponentModel.ISupportInitialize).EndInit() Me.FlowLayoutPanel.ResumeLayout(False) Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() @@ -905,4 +920,5 @@ Partial Class frmMDMDatenverarbetiung Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents cbxKopie As CheckBox Friend WithEvents cbxIDSmitVerag As CheckBox + Friend WithEvents pb_importOK As PictureBox End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 060e327a..27738139 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1,7 +1,5 @@ Imports System.Data.OleDb Imports System.IO -Imports com.sun.xml.internal.rngom -Imports DocumentFormat.OpenXml.Drawing.Diagrams Imports itextsharp.text.pdf Imports MDM_Worker Imports VERAG_PROG_ALLGEMEIN @@ -76,22 +74,76 @@ Public Class frmMDMDatenverarbetiung txtAnzahl.Text = "" txtPruefsummeNetto.Text = "" Button1.Enabled = True + pb_importOK.Visible = False Select Case LIEFERANT - Case "PLOSE" : initDgv_PLOSE() + Case "PLOSE" : checkImport(LIEFERANT) : initDgv_PLOSE() btnDatenLaden.Text = "Daten laden" - Case "UTA" : initDgv_UTA() + Case "UTA" : checkImport(LIEFERANT) : initDgv_UTA() btnDatenLaden.Text = "Daten laden" - Case "ASFINAG" : initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked) + Case "ASFINAG" : checkImport(LIEFERANT) : initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked) btnDatenLaden.Text = "Daten laden" - Case "IDS" : initDgv_IDS() + Case "IDS" : checkImport(LIEFERANT) : initDgv_IDS() btnDatenLaden.Text = "Daten laden" Button1.Enabled = False - Case "MSE" : initDgv_MSE() + Case "MSE" : checkImport(LIEFERANT) : initDgv_MSE() btnDatenLaden.Text = "Daten laden" End Select End Sub + Private Sub checkImport(LIEFERANT As String) + + 'autom Import bei Asfinag, Plose und MSE + '(noch) manueller Import bei UTA (weil immer so spät kommt) und IDS (wegen Nacharbeitung) + + pb_importOK.Visible = True + Dim Import_OK As Boolean = False + + Dim sqlstr As String = "" + + Select Case LIEFERANT + Case "PLOSE" + sqlstr = "SELECT * FROM [VERAG].[dbo].[tblMDMEinarbeitung] where supplier = '" & LIEFERANT & "' and invoicedate between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'" + Case "ASFINAG" + sqlstr = "SELECT * FROM [VERAG].[dbo].[tblMDMEinarbeitung] where supplier = '" & LIEFERANT & "' and YEAR(invoicedate) = " & Today().Year + Case Else + sqlstr = "SELECT * FROM [VERAG].[dbo].[tblMDMEinarbeitung] where supplier = '" & LIEFERANT & "' and invoicedate ='" & DateTimePicker2.Text & "'" + End Select + + Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") + + If dt.Rows.Count > 0 Then + Dim hasImcompleIports As Boolean = dt.AsEnumerable().Any(Function(row) row.Field(Of Boolean)("completed") = False) + If hasImcompleIports Then + pb_importOK.BackgroundImage = SDL.My.Resources.Resources.del + Else + If LIEFERANT = "IDS" Then 'IDS Bedard aktuell noch einer Nachbearbeitung! + Dim nacharbeitungNotCompleted As Boolean = dt.AsEnumerable().Any(Function(row) row.Field(Of Boolean)("nacharbeitung_completed") = False) + + If nacharbeitungNotCompleted Then + Import_OK = False + Else + Import_OK = True + End If + + Else + Import_OK = True + End If + + End If + Else + Import_OK = False + End If + + + If Import_OK Then + pb_importOK.BackgroundImage = SDL.My.Resources.Resources.ok + Else + pb_importOK.BackgroundImage = SDL.My.Resources.Resources.del + End If + + End Sub + Private Sub btnREerstellen_Click_1(sender As Object, e As EventArgs) Handles btnREerstellen.Click Dim errorTmp = False @@ -120,7 +172,7 @@ Public Class frmMDMDatenverarbetiung End If Case "IDS" If cbxIDSmitVerag.Checked Then - MsgBox("Abrechnung ohne VERAG/VERAG360 !") + MsgBox("Abrechnung ohne VERAG/VERAG360!") Exit Sub End If showIDSContextMenu() @@ -1049,6 +1101,7 @@ Public Class frmMDMDatenverarbetiung cbxASFINAGAbgerechnet.Visible = True cbxBelegeerstellt.Visible = True pnlAsfinag.Visible = True + checkImport(LIEFERANT) Exit Sub Case "IDS" Panel5.Visible = True @@ -4857,4 +4910,5 @@ RabattBerechnen: Private Sub cbxIDSmitVerag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxIDSmitVerag.CheckedChanged initDgv_IDS() End Sub + End Class