From ec4d190d0a7518b15f71cad0a2b02bb7996631ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=82=D1=8F=20=D0=98=D1=85=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0?= Date: Wed, 22 Mar 2023 20:33:00 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D1=804=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8?= =?UTF-8?q?=D1=822?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrecastConcretePlant/FormMain.Designer.cs | 234 +++---- ...FormReportReinforcedComponents.Designer.cs | 104 +-- .../PrecastConcretePlantView.csproj | 2 + PrecastConcretePlant/Program.cs | 20 +- PrecastConcretePlant/ReportOrders.rdlc | 600 ++++++++++++++++++ .../BusinessLogic/ReinforcedLogic.cs | 2 +- .../BusinessLogic/ReportLogic.cs | 4 +- .../OfficePackage/AbstractSaveToPdf.cs | 2 +- .../PrecastConcretePlantBusinessLogic.csproj | 4 +- .../BindingModels/ReportBindingModel.cs | 15 + .../BusinessLogicsContracts/IReportLogic.cs | 41 ++ .../SearchModels/OrderSearchModel.cs | 2 + .../ViewModels/OrderViewModel.cs | 2 +- .../ViewModels/ReportOrdersViewModel.cs | 21 + .../ReportReinforcedComponentViewModel.cs | 15 + .../Implements/OrderStorage.cs | 17 +- 16 files changed, 909 insertions(+), 176 deletions(-) create mode 100644 PrecastConcretePlant/ReportOrders.rdlc create mode 100644 PrecastConcretePlantContracts/BindingModels/ReportBindingModel.cs create mode 100644 PrecastConcretePlantContracts/BusinessLogicsContracts/IReportLogic.cs create mode 100644 PrecastConcretePlantContracts/ViewModels/ReportOrdersViewModel.cs create mode 100644 PrecastConcretePlantContracts/ViewModels/ReportReinforcedComponentViewModel.cs diff --git a/PrecastConcretePlant/FormMain.Designer.cs b/PrecastConcretePlant/FormMain.Designer.cs index 0deee12..ffd4acc 100644 --- a/PrecastConcretePlant/FormMain.Designer.cs +++ b/PrecastConcretePlant/FormMain.Designer.cs @@ -28,162 +28,170 @@ /// private void InitializeComponent() { - MenuStrip = new MenuStrip(); - СправочникиToolStripMenuItem = new ToolStripMenuItem(); - ИзделияToolStripMenuItem = new ToolStripMenuItem(); - КомпонентыToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - списокИзделийToolStripMenuItem = new ToolStripMenuItem(); - компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); - DataGridView = new DataGridView(); - CreateOrderButton = new Button(); - TakeOrderInWorkButton = new Button(); - OrderReadyButton = new Button(); - IssuedOrderButton = new Button(); - UpdateListButton = new Button(); - MenuStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); - SuspendLayout(); + this.MenuStrip = new System.Windows.Forms.MenuStrip(); + this.СправочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокЖБИToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DataGridView = new System.Windows.Forms.DataGridView(); + this.CreateOrderButton = new System.Windows.Forms.Button(); + this.TakeOrderInWorkButton = new System.Windows.Forms.Button(); + this.OrderReadyButton = new System.Windows.Forms.Button(); + this.IssuedOrderButton = new System.Windows.Forms.Button(); + this.UpdateListButton = new System.Windows.Forms.Button(); + this.MenuStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit(); + this.SuspendLayout(); // // MenuStrip // - MenuStrip.Items.AddRange(new ToolStripItem[] { СправочникиToolStripMenuItem, отчетыToolStripMenuItem }); - MenuStrip.Location = new Point(0, 0); - MenuStrip.Name = "MenuStrip"; - MenuStrip.Size = new Size(953, 24); - MenuStrip.TabIndex = 0; - MenuStrip.Text = "menuStrip1"; + this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.СправочникиToolStripMenuItem, + this.отчетыToolStripMenuItem}); + this.MenuStrip.Location = new System.Drawing.Point(0, 0); + this.MenuStrip.Name = "MenuStrip"; + this.MenuStrip.Size = new System.Drawing.Size(953, 24); + this.MenuStrip.TabIndex = 0; + this.MenuStrip.Text = "menuStrip1"; // // СправочникиToolStripMenuItem // - СправочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ИзделияToolStripMenuItem, КомпонентыToolStripMenuItem }); - СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; - СправочникиToolStripMenuItem.Size = new Size(94, 20); - СправочникиToolStripMenuItem.Text = "Cправочники"; + this.СправочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ИзделияToolStripMenuItem, + this.КомпонентыToolStripMenuItem}); + this.СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; + this.СправочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20); + this.СправочникиToolStripMenuItem.Text = "Cправочники"; // // ИзделияToolStripMenuItem // - ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem"; - ИзделияToolStripMenuItem.Size = new Size(145, 22); - ИзделияToolStripMenuItem.Text = "ЖБИ"; - ИзделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; + this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem"; + this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.ИзделияToolStripMenuItem.Text = "ЖБИ"; + this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); // // КомпонентыToolStripMenuItem // - КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(145, 22); - КомпонентыToolStripMenuItem.Text = "Компоненты"; - КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; + this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; + this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.КомпонентыToolStripMenuItem.Text = "Компоненты"; + this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); // // отчетыToolStripMenuItem // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокИзделийToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); - отчетыToolStripMenuItem.Text = "Отчеты"; + this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.списокЖБИToolStripMenuItem, + this.компонентыПоИзделиямToolStripMenuItem, + this.списокЗаказовToolStripMenuItem}); + this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(60, 20); + this.отчетыToolStripMenuItem.Text = "Отчеты"; // - // списокИзделийToolStripMenuItem + // списокЖБИToolStripMenuItem // - списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem"; - списокИзделийToolStripMenuItem.Size = new Size(218, 22); - списокИзделийToolStripMenuItem.Text = "Список изделий"; - списокИзделийToolStripMenuItem.Click += списокИзделийToolStripMenuItem_Click; + this.списокЖБИToolStripMenuItem.Name = "списокЖБИToolStripMenuItem"; + this.списокЖБИToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.списокЖБИToolStripMenuItem.Text = "Список ЖБИ"; + this.списокЖБИToolStripMenuItem.Click += new System.EventHandler(this.списокИзделийToolStripMenuItem_Click); // // компонентыПоИзделиямToolStripMenuItem // - компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(218, 22); - компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - компонентыПоИзделиямToolStripMenuItem.Click += компонентыПоИзделиямToolStripMenuItem_Click; + this.компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; + this.компонентыПоИзделиямToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.компонентыПоИзделиямToolStripMenuItem.Text = "ЖБИ по компонентам"; + this.компонентыПоИзделиямToolStripMenuItem.Click += new System.EventHandler(this.компонентыПоИзделиямToolStripMenuItem_Click); // // списокЗаказовToolStripMenuItem // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(218, 22); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; + this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; + this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказовToolStripMenuItem_Click); // // DataGridView // - DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - DataGridView.Location = new Point(0, 27); - DataGridView.Name = "DataGridView"; - DataGridView.RowTemplate.Height = 25; - DataGridView.Size = new Size(805, 421); - DataGridView.TabIndex = 1; + this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.DataGridView.Location = new System.Drawing.Point(0, 27); + this.DataGridView.Name = "DataGridView"; + this.DataGridView.RowTemplate.Height = 25; + this.DataGridView.Size = new System.Drawing.Size(805, 421); + this.DataGridView.TabIndex = 1; // // CreateOrderButton // - CreateOrderButton.Location = new Point(825, 27); - CreateOrderButton.Name = "CreateOrderButton"; - CreateOrderButton.Size = new Size(104, 33); - CreateOrderButton.TabIndex = 2; - CreateOrderButton.Text = "Создать заказ"; - CreateOrderButton.UseVisualStyleBackColor = true; - CreateOrderButton.Click += CreateOrderButton_Click; + this.CreateOrderButton.Location = new System.Drawing.Point(825, 27); + this.CreateOrderButton.Name = "CreateOrderButton"; + this.CreateOrderButton.Size = new System.Drawing.Size(104, 33); + this.CreateOrderButton.TabIndex = 2; + this.CreateOrderButton.Text = "Создать заказ"; + this.CreateOrderButton.UseVisualStyleBackColor = true; + this.CreateOrderButton.Click += new System.EventHandler(this.CreateOrderButton_Click); // // TakeOrderInWorkButton // - TakeOrderInWorkButton.Location = new Point(825, 66); - TakeOrderInWorkButton.Name = "TakeOrderInWorkButton"; - TakeOrderInWorkButton.Size = new Size(104, 39); - TakeOrderInWorkButton.TabIndex = 3; - TakeOrderInWorkButton.Text = "Отдать на выполнение"; - TakeOrderInWorkButton.UseVisualStyleBackColor = true; - TakeOrderInWorkButton.Click += TakeOrderInWorkButton_Click; + this.TakeOrderInWorkButton.Location = new System.Drawing.Point(825, 66); + this.TakeOrderInWorkButton.Name = "TakeOrderInWorkButton"; + this.TakeOrderInWorkButton.Size = new System.Drawing.Size(104, 39); + this.TakeOrderInWorkButton.TabIndex = 3; + this.TakeOrderInWorkButton.Text = "Отдать на выполнение"; + this.TakeOrderInWorkButton.UseVisualStyleBackColor = true; + this.TakeOrderInWorkButton.Click += new System.EventHandler(this.TakeOrderInWorkButton_Click); // // OrderReadyButton // - OrderReadyButton.Location = new Point(825, 111); - OrderReadyButton.Name = "OrderReadyButton"; - OrderReadyButton.Size = new Size(104, 33); - OrderReadyButton.TabIndex = 4; - OrderReadyButton.Text = "Заказ готов"; - OrderReadyButton.UseVisualStyleBackColor = true; - OrderReadyButton.Click += OrderReadyButton_Click; + this.OrderReadyButton.Location = new System.Drawing.Point(825, 111); + this.OrderReadyButton.Name = "OrderReadyButton"; + this.OrderReadyButton.Size = new System.Drawing.Size(104, 33); + this.OrderReadyButton.TabIndex = 4; + this.OrderReadyButton.Text = "Заказ готов"; + this.OrderReadyButton.UseVisualStyleBackColor = true; + this.OrderReadyButton.Click += new System.EventHandler(this.OrderReadyButton_Click); // // IssuedOrderButton // - IssuedOrderButton.Location = new Point(825, 150); - IssuedOrderButton.Name = "IssuedOrderButton"; - IssuedOrderButton.Size = new Size(104, 33); - IssuedOrderButton.TabIndex = 5; - IssuedOrderButton.Text = "Заказ выдан"; - IssuedOrderButton.UseVisualStyleBackColor = true; - IssuedOrderButton.Click += IssuedOrderButton_Click; + this.IssuedOrderButton.Location = new System.Drawing.Point(825, 150); + this.IssuedOrderButton.Name = "IssuedOrderButton"; + this.IssuedOrderButton.Size = new System.Drawing.Size(104, 33); + this.IssuedOrderButton.TabIndex = 5; + this.IssuedOrderButton.Text = "Заказ выдан"; + this.IssuedOrderButton.UseVisualStyleBackColor = true; + this.IssuedOrderButton.Click += new System.EventHandler(this.IssuedOrderButton_Click); // // UpdateListButton // - UpdateListButton.Location = new Point(825, 189); - UpdateListButton.Name = "UpdateListButton"; - UpdateListButton.Size = new Size(104, 33); - UpdateListButton.TabIndex = 6; - UpdateListButton.Text = "Обновить список"; - UpdateListButton.UseVisualStyleBackColor = true; - UpdateListButton.Click += UpdateListButton_Click; + this.UpdateListButton.Location = new System.Drawing.Point(825, 189); + this.UpdateListButton.Name = "UpdateListButton"; + this.UpdateListButton.Size = new System.Drawing.Size(104, 33); + this.UpdateListButton.TabIndex = 6; + this.UpdateListButton.Text = "Обновить список"; + this.UpdateListButton.UseVisualStyleBackColor = true; + this.UpdateListButton.Click += new System.EventHandler(this.UpdateListButton_Click); // // FormMain // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(953, 450); - Controls.Add(UpdateListButton); - Controls.Add(IssuedOrderButton); - Controls.Add(OrderReadyButton); - Controls.Add(TakeOrderInWorkButton); - Controls.Add(CreateOrderButton); - Controls.Add(DataGridView); - Controls.Add(MenuStrip); - MainMenuStrip = MenuStrip; - Name = "FormMain"; - Text = "Завод ЖБИ"; - Load += FormMain_Load; - MenuStrip.ResumeLayout(false); - MenuStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); - ResumeLayout(false); - PerformLayout(); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(953, 450); + this.Controls.Add(this.UpdateListButton); + this.Controls.Add(this.IssuedOrderButton); + this.Controls.Add(this.OrderReadyButton); + this.Controls.Add(this.TakeOrderInWorkButton); + this.Controls.Add(this.CreateOrderButton); + this.Controls.Add(this.DataGridView); + this.Controls.Add(this.MenuStrip); + this.MainMenuStrip = this.MenuStrip; + this.Name = "FormMain"; + this.Text = "Завод ЖБИ"; + this.Load += new System.EventHandler(this.FormMain_Load); + this.MenuStrip.ResumeLayout(false); + this.MenuStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + } #endregion @@ -199,7 +207,7 @@ private Button IssuedOrderButton; private Button UpdateListButton; private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem списокИзделийToolStripMenuItem; + private ToolStripMenuItem списокЖБИToolStripMenuItem; private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; private ToolStripMenuItem списокЗаказовToolStripMenuItem; } diff --git a/PrecastConcretePlant/FormReportReinforcedComponents.Designer.cs b/PrecastConcretePlant/FormReportReinforcedComponents.Designer.cs index 259ef27..59c0d38 100644 --- a/PrecastConcretePlant/FormReportReinforcedComponents.Designer.cs +++ b/PrecastConcretePlant/FormReportReinforcedComponents.Designer.cs @@ -28,74 +28,78 @@ /// private void InitializeComponent() { - buttonSaveToExcel = new Button(); - dataGridView = new DataGridView(); - ColumnPastry = new DataGridViewTextBoxColumn(); - ColumnComponent = new DataGridViewTextBoxColumn(); - ColumnCount = new DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); + this.buttonSaveToExcel = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ColumnPastry = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); // // buttonSaveToExcel // - buttonSaveToExcel.Location = new Point(5, 9); - buttonSaveToExcel.Margin = new Padding(4, 3, 4, 3); - buttonSaveToExcel.Name = "buttonSaveToExcel"; - buttonSaveToExcel.Size = new Size(186, 27); - buttonSaveToExcel.TabIndex = 2; - buttonSaveToExcel.Text = "Сохранить в Excel"; - buttonSaveToExcel.UseVisualStyleBackColor = true; - buttonSaveToExcel.Click += ButtonSaveToExcel_Click; + this.buttonSaveToExcel.Location = new System.Drawing.Point(5, 9); + this.buttonSaveToExcel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonSaveToExcel.Name = "buttonSaveToExcel"; + this.buttonSaveToExcel.Size = new System.Drawing.Size(186, 27); + this.buttonSaveToExcel.TabIndex = 2; + this.buttonSaveToExcel.Text = "Сохранить в Excel"; + this.buttonSaveToExcel.UseVisualStyleBackColor = true; + this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click); // // dataGridView // - dataGridView.AllowUserToOrderColumns = true; - dataGridView.AllowUserToResizeColumns = false; - dataGridView.AllowUserToResizeRows = false; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnPastry, ColumnComponent, ColumnCount }); - dataGridView.Dock = DockStyle.Bottom; - dataGridView.Location = new Point(0, 44); - dataGridView.Margin = new Padding(4, 3, 4, 3); - dataGridView.MultiSelect = false; - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersVisible = false; - dataGridView.Size = new Size(503, 524); - dataGridView.TabIndex = 3; + this.dataGridView.AllowUserToOrderColumns = true; + this.dataGridView.AllowUserToResizeColumns = false; + this.dataGridView.AllowUserToResizeRows = false; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ColumnPastry, + this.ColumnComponent, + this.ColumnCount}); + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom; + this.dataGridView.Location = new System.Drawing.Point(0, 44); + this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.Size = new System.Drawing.Size(503, 524); + this.dataGridView.TabIndex = 3; // // ColumnPastry // - ColumnPastry.HeaderText = "Изделие"; - ColumnPastry.Name = "ColumnPastry"; - ColumnPastry.ReadOnly = true; - ColumnPastry.Width = 200; + this.ColumnPastry.HeaderText = "ЖБИ"; + this.ColumnPastry.Name = "ColumnPastry"; + this.ColumnPastry.ReadOnly = true; + this.ColumnPastry.Width = 200; // // ColumnComponent // - ColumnComponent.HeaderText = "Компонент"; - ColumnComponent.Name = "ColumnComponent"; - ColumnComponent.ReadOnly = true; - ColumnComponent.Width = 200; + this.ColumnComponent.HeaderText = "Компонент"; + this.ColumnComponent.Name = "ColumnComponent"; + this.ColumnComponent.ReadOnly = true; + this.ColumnComponent.Width = 200; // // ColumnCount // - ColumnCount.HeaderText = "Количество"; - ColumnCount.Name = "ColumnCount"; - ColumnCount.ReadOnly = true; + this.ColumnCount.HeaderText = "Количество"; + this.ColumnCount.Name = "ColumnCount"; + this.ColumnCount.ReadOnly = true; // // FormReportReinforcedComponents // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(503, 568); - Controls.Add(dataGridView); - Controls.Add(buttonSaveToExcel); - Name = "FormReportReinforcedComponents"; - Text = "Изделия с компонентами"; - Load += FormReportPastryComponents_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(503, 568); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.buttonSaveToExcel); + this.Name = "FormReportReinforcedComponents"; + this.Text = "ЖБИ по компонентам"; + this.Load += new System.EventHandler(this.FormReportPastryComponents_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + } #endregion diff --git a/PrecastConcretePlant/PrecastConcretePlantView.csproj b/PrecastConcretePlant/PrecastConcretePlantView.csproj index e053994..7fcd12c 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView.csproj +++ b/PrecastConcretePlant/PrecastConcretePlantView.csproj @@ -9,11 +9,13 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/PrecastConcretePlant/Program.cs b/PrecastConcretePlant/Program.cs index 54ca4c8..f4c9080 100644 --- a/PrecastConcretePlant/Program.cs +++ b/PrecastConcretePlant/Program.cs @@ -1,11 +1,15 @@ -using PrecastConcretePlantView; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using NLog.Extensions.Logging; using PrecastConcretePlantBusinessLogic.BusinessLogic; +using PrecastConcretePlantBusinessLogic.OfficePackage.Implements; +using PrecastConcretePlantBusinessLogic.OfficePackage; using PrecastConcretePlantContracts.BusinessLogicsContracts; using PrecastConcretePlantContracts.StoragesContracts; using PrecastConcretePlantDatabaseImplement.Implements; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; +using System; +using PrecastConcretePlantBusinessLogic.BusinessLogics; +using PrecastConcretePlantView; namespace PrecastConcretePlant { @@ -37,6 +41,12 @@ namespace PrecastConcretePlant services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -44,6 +54,8 @@ namespace PrecastConcretePlant services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/PrecastConcretePlant/ReportOrders.rdlc b/PrecastConcretePlant/ReportOrders.rdlc new file mode 100644 index 0000000..d102fa4 --- /dev/null +++ b/PrecastConcretePlant/ReportOrders.rdlc @@ -0,0 +1,600 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 10791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + PrecastConcretePlantContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + ReinforcedName + System.String + + + Sum + System.Decimal + + + OrderStatus + PrecastConcretePlantDataModels.OrderStatus + + + + PrecastConcretePlantContracts.ViewModels + ReportOrdersViewModel + PrecastConcretePlantContracts.ViewModels.ReportOrdersViewModel, PrecastConcretePlantContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + + + + ReportParameterPeriod + 1cm + 1cm + 21cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Заказы + + + + + + + 1cm + 21cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.5cm + + + 3.21438cm + + + 8.23317cm + + + 3.02917cm + + + 2.87042cm + + + + + 0.6cm + + + + + true + true + + + + + Номер + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Дата создания + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + ЖБИ + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Статус заказа + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!ReinforcedName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!OrderStatus.Value + + + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.48391cm + 0.55245cm + 1.2cm + 19.84713cm + 2 + + + + + + true + true + + + + + Итого: + + + + + + + 4cm + 15.39958cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + + + + + 4cm + 17.89958cm + 0.6cm + 2.5cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + 5.72875cm +