diff --git a/GarmentFactory/FormAddTextile.Designer.cs b/GarmentFactory/FormAddTextile.Designer.cs
new file mode 100644
index 0000000..11c88bb
--- /dev/null
+++ b/GarmentFactory/FormAddTextile.Designer.cs
@@ -0,0 +1,144 @@
+namespace GarmentFactoryView
+{
+ partial class FormAddTextile
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ labelShop = new Label();
+ labelCount = new Label();
+ labelTextile = new Label();
+ comboBoxShop = new ComboBox();
+ textBoxCount = new TextBox();
+ comboBoxTextile = new ComboBox();
+ buttonCancel = new Button();
+ buttonSave = new Button();
+ SuspendLayout();
+ //
+ // labelShop
+ //
+ labelShop.AutoSize = true;
+ labelShop.Location = new Point(38, 37);
+ labelShop.Name = "labelShop";
+ labelShop.Size = new Size(72, 20);
+ labelShop.TabIndex = 0;
+ labelShop.Text = "Магазин:";
+ //
+ // labelCount
+ //
+ labelCount.AutoSize = true;
+ labelCount.Location = new Point(29, 123);
+ labelCount.Name = "labelCount";
+ labelCount.Size = new Size(93, 20);
+ labelCount.TabIndex = 3;
+ labelCount.Text = "Количество:";
+ //
+ // labelTextile
+ //
+ labelTextile.AutoSize = true;
+ labelTextile.Location = new Point(38, 79);
+ labelTextile.Name = "labelTextile";
+ labelTextile.Size = new Size(71, 20);
+ labelTextile.TabIndex = 2;
+ labelTextile.Text = "Изделие:";
+ //
+ // comboBoxShop
+ //
+ comboBoxShop.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxShop.FormattingEnabled = true;
+ comboBoxShop.Location = new Point(140, 37);
+ comboBoxShop.Name = "comboBoxShop";
+ comboBoxShop.Size = new Size(262, 28);
+ comboBoxShop.TabIndex = 11;
+ //
+ // textBoxCount
+ //
+ textBoxCount.Location = new Point(140, 123);
+ textBoxCount.Name = "textBoxCount";
+ textBoxCount.Size = new Size(262, 27);
+ textBoxCount.TabIndex = 10;
+ //
+ // comboBoxTextile
+ //
+ comboBoxTextile.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxTextile.FormattingEnabled = true;
+ comboBoxTextile.Location = new Point(140, 79);
+ comboBoxTextile.Name = "comboBoxTextile";
+ comboBoxTextile.Size = new Size(262, 28);
+ comboBoxTextile.TabIndex = 9;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(342, 181);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(94, 29);
+ buttonCancel.TabIndex = 13;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += ButtonCancel_Click;
+ //
+ // buttonSave
+ //
+ buttonSave.Location = new Point(242, 181);
+ buttonSave.Name = "buttonSave";
+ buttonSave.Size = new Size(94, 29);
+ buttonSave.TabIndex = 12;
+ buttonSave.Text = "Сохранить";
+ buttonSave.UseVisualStyleBackColor = true;
+ buttonSave.Click += ButtonSave_Click;
+ //
+ // FormAddTextile
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(455, 222);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonSave);
+ Controls.Add(comboBoxShop);
+ Controls.Add(textBoxCount);
+ Controls.Add(comboBoxTextile);
+ Controls.Add(labelCount);
+ Controls.Add(labelTextile);
+ Controls.Add(labelShop);
+ Name = "FormAddTextile";
+ Text = "Пополнение магазина";
+ Load += FormAddTextile_Load;
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private Label labelShop;
+ private Label labelCount;
+ private Label labelTextile;
+ private ComboBox comboBoxShop;
+ private TextBox textBoxCount;
+ private ComboBox comboBoxTextile;
+ private Button buttonCancel;
+ private Button buttonSave;
+ }
+}
\ No newline at end of file
diff --git a/GarmentFactory/FormAddTextile.cs b/GarmentFactory/FormAddTextile.cs
new file mode 100644
index 0000000..0b26d2b
--- /dev/null
+++ b/GarmentFactory/FormAddTextile.cs
@@ -0,0 +1,109 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GarmentFactoryView
+{
+ public partial class FormAddTextile : Form
+ {
+ private readonly ILogger _logger;
+ private readonly ITextileLogic _logicT;
+ private readonly IShopLogic _logicS;
+ //Списки для ComboBox
+ private List _shopList = new List();
+ private List _textileList = new List();
+ public FormAddTextile(ILogger logger, ITextileLogic logicT, IShopLogic logicS)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicT = logicT;
+ _logicS = logicS;
+ }
+
+ private void FormAddTextile_Load(object sender, EventArgs e)
+ {
+ _shopList = _logicS.ReadList(null);
+ _textileList = _logicT.ReadList(null);
+
+ _logger.LogInformation("Загрузка списка магазинов при пополнении");
+ if (_shopList != null)
+ {
+ comboBoxShop.DisplayMember = "ShopName";
+ comboBoxShop.ValueMember = "Id";
+ comboBoxShop.DataSource = _shopList;
+ comboBoxShop.SelectedItem = null;
+ }
+
+ _logger.LogInformation("Загрузка списка товаров при пополнении");
+ if (_textileList != null)
+ {
+ comboBoxTextile.DisplayMember = "TextileName";
+ comboBoxTextile.ValueMember = "Id";
+ comboBoxTextile.DataSource = _textileList;
+ comboBoxTextile.SelectedItem = null;
+ }
+ }
+
+ private void ButtonSave_Click(object sender, EventArgs e)
+ {
+ if (comboBoxShop.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ if (comboBoxTextile.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ if (string.IsNullOrEmpty(textBoxCount.Text))
+ {
+ MessageBox.Show("Заполните поле \"Количество\"", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ _logger.LogInformation("Пополнение магазина");
+ try
+ {
+ var operationResult = _logicS.MakeSupply(new SupplyBindingModel
+ {
+ ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
+ TextileId = Convert.ToInt32(comboBoxTextile.SelectedValue),
+ Count = Convert.ToInt32(textBoxCount.Text)
+ });
+
+ if (!operationResult)
+ {
+ throw new Exception("Ошибка при пополнении магазина. Дополнительная информация в логах.");
+ }
+ MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка поплнения магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void ButtonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ }
+}
diff --git a/GarmentFactory/FormAddTextile.resx b/GarmentFactory/FormAddTextile.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/GarmentFactory/FormAddTextile.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/GarmentFactory/FormMain.Designer.cs b/GarmentFactory/FormMain.Designer.cs
index 33a8a6d..856a685 100644
--- a/GarmentFactory/FormMain.Designer.cs
+++ b/GarmentFactory/FormMain.Designer.cs
@@ -38,11 +38,18 @@
справочникиToolStripMenuItem = new ToolStripMenuItem();
компонентыToolStripMenuItem = new ToolStripMenuItem();
текстилиToolStripMenuItem = new ToolStripMenuItem();
+ магазиныToolStripMenuItem = new ToolStripMenuItem();
+ операцииToolStripMenuItem = new ToolStripMenuItem();
+ пополнениеМагазинаToolStripMenuItem1 = new ToolStripMenuItem();
+ продажаТовараToolStripMenuItem = new ToolStripMenuItem();
клиентыToolStripMenuItem = new ToolStripMenuItem();
отчётыToolStripMenuItem = new ToolStripMenuItem();
textilesToolStripMenuItem = new ToolStripMenuItem();
textileComponentsToolStripMenuItem = new ToolStripMenuItem();
ordersToolStripMenuItem = new ToolStripMenuItem();
+ магазиныВDocToolStripMenuItem = new ToolStripMenuItem();
+ загруженностьМагазиновToolStripMenuItem = new ToolStripMenuItem();
+ заказыПоДатамToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip1.SuspendLayout();
SuspendLayout();
@@ -121,7 +128,7 @@
// menuStrip1
//
menuStrip1.ImageScalingSize = new Size(20, 20);
- menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem });
+ menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчётыToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1380, 28);
@@ -130,7 +137,7 @@
//
// справочникиToolStripMenuItem
//
- справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem, клиентыToolStripMenuItem });
+ справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem, магазиныToolStripMenuItem, клиентыToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24);
справочникиToolStripMenuItem.Text = "Справочники";
@@ -149,6 +156,34 @@
текстилиToolStripMenuItem.Text = "Текстили";
текстилиToolStripMenuItem.Click += текстилиToolStripMenuItem_Click;
//
+ // магазиныToolStripMenuItem
+ //
+ магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+ магазиныToolStripMenuItem.Size = new Size(182, 26);
+ магазиныToolStripMenuItem.Text = "Магазины";
+ магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
+ //
+ // операцииToolStripMenuItem
+ //
+ операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { пополнениеМагазинаToolStripMenuItem1, продажаТовараToolStripMenuItem });
+ операцииToolStripMenuItem.Name = "операцииToolStripMenuItem";
+ операцииToolStripMenuItem.Size = new Size(95, 24);
+ операцииToolStripMenuItem.Text = "Операции";
+ //
+ // пополнениеМагазинаToolStripMenuItem1
+ //
+ пополнениеМагазинаToolStripMenuItem1.Name = "пополнениеМагазинаToolStripMenuItem1";
+ пополнениеМагазинаToolStripMenuItem1.Size = new Size(251, 26);
+ пополнениеМагазинаToolStripMenuItem1.Text = "Пополнение магазина";
+ пополнениеМагазинаToolStripMenuItem1.Click += пополнениеМагазинаToolStripMenuItem1_Click;
+ //
+ // продажаТовараToolStripMenuItem
+ //
+ продажаТовараToolStripMenuItem.Name = "продажаТовараToolStripMenuItem";
+ продажаТовараToolStripMenuItem.Size = new Size(251, 26);
+ продажаТовараToolStripMenuItem.Text = "Продажа товара";
+ продажаТовараToolStripMenuItem.Click += продажаТовараToolStripMenuItem_Click;
+ //
// клиентыToolStripMenuItem
//
клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
@@ -158,7 +193,7 @@
//
// отчётыToolStripMenuItem
//
- отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { textilesToolStripMenuItem, textileComponentsToolStripMenuItem, ordersToolStripMenuItem });
+ отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { textilesToolStripMenuItem, textileComponentsToolStripMenuItem, ordersToolStripMenuItem, магазиныВDocToolStripMenuItem, загруженностьМагазиновToolStripMenuItem, заказыПоДатамToolStripMenuItem });
отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
отчётыToolStripMenuItem.Size = new Size(73, 24);
отчётыToolStripMenuItem.Text = "Отчёты";
@@ -166,24 +201,45 @@
// textilesToolStripMenuItem
//
textilesToolStripMenuItem.Name = "textilesToolStripMenuItem";
- textilesToolStripMenuItem.Size = new Size(274, 26);
+ textilesToolStripMenuItem.Size = new Size(276, 26);
textilesToolStripMenuItem.Text = "Текстили";
textilesToolStripMenuItem.Click += TextilesToolStripMenuItem_Click;
//
// textileComponentsToolStripMenuItem
//
textileComponentsToolStripMenuItem.Name = "textileComponentsToolStripMenuItem";
- textileComponentsToolStripMenuItem.Size = new Size(274, 26);
+ textileComponentsToolStripMenuItem.Size = new Size(276, 26);
textileComponentsToolStripMenuItem.Text = "Текстили с компонентами";
textileComponentsToolStripMenuItem.Click += ComponentTextilesToolStripMenuItem_Click;
//
// ordersToolStripMenuItem
//
ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
- ordersToolStripMenuItem.Size = new Size(274, 26);
+ ordersToolStripMenuItem.Size = new Size(276, 26);
ordersToolStripMenuItem.Text = "Заказы";
ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
//
+ // магазиныВDocToolStripMenuItem
+ //
+ магазиныВDocToolStripMenuItem.Name = "магазиныВDocToolStripMenuItem";
+ магазиныВDocToolStripMenuItem.Size = new Size(276, 26);
+ магазиныВDocToolStripMenuItem.Text = "Магазины в doc";
+ магазиныВDocToolStripMenuItem.Click += магазиныВDocToolStripMenuItem_Click;
+ //
+ // загруженностьМагазиновToolStripMenuItem
+ //
+ загруженностьМагазиновToolStripMenuItem.Name = "загруженностьМагазиновToolStripMenuItem";
+ загруженностьМагазиновToolStripMenuItem.Size = new Size(276, 26);
+ загруженностьМагазиновToolStripMenuItem.Text = "Загруженность магазинов";
+ загруженностьМагазиновToolStripMenuItem.Click += загруженностьМагазиновToolStripMenuItem_Click;
+ //
+ // заказыПоДатамToolStripMenuItem
+ //
+ заказыПоДатамToolStripMenuItem.Name = "заказыПоДатамToolStripMenuItem";
+ заказыПоДатамToolStripMenuItem.Size = new Size(276, 26);
+ заказыПоДатамToolStripMenuItem.Text = "Заказы по датам";
+ заказыПоДатамToolStripMenuItem.Click += заказыПоДатамToolStripMenuItem_Click;
+ //
// FormMain
//
AutoScaleDimensions = new SizeF(8F, 20F);
@@ -219,10 +275,17 @@
private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem текстилиToolStripMenuItem;
+ private ToolStripMenuItem магазиныToolStripMenuItem;
+ private ToolStripMenuItem операцииToolStripMenuItem;
+ private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem1;
+ private ToolStripMenuItem продажаТовараToolStripMenuItem;
private ToolStripMenuItem отчётыToolStripMenuItem;
private ToolStripMenuItem textilesToolStripMenuItem;
private ToolStripMenuItem textileComponentsToolStripMenuItem;
private ToolStripMenuItem ordersToolStripMenuItem;
+ private ToolStripMenuItem магазиныВDocToolStripMenuItem;
+ private ToolStripMenuItem загруженностьМагазиновToolStripMenuItem;
+ private ToolStripMenuItem заказыПоДатамToolStripMenuItem;
private ToolStripMenuItem клиентыToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/GarmentFactory/FormMain.cs b/GarmentFactory/FormMain.cs
index 0293a53..ac4d18d 100644
--- a/GarmentFactory/FormMain.cs
+++ b/GarmentFactory/FormMain.cs
@@ -103,6 +103,17 @@ namespace GarmentFactoryView
}
+
+ private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+
+ if (service is FormShops form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void ButtonCreateOrder_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
@@ -184,6 +195,53 @@ namespace GarmentFactoryView
LoadData();
}
+ private void пополнениеМагазинаToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormAddTextile));
+
+ if (service is FormAddTextile form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void продажаТовараToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormSellTextile));
+ if (service is FormSellTextile form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void магазиныВDocToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+
+ private void загруженностьМагазиновToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportShops));
+ if (service is FormReportShops form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void заказыПоДатамToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
+ if (service is FormReportGroupedOrders form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormClients));
diff --git a/GarmentFactory/FormReportGroupedOrders.Designer.cs b/GarmentFactory/FormReportGroupedOrders.Designer.cs
new file mode 100644
index 0000000..911a695
--- /dev/null
+++ b/GarmentFactory/FormReportGroupedOrders.Designer.cs
@@ -0,0 +1,86 @@
+namespace GarmentFactoryView
+{
+ partial class FormReportGroupedOrders
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.panel = new System.Windows.Forms.Panel();
+ this.buttonToPDF = new System.Windows.Forms.Button();
+ this.buttonMake = new System.Windows.Forms.Button();
+ this.panel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panel
+ //
+ this.panel.Controls.Add(this.buttonToPDF);
+ this.panel.Controls.Add(this.buttonMake);
+ this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel.Location = new System.Drawing.Point(0, 0);
+ this.panel.Name = "panel";
+ this.panel.Size = new System.Drawing.Size(970, 52);
+ this.panel.TabIndex = 1;
+ //
+ // buttonToPDF
+ //
+ this.buttonToPDF.Location = new System.Drawing.Point(486, 12);
+ this.buttonToPDF.Name = "buttonToPDF";
+ this.buttonToPDF.Size = new System.Drawing.Size(411, 29);
+ this.buttonToPDF.TabIndex = 5;
+ this.buttonToPDF.Text = "В PDF";
+ this.buttonToPDF.UseVisualStyleBackColor = true;
+ this.buttonToPDF.Click += new System.EventHandler(this.buttonToPDF_Click);
+ //
+ // buttonMake
+ //
+ this.buttonMake.Location = new System.Drawing.Point(49, 12);
+ this.buttonMake.Name = "buttonMake";
+ this.buttonMake.Size = new System.Drawing.Size(377, 29);
+ this.buttonMake.TabIndex = 4;
+ this.buttonMake.Text = "Сформировать";
+ this.buttonMake.UseVisualStyleBackColor = true;
+ this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+ //
+ // FormReportGroupedOrders
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(970, 450);
+ this.Controls.Add(this.panel);
+ this.Name = "FormReportGroupedOrders";
+ this.Text = "Отчёт по группированным заказам ";
+ this.panel.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Panel panel;
+ private Button buttonToPDF;
+ private Button buttonMake;
+ }
+}
\ No newline at end of file
diff --git a/GarmentFactory/FormReportGroupedOrders.cs b/GarmentFactory/FormReportGroupedOrders.cs
new file mode 100644
index 0000000..28a041b
--- /dev/null
+++ b/GarmentFactory/FormReportGroupedOrders.cs
@@ -0,0 +1,80 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GarmentFactoryView
+{
+ public partial class FormReportGroupedOrders : Form
+ {
+ private readonly ReportViewer reportViewer;
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+
+ public FormReportGroupedOrders(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ reportViewer = new ReportViewer
+ {
+ Dock = DockStyle.Fill
+ };
+ reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportGroupedOrders.rdlc", FileMode.Open));
+ Controls.Clear();
+ Controls.Add(reportViewer);
+ Controls.Add(panel);
+ }
+
+ private void ButtonMake_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ var dataSource = _logic.GetGroupedOrders();
+ var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
+ reportViewer.LocalReport.DataSources.Clear();
+ reportViewer.LocalReport.DataSources.Add(source);
+
+ reportViewer.RefreshReport();
+ _logger.LogInformation("Загрузка списка группированных заказов");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка группированных заказов на период");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+
+ private void buttonToPDF_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ try
+ {
+ _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
+ {
+ FileName = dialog.FileName,
+ });
+ _logger.LogInformation("Сохранение списка группированных заказов");
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка сохранения списка группированных заказов");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+}
diff --git a/GarmentFactory/FormReportGroupedOrders.resx b/GarmentFactory/FormReportGroupedOrders.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/GarmentFactory/FormReportGroupedOrders.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/GarmentFactory/FormReportShops.Designer.cs b/GarmentFactory/FormReportShops.Designer.cs
new file mode 100644
index 0000000..92476bd
--- /dev/null
+++ b/GarmentFactory/FormReportShops.Designer.cs
@@ -0,0 +1,112 @@
+namespace GarmentFactoryView
+{
+ partial class FormReportShops
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ buttonSaveToExcel = new Button();
+ dataGridView = new DataGridView();
+ ColumnShop = new DataGridViewTextBoxColumn();
+ ColumnTextile = new DataGridViewTextBoxColumn();
+ ColumnCount = new DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // buttonSaveToExcel
+ //
+ buttonSaveToExcel.Location = new Point(12, 9);
+ buttonSaveToExcel.Name = "buttonSaveToExcel";
+ buttonSaveToExcel.Size = new Size(169, 29);
+ buttonSaveToExcel.TabIndex = 3;
+ buttonSaveToExcel.Text = "Сохранить в Excel";
+ buttonSaveToExcel.UseVisualStyleBackColor = true;
+ buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
+ //
+ // dataGridView
+ //
+ dataGridView.AllowUserToAddRows = false;
+ dataGridView.AllowUserToDeleteRows = false;
+ dataGridView.AllowUserToOrderColumns = true;
+ dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnTextile, ColumnCount });
+ dataGridView.Dock = DockStyle.Bottom;
+ dataGridView.Location = new Point(0, 47);
+ dataGridView.Name = "dataGridView";
+ dataGridView.ReadOnly = true;
+ dataGridView.RowHeadersWidth = 51;
+ dataGridView.RowTemplate.Height = 29;
+ dataGridView.Size = new Size(598, 403);
+ dataGridView.TabIndex = 2;
+ //
+ // ColumnShop
+ //
+ ColumnShop.FillWeight = 130F;
+ ColumnShop.HeaderText = "Магазин";
+ ColumnShop.MinimumWidth = 6;
+ ColumnShop.Name = "ColumnShop";
+ ColumnShop.ReadOnly = true;
+ //
+ // ColumnTextile
+ //
+ ColumnTextile.FillWeight = 140F;
+ ColumnTextile.HeaderText = "Текстиль";
+ ColumnTextile.MinimumWidth = 6;
+ ColumnTextile.Name = "ColumnTextile";
+ ColumnTextile.ReadOnly = true;
+ //
+ // ColumnCount
+ //
+ ColumnCount.FillWeight = 90F;
+ ColumnCount.HeaderText = "Количество";
+ ColumnCount.MinimumWidth = 6;
+ ColumnCount.Name = "ColumnCount";
+ ColumnCount.ReadOnly = true;
+ //
+ // FormReportShops
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(598, 450);
+ Controls.Add(buttonSaveToExcel);
+ Controls.Add(dataGridView);
+ Name = "FormReportShops";
+ Text = "Загруженность магазинов";
+ Load += FormReportShops_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private Button buttonSaveToExcel;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn ColumnShop;
+ private DataGridViewTextBoxColumn ColumnTextile;
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/GarmentFactory/FormReportShops.cs b/GarmentFactory/FormReportShops.cs
new file mode 100644
index 0000000..6429159
--- /dev/null
+++ b/GarmentFactory/FormReportShops.cs
@@ -0,0 +1,78 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GarmentFactoryView
+{
+ public partial class FormReportShops : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+
+ public FormReportShops(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormReportShops_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var shops = _logic.GetShops();
+ if (shops != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var shop in shops)
+ {
+ dataGridView.Rows.Add(new object[] { shop.ShopName, "", "" });
+ foreach (var textile in shop.Textiles)
+ {
+ dataGridView.Rows.Add(new object[] { "", textile.Item1, textile.Item2 });
+ }
+ dataGridView.Rows.Add(new object[] { "Итого", "", shop.TotalCount });
+ dataGridView.Rows.Add(Array.Empty