Устранение конфликта.

BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshop.csproj

@@ -9,13 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.ReportingServices.ReportViewerControl.Winforms" Version="140.340.80" />
+    <PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
+    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.17" />
   </ItemGroup>
 
   <ItemGroup>

BlacksmithWorkshop/BlacksmithWorkshop/FormAddManufacture.Designer.cs

@@ -1,151 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormAddManufacture
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelIceCream = new System.Windows.Forms.Label();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.labelShop = new System.Windows.Forms.Label();
-            this.comboBoxManufacture = new System.Windows.Forms.ComboBox();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.SuspendLayout();
-            // 
-            // labelIceCream
-            // 
-            this.labelIceCream.AutoSize = true;
-            this.labelIceCream.Location = new System.Drawing.Point(28, 58);
-            this.labelIceCream.Name = "labelIceCream";
-            this.labelIceCream.Size = new System.Drawing.Size(56, 15);
-            this.labelIceCream.TabIndex = 0;
-            this.labelIceCream.Text = "Изделие:";
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(28, 91);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(75, 15);
-            this.labelCount.TabIndex = 1;
-            this.labelCount.Text = "Количество:";
-            // 
-            // labelShop
-            // 
-            this.labelShop.AutoSize = true;
-            this.labelShop.Location = new System.Drawing.Point(28, 23);
-            this.labelShop.Name = "labelShop";
-            this.labelShop.Size = new System.Drawing.Size(57, 15);
-            this.labelShop.TabIndex = 2;
-            this.labelShop.Text = "Магазин:";
-            // 
-            // comboBoxManufacture
-            // 
-            this.comboBoxManufacture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxManufacture.FormattingEnabled = true;
-            this.comboBoxManufacture.Location = new System.Drawing.Point(149, 55);
-            this.comboBoxManufacture.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxManufacture.Name = "comboBoxManufacture";
-            this.comboBoxManufacture.Size = new System.Drawing.Size(230, 23);
-            this.comboBoxManufacture.TabIndex = 3;
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(149, 88);
-            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(230, 23);
-            this.textBoxCount.TabIndex = 4;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(209, 123);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(82, 22);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(297, 123);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(82, 22);
-            this.buttonCancel.TabIndex = 7;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(149, 23);
-            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(230, 23);
-            this.comboBoxShop.TabIndex = 8;
-            // 
-            // FormAddManufacture
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(394, 159);
-            this.Controls.Add(this.comboBoxShop);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxManufacture);
-            this.Controls.Add(this.labelShop);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.labelIceCream);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormAddManufacture";
-            this.Text = "Пополнение магазина";
-            this.Load += new System.EventHandler(this.FormAddManufacture_Load_1);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelIceCream;
-        private Label labelCount;
-        private Label labelShop;
-        private ComboBox comboBoxManufacture;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private ComboBox comboBoxShop;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormAddManufacture.cs

@@ -1,128 +0,0 @@
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-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 BlacksmithWorkshop
-{
-    public partial class FormAddManufacture : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IManufactureLogic _logicI;
-        private readonly IShopLogic _logicS;
-
-        public FormAddManufacture(ILogger<FormAddManufacture> logger, IManufactureLogic logicI, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicI = logicI;
-            _logicS = logicS;
-        }
-
-        private void FormAddManufacture_Load_1(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка списка изделий для пополнения");
-
-            try
-            {
-                var list = _logicI.ReadList(null);
-
-                if (list != null)
-                {
-                    comboBoxManufacture.DisplayMember = "ManufactureName";
-                    comboBoxManufacture.ValueMember = "Id";
-                    comboBoxManufacture.DataSource = list;
-                    comboBoxManufacture.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка изделий");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-            _logger.LogInformation("Загрузка списка магазинов для пополнения");
-            try
-            {
-                var list = _logicS.ReadList(null);
-
-                if (list != null)
-                {
-                    comboBoxShop.DisplayMember = "ShopName";
-                    comboBoxShop.ValueMember = "Id";
-                    comboBoxShop.DataSource = list;
-                    comboBoxShop.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxManufacture.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _logger.LogInformation("Пополнение магазина");
-
-            try
-            {
-                var operationResult = _logicS.AddManufacture(new ShopSearchModel
-                {
-                    Id = Convert.ToInt32(comboBoxShop.SelectedValue)
-                },
-
-                _logicI.ReadElement(new ManufactureSearchModel()
-                {
-                    Id = Convert.ToInt32(comboBoxManufacture.SelectedValue)
-                })!, 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();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs

@@ -38,9 +38,10 @@
             this.toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.workPieceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.manufactureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.shopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.addManufactureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.buttonSellManufacture = new System.Windows.Forms.Button();
+            this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.workPiecesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.workPieceManufacturesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.menuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -48,16 +49,16 @@
             // dataGridView
             // 
             this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(11, 36);
+            this.dataGridView.Location = new System.Drawing.Point(12, 36);
             this.dataGridView.Name = "dataGridView";
             this.dataGridView.RowHeadersWidth = 51;
             this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(937, 448);
+            this.dataGridView.Size = new System.Drawing.Size(937, 402);
             this.dataGridView.TabIndex = 0;
             // 
             // buttonCreateOrder
             // 
-            this.buttonCreateOrder.Location = new System.Drawing.Point(1014, 67);
+            this.buttonCreateOrder.Location = new System.Drawing.Point(1014, 66);
             this.buttonCreateOrder.Name = "buttonCreateOrder";
             this.buttonCreateOrder.Size = new System.Drawing.Size(235, 29);
             this.buttonCreateOrder.TabIndex = 1;
@@ -109,11 +110,11 @@
             // 
             this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem});
+            this.toolStripMenuItem,
+            this.reportsToolStripMenuItem});
             this.menuStrip.Location = new System.Drawing.Point(0, 0);
             this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3);
-            this.menuStrip.Size = new System.Drawing.Size(1297, 30);
+            this.menuStrip.Size = new System.Drawing.Size(1297, 28);
             this.menuStrip.TabIndex = 6;
             this.menuStrip.Text = "menuStrip1";
             // 
@@ -121,9 +122,7 @@
             // 
             this.toolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.workPieceToolStripMenuItem,
-            this.manufactureToolStripMenuItem,
-            this.shopToolStripMenuItem,
-            this.addManufactureToolStripMenuItem});
+            this.manufactureToolStripMenuItem});
             this.toolStripMenuItem.Name = "toolStripMenuItem";
             this.toolStripMenuItem.Size = new System.Drawing.Size(117, 24);
             this.toolStripMenuItem.Text = "Справочники";
@@ -131,47 +130,53 @@
             // workPieceToolStripMenuItem
             // 
             this.workPieceToolStripMenuItem.Name = "workPieceToolStripMenuItem";
-            this.workPieceToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
+            this.workPieceToolStripMenuItem.Size = new System.Drawing.Size(162, 26);
             this.workPieceToolStripMenuItem.Text = "Заготовки";
             this.workPieceToolStripMenuItem.Click += new System.EventHandler(this.WorkPieceToolStripMenuItem_Click);
             // 
             // manufactureToolStripMenuItem
             // 
             this.manufactureToolStripMenuItem.Name = "manufactureToolStripMenuItem";
-            this.manufactureToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
+            this.manufactureToolStripMenuItem.Size = new System.Drawing.Size(162, 26);
             this.manufactureToolStripMenuItem.Text = "Изделия";
             this.manufactureToolStripMenuItem.Click += new System.EventHandler(this.ManufactureToolStripMenuItem_Click);
             // 
-            // shopToolStripMenuItem
+            // reportsToolStripMenuItem
             // 
-            this.shopToolStripMenuItem.Name = "shopToolStripMenuItem";
-            this.shopToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
-            this.shopToolStripMenuItem.Text = "Магазины";
-            this.shopToolStripMenuItem.Click += new System.EventHandler(this.ShopToolStripMenuItem_Click);
+            this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.workPiecesToolStripMenuItem,
+            this.workPieceManufacturesToolStripMenuItem,
+            this.ordersToolStripMenuItem});
+            this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
+            this.reportsToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+            this.reportsToolStripMenuItem.Text = "Отчёты";
             // 
-            // addManufactureToolStripMenuItem
+            // workPiecesToolStripMenuItem
             // 
-            this.addManufactureToolStripMenuItem.Name = "addManufactureToolStripMenuItem";
-            this.addManufactureToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
-            this.addManufactureToolStripMenuItem.Text = "Пополнение магазина";
-            this.addManufactureToolStripMenuItem.Click += new System.EventHandler(this.AddManufactureToolStripMenuItem_Click);
+            this.workPiecesToolStripMenuItem.Name = "workPiecesToolStripMenuItem";
+            this.workPiecesToolStripMenuItem.Size = new System.Drawing.Size(256, 26);
+            this.workPiecesToolStripMenuItem.Text = "Список заготовок";
+            this.workPiecesToolStripMenuItem.Click += new System.EventHandler(this.WorkPiecesToolStripMenuItem_Click);
             // 
-            // buttonSellManufacture
+            // workPieceManufacturesToolStripMenuItem
             // 
-            this.buttonSellManufacture.Location = new System.Drawing.Point(1014, 440);
-            this.buttonSellManufacture.Name = "buttonSellManufacture";
-            this.buttonSellManufacture.Size = new System.Drawing.Size(233, 29);
-            this.buttonSellManufacture.TabIndex = 7;
-            this.buttonSellManufacture.Text = "Продажа изделий";
-            this.buttonSellManufacture.UseVisualStyleBackColor = true;
-            this.buttonSellManufacture.Click += new System.EventHandler(this.ButtonSellManufacture_Click);
+            this.workPieceManufacturesToolStripMenuItem.Name = "workPieceManufacturesToolStripMenuItem";
+            this.workPieceManufacturesToolStripMenuItem.Size = new System.Drawing.Size(256, 26);
+            this.workPieceManufacturesToolStripMenuItem.Text = "Заготовки по изделиям";
+            this.workPieceManufacturesToolStripMenuItem.Click += new System.EventHandler(this.WorkPieceManufacturesToolStripMenuItem_Click);
+            // 
+            // ordersToolStripMenuItem
+            // 
+            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(256, 26);
+            this.ordersToolStripMenuItem.Text = "Список заказов";
+            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
             // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1297, 496);
-            this.Controls.Add(this.buttonSellManufacture);
+            this.ClientSize = new System.Drawing.Size(1297, 450);
             this.Controls.Add(this.buttonRef);
             this.Controls.Add(this.buttonIssuedOrder);
             this.Controls.Add(this.buttonOrderReady);
@@ -203,8 +208,9 @@
         private ToolStripMenuItem toolStripMenuItem;
         private ToolStripMenuItem workPieceToolStripMenuItem;
         private ToolStripMenuItem manufactureToolStripMenuItem;
-        private ToolStripMenuItem shopToolStripMenuItem;
-        private ToolStripMenuItem addManufactureToolStripMenuItem;
-        private Button buttonSellManufacture;
+        private ToolStripMenuItem reportsToolStripMenuItem;
+        private ToolStripMenuItem workPiecesToolStripMenuItem;
+        private ToolStripMenuItem workPieceManufacturesToolStripMenuItem;
+        private ToolStripMenuItem ordersToolStripMenuItem;
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs

@@ -1,4 +1,5 @@
-using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
 using BlacksmithWorkshopDataModels.Enums;
 using Microsoft.Extensions.Logging;
@@ -20,12 +21,15 @@ namespace BlacksmithWorkshop
 
         private readonly IOrderLogic _orderLogic;
 
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
+        private readonly IReportLogic _reportLogic;
+
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
         {
             InitializeComponent();
 
             _logger = logger;
             _orderLogic = orderLogic;
+            _reportLogic= reportLogic;
         }
 
         private void FormMain_Load(object sender, EventArgs e)
@@ -45,6 +49,7 @@ namespace BlacksmithWorkshop
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["ManufactureId"].Visible = false;
+                    dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
 
                 _logger.LogInformation("Загрузка заказов");
@@ -177,13 +182,38 @@ namespace BlacksmithWorkshop
             }
         }
 
-        private void ButtonSellIceCream_Click(object sender, EventArgs e)
+        private void WorkPiecesToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellManufacture));
-            if (service is FormSellManufacture form)
+            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                _reportLogic.SaveManufacturesToWordFile(new ReportBindingModel
+                {
+                    FileName = dialog.FileName
+                });
+
+                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+
+        private void WorkPieceManufacturesToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportManufactureWorkPieces));
+
+            if (service is FormReportManufactureWorkPieces form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+
+            if (service is FormReportOrders form)
             {
                 form.ShowDialog();
-                LoadData();
             }
         }
 
@@ -191,36 +221,5 @@ namespace BlacksmithWorkshop
         {
             LoadData();
         }
-
-        private void ButtonSellManufacture_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellManufacture));
-            if (service is FormSellManufacture form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
-        }
-
-        private void ShopToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void AddManufactureToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormAddManufacture));
-
-            if (service is FormAddManufacture form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
-        }
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.resx

@@ -60,7 +60,4 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>63</value>
-  </metadata>
 </root>

BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs

@@ -0,0 +1,108 @@
+namespace BlacksmithWorkshop
+{
+    partial class FormReportManufactureWorkPieces
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.buttonSaveToExcel = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumWorkPiece = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnManufacture = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // buttonSaveToExcel
+            // 
+            this.buttonSaveToExcel.Location = new System.Drawing.Point(33, 25);
+            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+            this.buttonSaveToExcel.Size = new System.Drawing.Size(256, 29);
+            this.buttonSaveToExcel.TabIndex = 0;
+            this.buttonSaveToExcel.Text = "Сохранить в Excel";
+            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumWorkPiece,
+            this.ColumnManufacture,
+            this.ColumnCount});
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.dataGridView.Location = new System.Drawing.Point(0, 73);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(800, 395);
+            this.dataGridView.TabIndex = 1;
+            // 
+            // ColumWorkPiece
+            // 
+            this.ColumWorkPiece.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumWorkPiece.HeaderText = "Заготовка";
+            this.ColumWorkPiece.MinimumWidth = 6;
+            this.ColumWorkPiece.Name = "ColumWorkPiece";
+            // 
+            // ColumnManufacture
+            // 
+            this.ColumnManufacture.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnManufacture.HeaderText = "Изделие";
+            this.ColumnManufacture.MinimumWidth = 6;
+            this.ColumnManufacture.Name = "ColumnManufacture";
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.MinimumWidth = 6;
+            this.ColumnCount.Name = "ColumnCount";
+            // 
+            // FormReportManufactureWorkPieces
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 468);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonSaveToExcel);
+            this.Name = "FormReportManufactureWorkPieces";
+            this.Text = "Заготовки по изделиям";
+            this.Load += new System.EventHandler(this.FormReportManufactureWorkPieces_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Button buttonSaveToExcel;
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn ColumWorkPiece;
+        private DataGridViewTextBoxColumn ColumnManufacture;
+        private DataGridViewTextBoxColumn ColumnCount;
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs

@@ -0,0 +1,94 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.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 BlacksmithWorkshop
+{
+    public partial class FormReportManufactureWorkPieces : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
+
+        public FormReportManufactureWorkPieces(ILogger<FormReportManufactureWorkPieces> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormReportManufactureWorkPieces_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                var dict = _logic.GetManufactureWorkPiece();
+
+                if (dict != null)
+                {
+                    dataGridView.Rows.Clear();
+
+                    foreach (var elem in dict)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.ManufactureName, "", "" });
+
+                        foreach (var listElem in elem.WorkPieces)
+                        {
+                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+                        }
+
+                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+                        dataGridView.Rows.Add(Array.Empty<object>());
+                    }
+                }
+
+                _logger.LogInformation("Загрузка списка изделий по заготовкам");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка изделий по заготовкам");
+
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
+        {
+            //фильтрация файлов для диалогового окна
+            using var dialog = new SaveFileDialog 
+            { 
+                Filter = "xlsx|*.xlsx" 
+            };
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveManufactureWorkPieceToExcelFile(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);
+                }
+            }
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.resx

@@ -57,4 +57,22 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ColumWorkPiece.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnManufacture.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumWorkPiece.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnManufacture.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs

@@ -0,0 +1,131 @@
+namespace BlacksmithWorkshop
+{
+    partial class FormReportOrders
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        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.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
+            this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
+            this.panel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel
+            // 
+            this.panel.Controls.Add(this.buttonToPdf);
+            this.panel.Controls.Add(this.buttonMake);
+            this.panel.Controls.Add(this.label2);
+            this.panel.Controls.Add(this.label1);
+            this.panel.Controls.Add(this.dateTimePickerTo);
+            this.panel.Controls.Add(this.dateTimePickerFrom);
+            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(1112, 51);
+            this.panel.TabIndex = 0;
+            // 
+            // buttonToPdf
+            // 
+            this.buttonToPdf.Location = new System.Drawing.Point(894, 10);
+            this.buttonToPdf.Name = "buttonToPdf";
+            this.buttonToPdf.Size = new System.Drawing.Size(157, 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(612, 10);
+            this.buttonMake.Name = "buttonMake";
+            this.buttonMake.Size = new System.Drawing.Size(157, 29);
+            this.buttonMake.TabIndex = 4;
+            this.buttonMake.Text = "Сформировать";
+            this.buttonMake.UseVisualStyleBackColor = true;
+            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(263, 17);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(27, 20);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "по";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(25, 17);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(18, 20);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "С";
+            // 
+            // dateTimePickerTo
+            // 
+            this.dateTimePickerTo.Location = new System.Drawing.Point(313, 12);
+            this.dateTimePickerTo.Name = "dateTimePickerTo";
+            this.dateTimePickerTo.Size = new System.Drawing.Size(169, 27);
+            this.dateTimePickerTo.TabIndex = 1;
+            // 
+            // dateTimePickerFrom
+            // 
+            this.dateTimePickerFrom.Location = new System.Drawing.Point(65, 12);
+            this.dateTimePickerFrom.Name = "dateTimePickerFrom";
+            this.dateTimePickerFrom.Size = new System.Drawing.Size(176, 27);
+            this.dateTimePickerFrom.TabIndex = 0;
+            // 
+            // FormReportOrders
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1112, 450);
+            this.Controls.Add(this.panel);
+            this.Name = "FormReportOrders";
+            this.Text = "Заказы";
+            this.panel.ResumeLayout(false);
+            this.panel.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Panel panel;
+        private Button buttonMake;
+        private Label label2;
+        private Label label1;
+        private DateTimePicker dateTimePickerTo;
+        private DateTimePicker dateTimePickerFrom;
+        private Button buttonToPdf;
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs

@@ -0,0 +1,122 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.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 BlacksmithWorkshop
+{
+    //форма с отчётом
+    public partial class FormReportOrders : Form
+    {
+        private readonly ReportViewer reportViewer;
+
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
+
+        public FormReportOrders(ILogger<FormReportOrders> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+
+            _logger = logger;
+            _logic = logic;
+
+            reportViewer = new ReportViewer
+            {
+                Dock = DockStyle.Fill
+            };
+
+            reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\Programmist73\\Desktop\\Практика\\2-й курс\\4-й семестр\\PIbd-21_Eliseev_E.E._BlacksmithWorkshop\\BlacksmithWorkshop\\BlacksmithWorkshop\\ReportOrders.rdlc", FileMode.Open));
+
+            Controls.Clear();
+            Controls.Add(reportViewer);
+            Controls.Add(panel);
+        }
+
+        private void ButtonMake_Click(object sender, EventArgs e)
+        {
+            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+            {
+                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                
+                return;
+            }
+            try
+            {
+                var dataSource = _logic.GetOrders(new ReportBindingModel
+                {
+                    DateFrom = dateTimePickerFrom.Value,
+                    DateTo = dateTimePickerTo.Value
+                });
+
+                var source = new ReportDataSource("DataSetOrders", dataSource);
+
+                reportViewer.LocalReport.DataSources.Clear();
+                reportViewer.LocalReport.DataSources.Add(source);
+
+                var parameters = new[] { new ReportParameter("ReportParameterPeriod", 
+                    $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
+                
+                reportViewer.LocalReport.SetParameters(parameters);
+                reportViewer.RefreshReport();
+
+                _logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), 
+                    dateTimePickerTo.Value.ToShortDateString());
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonToPdf_Click(object sender, EventArgs e)
+        {
+            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+            {
+                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+               
+                return;
+            }
+
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "pdf|*.pdf"
+            };
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveOrdersToPdfFile(new ReportBindingModel
+                    {
+                        FileName = dialog.FileName,
+                        DateFrom = dateTimePickerFrom.Value,
+                        DateTo = dateTimePickerTo.Value
+                    });
+
+                    _logger.LogInformation("Сохранение списка заказов на период {From}-{To}", 
+                        dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+
+                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
+                   
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.Designer.cs

@@ -1,121 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormSellManufacture
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelManufacture = new System.Windows.Forms.Label();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.comboBoxManufacture = new System.Windows.Forms.ComboBox();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelManufacture
-            // 
-            this.labelManufacture.AutoSize = true;
-            this.labelManufacture.Location = new System.Drawing.Point(32, 32);
-            this.labelManufacture.Name = "labelManufacture";
-            this.labelManufacture.Size = new System.Drawing.Size(71, 20);
-            this.labelManufacture.TabIndex = 0;
-            this.labelManufacture.Text = "Изделие:";
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(34, 85);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(93, 20);
-            this.labelCount.TabIndex = 1;
-            this.labelCount.Text = "Количество:";
-            // 
-            // comboBoxManufacture
-            // 
-            this.comboBoxManufacture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxManufacture.FormattingEnabled = true;
-            this.comboBoxManufacture.Location = new System.Drawing.Point(170, 32);
-            this.comboBoxManufacture.Name = "comboBoxManufacture";
-            this.comboBoxManufacture.Size = new System.Drawing.Size(262, 28);
-            this.comboBoxManufacture.TabIndex = 3;
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(170, 85);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(262, 27);
-            this.textBoxCount.TabIndex = 4;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(239, 141);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(94, 29);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(339, 141);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
-            this.buttonCancel.TabIndex = 7;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormSellManufacture
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(440, 180);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxManufacture);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.labelManufacture);
-            this.Name = "FormSellManufacture";
-            this.Text = "Продажа изделий";
-            this.Load += new System.EventHandler(this.FormSellManufacture_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelManufacture;
-        private Label labelCount;
-        private ComboBox comboBoxManufacture;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.cs

@@ -1,100 +0,0 @@
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-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 BlacksmithWorkshop
-{
-    public partial class FormSellManufacture : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IManufactureLogic _logicI;
-
-        private readonly IShopLogic _logicS;
-
-        public FormSellManufacture(ILogger<FormAddManufacture> logger, IManufactureLogic logicI, IShopLogic logicS)
-        {
-            InitializeComponent();
-
-            _logger = logger;
-            _logicI = logicI;
-            _logicS = logicS;
-        }
-
-        private void FormSellManufacture_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка списка изделий для продажи");
-
-            try
-            {
-                var list = _logicI.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxManufacture.DisplayMember = "ManufactureName";
-                    comboBoxManufacture.ValueMember = "Id";
-                    comboBoxManufacture.DataSource = list;
-                    comboBoxManufacture.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка изделий");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxManufacture.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _logger.LogInformation("Продажа изделия");
-
-            try
-            {
-                var operationResult = _logicS.SellManufatures(_logicI.ReadElement(new ManufactureSearchModel()
-                {
-                    Id = Convert.ToInt32(comboBoxManufacture.SelectedValue)
-                })!, 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();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs

@@ -1,229 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelName = new System.Windows.Forms.Label();
-            this.labelAddress = new System.Windows.Forms.Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.textBoxAddress = new System.Windows.Forms.TextBox();
-            this.groupBoxIceCreams = new System.Windows.Forms.GroupBox();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnManufactureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.labelDate = new System.Windows.Forms.Label();
-            this.dateTimePickerDate = new System.Windows.Forms.DateTimePicker();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
-            this.groupBoxIceCreams.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(21, 13);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(80, 20);
-            this.labelName.TabIndex = 0;
-            this.labelName.Text = "Название:";
-            // 
-            // labelAddress
-            // 
-            this.labelAddress.AutoSize = true;
-            this.labelAddress.Location = new System.Drawing.Point(304, 12);
-            this.labelAddress.Name = "labelAddress";
-            this.labelAddress.Size = new System.Drawing.Size(54, 20);
-            this.labelAddress.TabIndex = 1;
-            this.labelAddress.Text = "Адрес:";
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(107, 10);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(157, 27);
-            this.textBoxName.TabIndex = 2;
-            // 
-            // textBoxAddress
-            // 
-            this.textBoxAddress.Location = new System.Drawing.Point(364, 9);
-            this.textBoxAddress.Name = "textBoxAddress";
-            this.textBoxAddress.Size = new System.Drawing.Size(157, 27);
-            this.textBoxAddress.TabIndex = 3;
-            // 
-            // groupBoxIceCreams
-            // 
-            this.groupBoxIceCreams.Controls.Add(this.dataGridView);
-            this.groupBoxIceCreams.Location = new System.Drawing.Point(14, 94);
-            this.groupBoxIceCreams.Name = "groupBoxIceCreams";
-            this.groupBoxIceCreams.Size = new System.Drawing.Size(823, 275);
-            this.groupBoxIceCreams.TabIndex = 4;
-            this.groupBoxIceCreams.TabStop = false;
-            this.groupBoxIceCreams.Text = "Изделия";
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ID,
-            this.ColumnManufactureName,
-            this.ColumnCount});
-            this.dataGridView.Location = new System.Drawing.Point(6, 27);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(810, 243);
-            this.dataGridView.TabIndex = 0;
-            // 
-            // ID
-            // 
-            this.ID.HeaderText = "ID";
-            this.ID.MinimumWidth = 6;
-            this.ID.Name = "ID";
-            this.ID.Visible = false;
-            this.ID.Width = 125;
-            // 
-            // ColumnManufactureName
-            // 
-            this.ColumnManufactureName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ColumnManufactureName.HeaderText = "Изделие";
-            this.ColumnManufactureName.MinimumWidth = 6;
-            this.ColumnManufactureName.Name = "ColumnManufactureName";
-            this.ColumnManufactureName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.Width = 125;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(470, 381);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(155, 29);
-            this.buttonSave.TabIndex = 5;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(662, 381);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(155, 29);
-            this.buttonCancel.TabIndex = 6;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // labelDate
-            // 
-            this.labelDate.AutoSize = true;
-            this.labelDate.Location = new System.Drawing.Point(562, 12);
-            this.labelDate.Name = "labelDate";
-            this.labelDate.Size = new System.Drawing.Size(113, 20);
-            this.labelDate.TabIndex = 7;
-            this.labelDate.Text = "Дата открытия:";
-            // 
-            // dateTimePickerDate
-            // 
-            this.dateTimePickerDate.Location = new System.Drawing.Point(681, 9);
-            this.dateTimePickerDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.dateTimePickerDate.Name = "dateTimePickerDate";
-            this.dateTimePickerDate.Size = new System.Drawing.Size(145, 27);
-            this.dateTimePickerDate.TabIndex = 9;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(21, 55);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(173, 20);
-            this.labelCount.TabIndex = 10;
-            this.labelCount.Text = "Вместимость магазина:";
-            // 
-            // numericUpDownCount
-            // 
-            this.numericUpDownCount.Location = new System.Drawing.Point(200, 53);
-            this.numericUpDownCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.numericUpDownCount.Name = "numericUpDownCount";
-            this.numericUpDownCount.Size = new System.Drawing.Size(145, 27);
-            this.numericUpDownCount.TabIndex = 11;
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(850, 425);
-            this.Controls.Add(this.numericUpDownCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.dateTimePickerDate);
-            this.Controls.Add(this.labelDate);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.groupBoxIceCreams);
-            this.Controls.Add(this.textBoxAddress);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelAddress);
-            this.Controls.Add(this.labelName);
-            this.Name = "FormShop";
-            this.Text = "Магазин";
-            this.Load += new System.EventHandler(this.FormShop_Load);
-            this.groupBoxIceCreams.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelName;
-        private Label labelAddress;
-        private TextBox textBoxName;
-        private TextBox textBoxAddress;
-        private GroupBox groupBoxIceCreams;
-        private DataGridView dataGridView;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label labelDate;
-        private DateTimePicker dateTimePickerDate;
-        private DataGridViewTextBoxColumn ID;
-        private DataGridViewTextBoxColumn ColumnManufactureName;
-        private DataGridViewTextBoxColumn ColumnCount;
-        private Label labelCount;
-        private NumericUpDown numericUpDownCount;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs

@@ -1,138 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopDataModels.Models;
-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 BlacksmithWorkshop
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IShopLogic _logic;
-
-        private int? _id;
-
-        private Dictionary<int, (IManufactureModel, int)> _shopManufactures;
-
-        public int Id { set { _id = value; } }
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-
-            _logger = logger;
-            _logic = logic;
-            _shopManufactures = new Dictionary<int, (IManufactureModel, int)>();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка магазина");
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel
-                    {
-                        Id = _id.Value
-                    });
-
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ShopName;
-                        textBoxAddress.Text = view.Address.ToString();
-                        dateTimePickerDate.Value = view.DateOpen;
-                        numericUpDownCount.Value = view.MaxCountManufactures;
-                        _shopManufactures = view.ShopManufactures ?? new Dictionary<int, (IManufactureModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка изделий в магазине");
-            try
-            {
-                if (_shopManufactures != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var element in _shopManufactures)
-                    {
-                        dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.ManufactureName, element.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий в магазине");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAddress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Address = textBoxAddress.Text,
-                    DateOpen = dateTimePickerDate.Value.Date,
-                    MaxCountManufactures = (int)numericUpDownCount.Value
-                };
-
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                
-                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();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs

@@ -1,121 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonRef = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(10, 9);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(444, 320);
-            this.dataGridView.TabIndex = 1;
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(465, 37);
-            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(133, 22);
-            this.buttonAdd.TabIndex = 2;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(465, 119);
-            this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(133, 22);
-            this.buttonUpd.TabIndex = 3;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(465, 197);
-            this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(133, 22);
-            this.buttonDel.TabIndex = 4;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(465, 274);
-            this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(133, 22);
-            this.buttonRef.TabIndex = 5;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(610, 338);
-            this.Controls.Add(this.buttonRef);
-            this.Controls.Add(this.buttonDel);
-            this.Controls.Add(this.buttonUpd);
-            this.Controls.Add(this.buttonAdd);
-            this.Controls.Add(this.dataGridView);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormShops";
-            this.Text = "Магазины";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Button buttonAdd;
-        private Button buttonUpd;
-        private Button buttonDel;
-        private Button buttonRef;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs

@@ -1,119 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopDataModels.Models;
-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 BlacksmithWorkshop
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-
-        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ShopManufactures"].Visible = false;
-                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void ButtonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления изделия");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

BlacksmithWorkshop/BlacksmithWorkshop/Program.cs

@@ -1,4 +1,6 @@
 using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopBusinessLogic.OfficePackage;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.Implements;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
 using BlacksmithWorkshopContracts.StoragesContracts;
 using BlacksmithWorkshopDatabaseImplement.Implements;
@@ -40,12 +42,15 @@ namespace BlacksmithWorkshop
             services.AddTransient<IWorkPieceStorage, WorkPieceStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IManufactureStorage, ManufactureStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
 
             services.AddTransient<IWorkPieceLogic, WorkPieceLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IManufactureLogic, ManufactureLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormWorkPiece>();
@@ -54,10 +59,8 @@ namespace BlacksmithWorkshop
             services.AddTransient<FormManufacture>();
             services.AddTransient<FormManufactures>();
             services.AddTransient<FormManufactureWorkPiece>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormAddManufacture>();
-            services.AddTransient<FormSellManufacture>();
+            services.AddTransient<FormReportManufactureWorkPieces>();
+            services.AddTransient<FormReportOrders>();
         }
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc

@@ -0,0 +1,599 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
+  <AutoRefresh>0</AutoRefresh>
+  <DataSources>
+    <DataSource Name="BlacksmithWorkshopContractsViewModels">
+      <ConnectionProperties>
+        <DataProvider>System.Data.DataSet</DataProvider>
+        <ConnectString>/* Local Connection */</ConnectString>
+      </ConnectionProperties>
+      <rd:DataSourceID>10791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
+    </DataSource>
+  </DataSources>
+  <DataSets>
+    <DataSet Name="DataSetOrders">
+      <Query>
+        <DataSourceName>BlacksmithWorkshopContractsViewModels</DataSourceName>
+        <CommandText>/* Local Query */</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="Id">
+          <DataField>Id</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="DateCreate">
+          <DataField>DateCreate</DataField>
+          <rd:TypeName>System.DateTime</rd:TypeName>
+        </Field>
+        <Field Name="ManufactureName">
+          <DataField>ManufactureName</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Sum">
+          <DataField>Sum</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
+        <Field Name="OrderStatus">
+          <DataField>OrderStatus</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+      </Fields>
+      <rd:DataSetInfo>
+        <rd:DataSetName>BlacksmithWorkshopContracts.ViewModels</rd:DataSetName>
+        <rd:TableName>ReportOrdersViewModel</rd:TableName>
+        <rd:ObjectDataSourceType>BlacksmithWorkshopContracts.ViewModels.ReportOrdersViewModel, BlacksmithWorkshopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
+      </rd:DataSetInfo>
+    </DataSet>
+  </DataSets>
+  <ReportSections>
+    <ReportSection>
+      <Body>
+        <ReportItems>
+          <Textbox Name="ReportParameterPeriod">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
+                    <Style>
+                      <FontSize>14pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Center</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
+            <Top>1cm</Top>
+            <Height>1cm</Height>
+            <Width>21cm</Width>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <VerticalAlign>Middle</VerticalAlign>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Textbox Name="TextboxTitle">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>Заказы</Value>
+                    <Style>
+                      <FontSize>16pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Center</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Height>1cm</Height>
+            <Width>21cm</Width>
+            <ZIndex>1</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <VerticalAlign>Middle</VerticalAlign>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Tablix Name="Tablix1">
+            <TablixBody>
+              <TablixColumns>
+                <TablixColumn>
+                  <Width>2.5cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3.21438cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>8.23317cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3.21438cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>2.5cm</Width>
+                </TablixColumn>
+              </TablixColumns>
+              <TablixRows>
+                <TablixRow>
+                  <Height>0.6cm</Height>
+                  <TablixCells>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox5">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Номер</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox5</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox1">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Дата создания</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox1</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox3">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Изделие</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox3</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+					<TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox7">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Сумма</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox7</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox2">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Статус заказа</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox2</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                  </TablixCells>
+                </TablixRow>
+                <TablixRow>
+                  <Height>0.6cm</Height>
+                  <TablixCells>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Id">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!Id.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Id</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="DateCreate">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!DateCreate.Value</Value>
+                                  <Style>
+                                    <Format>d</Format>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>DateCreate</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="ManufactureName">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!ManufactureName.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>ManufactureName</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Sum">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!Sum.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Sum</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+					<TablixCell>
+                      <CellContents>
+                        <Textbox Name="OrderStatus">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!OrderStatus.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>OrderStatus</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                  </TablixCells>
+                </TablixRow>
+              </TablixRows>
+            </TablixBody>
+            <TablixColumnHierarchy>
+              <TablixMembers>
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+              </TablixMembers>
+            </TablixColumnHierarchy>
+            <TablixRowHierarchy>
+              <TablixMembers>
+                <TablixMember>
+                  <KeepWithGroup>After</KeepWithGroup>
+                </TablixMember>
+                <TablixMember>
+                  <Group Name="Подробности" />
+                </TablixMember>
+              </TablixMembers>
+            </TablixRowHierarchy>
+            <DataSetName>DataSetOrders</DataSetName>
+            <Top>2.48391cm</Top>
+            <Left>0.55245cm</Left>
+            <Height>1.2cm</Height>
+            <Width>19.66193cm</Width>
+            <ZIndex>2</ZIndex>
+            <Style>
+              <Border>
+                <Style>Double</Style>
+              </Border>
+            </Style>
+          </Tablix>
+          <Textbox Name="TextboxTotalSum">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>Итого:</Value>
+                    <Style>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Top>4cm</Top>
+            <Left>15.21438cm</Left>
+            <Height>0.6cm</Height>
+            <Width>2.5cm</Width>
+            <ZIndex>3</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Textbox Name="SumTotal">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=Sum(Fields!Sum.Value, "DataSetOrders")</Value>
+                    <Style>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Top>4cm</Top>
+            <Left>17.71438cm</Left>
+            <Height>0.6cm</Height>
+            <Width>2.5cm</Width>
+            <ZIndex>4</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+        </ReportItems>
+        <Height>5.72875cm</Height>
+        <Style />
+      </Body>
+      <Width>21cm</Width>
+      <Page>
+        <PageHeight>29.7cm</PageHeight>
+        <PageWidth>21cm</PageWidth>
+        <LeftMargin>2cm</LeftMargin>
+        <RightMargin>2cm</RightMargin>
+        <TopMargin>2cm</TopMargin>
+        <BottomMargin>2cm</BottomMargin>
+        <ColumnSpacing>0.13cm</ColumnSpacing>
+        <Style />
+      </Page>
+    </ReportSection>
+  </ReportSections>
+  <ReportParameters>
+    <ReportParameter Name="ReportParameterPeriod">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+  </ReportParameters>
+  <ReportParametersLayout>
+    <GridLayoutDefinition>
+      <NumberOfColumns>4</NumberOfColumns>
+      <NumberOfRows>2</NumberOfRows>
+      <CellDefinitions>
+        <CellDefinition>
+          <ColumnIndex>0</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>ReportParameterPeriod</ParameterName>
+        </CellDefinition>
+      </CellDefinitions>
+    </GridLayoutDefinition>
+  </ReportParametersLayout>
+  <rd:ReportUnitType>Cm</rd:ReportUnitType>
+  <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
+</Report>

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BlacksmithWorkshopBusinessLogic.csproj

@@ -7,7 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>
 
   <ItemGroup>

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -20,16 +20,10 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 
         private readonly IOrderStorage _orderStorage;
 
-        private readonly IShopLogic _shopLogic;
-
-        private readonly IManufactureStorage _manufactureStorage;
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, IManufactureStorage manufactureStorage) 
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage) 
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopLogic = shopLogic;
-            _manufactureStorage = manufactureStorage;
         }
 
         //вывод отфильтрованного списка компонентов
@@ -128,7 +122,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
                 throw new InvalidOperationException("Дата создания должна быть более ранней, нежели дата завершения");
             }
 
-            _logger.LogInformation("Order. OrderId:{Id}. Sun:{Sum}. ManufactureId:{Id}. Sum:{Sum}", model.Id, model.Sum, model.ManufactureId, model.Sum);
+            _logger.LogInformation("Order. OrderId:{Id}. Sun:{Sum}. ManufactureId:{Id}", model.Id, model.Sum, model.ManufactureId);
         }
 
         //обновление статуса заказа
@@ -152,21 +146,9 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
             model.Status = newOrderStatus;
 
             //проверка на выдачу
-            if (model.Status == OrderStatus.Готов)
+            if (model.Status == OrderStatus.Выдан)
             {
                 model.DateImplement = DateTime.Now;
-                
-                var manufacture = _manufactureStorage.GetElement(new() { Id = viewModel.ManufactureId });
-                
-                if (manufacture == null)
-                {
-                    throw new ArgumentNullException(nameof(manufacture));
-                }
-
-                if (!_shopLogic.AddManufactures(manufacture, viewModel.Count))
-                {
-                    throw new Exception($"AddManufactures operation failed. Shop is full.");
-                }
             }
             else
             {

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -0,0 +1,120 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
+{
+    //Реализация бизнес-логики отчётов
+    public class ReportLogic : IReportLogic
+    {
+        private readonly IManufactureStorage _manufactureStorage;
+
+        private readonly IOrderStorage _orderStorage;
+
+        private readonly AbstractSaveToExcel _saveToExcel;
+
+        private readonly AbstractSaveToWord _saveToWord;
+
+        private readonly AbstractSaveToPdf _saveToPdf;
+
+        //инициализируем поля класса через контейнер
+        public ReportLogic(IManufactureStorage manufactureStorage, 
+            IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, 
+            AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        {
+            _manufactureStorage = manufactureStorage;
+            _orderStorage = orderStorage;
+
+            _saveToExcel = saveToExcel;
+            _saveToWord = saveToWord;
+            _saveToPdf = saveToPdf;
+        }
+
+        //Получение списка компонент с указанием, в каких изделиях используются
+        public List<ReportManufactureWorkPieceViewModel> GetManufactureWorkPiece()
+        {
+            var manufactures = _manufactureStorage.GetFullList();
+
+            var list = new List<ReportManufactureWorkPieceViewModel>();
+
+            foreach (var manufacture in manufactures)
+            {
+                var record = new ReportManufactureWorkPieceViewModel
+                {
+                    ManufactureName = manufacture.ManufactureName,
+                    WorkPieces = new List<(string, int)>(),
+                    TotalCount = 0
+                };
+
+                foreach (var workPiece in manufacture.ManufactureWorkPieces)
+                {
+                    record.WorkPieces.Add(new (workPiece.Value.Item1.WorkPieceName, workPiece.Value.Item2));
+                    record.TotalCount += workPiece.Value.Item2;
+                }
+
+                list.Add(record);
+            }
+
+            return list;
+        }
+
+        //Получение списка заказов за определенный период
+        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
+        {
+            return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
+                .Select(x => new ReportOrdersViewModel
+                {
+                    Id = x.Id,
+                    DateCreate = x.DateCreate,
+                    ManufactureName = x.ManufactureName,
+                    Sum = x.Sum,
+                    OrderStatus = x.Status.ToString()
+                })
+                .ToList();
+        }
+
+        //Сохранение мороженных в файл-Word
+        public void SaveManufacturesToWordFile(ReportBindingModel model)
+        {
+            _saveToWord.CreateDoc(new WordInfo
+            {
+                FileName = model.FileName,
+                Title = "Список изделий",
+                Manufactures = _manufactureStorage.GetFullList()
+            });
+        }
+
+        //Сохранение заготовок с указаеним изделий в файл-Excel
+        public void SaveManufactureWorkPieceToExcelFile(ReportBindingModel model)
+        {
+            _saveToExcel.CreateReport(new ExcelInfo
+            {
+                FileName = model.FileName,
+                Title = "Список заготовок",
+                ManufactureWorkPieces = GetManufactureWorkPiece()
+            });
+        }
+
+        //Сохранение заказов в файл-Pdf
+        public void SaveOrdersToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateDoc(new PdfInfo
+            {
+                FileName = model.FileName,
+                Title = "Список заказов",
+                DateFrom = model.DateFrom!.Value,
+                DateTo = model.DateTo!.Value,
+                Orders = GetOrders(model)
+            });
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -1,250 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-
-                return null;
-            }
-
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-
-            return element;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
-
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-
-                return null;
-            }
-
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-
-            return list;
-        }
-
-        public bool AddManufacture(ShopSearchModel model, IManufactureModel manufacture, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (count <= 0)
-            {
-                throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0", nameof(count));
-            }
-
-            _logger.LogInformation("AddManufacture. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
-            var shop = _shopStorage.GetElement(model);
-
-            if (shop == null)
-            {
-                _logger.LogWarning("Add Manufacture operation failed");
-
-                return false;
-            }
-
-            if (shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum() < count)
-            {
-                throw new ArgumentNullException("Слишком много изделий для одного магазина", nameof(count));
-            }
-
-            if (!shop.ShopManufactures.ContainsKey(manufacture.Id))
-            {
-                shop.ShopManufactures[manufacture.Id] = (manufacture, count);
-            }
-            else
-            {
-                shop.ShopManufactures[manufacture.Id] = (manufacture, shop.ShopManufactures[manufacture.Id].Item2 + count);
-            }
-
-            _shopStorage.Update(new ShopBindingModel()
-            {
-                Id = shop.Id,
-                ShopName = shop.ShopName,
-                Address = shop.Address,
-                DateOpen = shop.DateOpen,
-                MaxCountManufactures = shop.MaxCountManufactures,
-                ShopManufactures = shop.ShopManufactures
-            });
-
-            return true;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (!withParams)
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentNullException("Отсутствует названия магазина", nameof(model.ShopName));
-            }
-
-            if (string.IsNullOrEmpty(model.Address))
-            {
-                throw new ArgumentNullException("Отсутствует адреса магазина", nameof(model.Address));
-            }
-
-            _logger.LogInformation("Shop. ShopName:{ShopName}. Address:{Address}. Id: {Id}", model.ShopName, model.Address, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool AddManufactures(IManufactureModel model, int count)
-        {
-            if (count <= 0)
-            {
-                throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0", nameof(count));
-            }
-
-            _logger.LogInformation("AddManufactures. Manufacture: {Manufacture}. Count: {Count}", model?.ManufactureName, count);
-
-            var capacity = _shopStorage.GetFullList().Select(x => x.MaxCountManufactures - x.ShopManufactures.Select(x => x.Value.Item2).Sum()).Sum() - count;
-            
-            if (capacity < 0)
-            {
-                _logger.LogWarning("AddManufactures operation failed. Sell {count} Manufactures ", -capacity);
-                return false;
-            }
-
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                if (shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum() < count)
-                {
-                    if (!AddManufacture(new() { Id = shop.Id }, model, shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum()))
-                    {
-                        _logger.LogWarning("AddManufactures operation failed.");
-
-                        return false;
-                    }
-
-                    count -= shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum();
-                }
-                else
-                {
-                    if (!AddManufacture(new() { Id = shop.Id }, model, count))
-                    {
-                        _logger.LogWarning("AddManufactures operation failed.");
-
-                        return false;
-                    }
-
-                    count -= count;
-                }
-
-                if (count == 0)
-                {
-                    return true;
-                }
-            }
-
-            return true;
-        }
-
-        public bool SellManufatures(IManufactureModel model, int count)
-        {
-            return _shopStorage.SellManufactures(model, count);
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -0,0 +1,101 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToExcel
+    {
+        //Создание отчета. Описание методов ниже
+        public void CreateReport(ExcelInfo info)
+        {
+            CreateExcel(info);
+
+            InsertCellInWorksheet(new ExcelCellParameters
+            {
+                ColumnName = "A",
+                RowIndex = 1,
+                Text = info.Title,
+                StyleInfo = ExcelStyleInfoType.Title
+            });
+
+            MergeCells(new ExcelMergeParameters
+            {
+                CellFromName = "A1",
+                CellToName = "C1"
+            });
+
+            uint rowIndex = 2;
+
+            foreach (var mwp in info.ManufactureWorkPieces)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = mwp.ManufactureName,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+
+                rowIndex++;
+
+                foreach (var (WorkPiece, Count) in mwp.WorkPieces)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "B",
+                        RowIndex = rowIndex,
+                        Text = WorkPiece,
+                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                    });
+
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "C",
+                        RowIndex = rowIndex,
+                        Text = Count.ToString(),
+                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                    });
+
+                    rowIndex++;
+                }
+
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = "Итого",
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "C",
+                    RowIndex = rowIndex,
+                    Text = mwp.TotalCount.ToString(),
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+
+                rowIndex++;
+            }
+
+            SaveExcel(info);
+        }
+
+        //Создание excel-файла
+        protected abstract void CreateExcel(ExcelInfo info);
+
+        //Добавляем новую ячейку в лист
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+
+        //Объединение ячеек
+        protected abstract void MergeCells(ExcelMergeParameters excelParams);
+
+        //Сохранение файла
+        protected abstract void SaveExcel(ExcelInfo info);
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -0,0 +1,74 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToPdf
+    {
+        //публичный метод создания документа. Описание методов ниже
+        public void CreateDoc(PdfInfo info)
+        {
+            CreatePdf(info);
+
+            CreateParagraph(new PdfParagraph
+            {
+                Text = info.Title,
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", 
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+
+            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
+
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма", "Статус заказа" },
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+
+            foreach (var order in info.Orders)
+            {
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ManufactureName, order.Sum.ToString(), order.OrderStatus },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left
+                });
+            }
+
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"\nИтого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right
+            });
+
+            SavePdf(info);
+        }
+
+        /// Создание pdf-файла
+        protected abstract void CreatePdf(PdfInfo info);
+
+        /// Создание параграфа с текстом
+        protected abstract void CreateParagraph(PdfParagraph paragraph);
+
+        /// Создание таблицы
+        protected abstract void CreateTable(List<string> columns);
+
+        /// Создание и заполнение строки
+        protected abstract void CreateRow(PdfRowParameters rowParameters);
+
+        /// Сохранение файла
+        protected abstract void SavePdf(PdfInfo info);
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -0,0 +1,57 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToWord
+    {
+        //метод создания документа
+        public void CreateDoc(WordInfo info)
+        {
+            CreateWord(info);
+
+            //создание ряда абзацев
+            CreateParagraph(new WordParagraph
+            {
+                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
+                TextProperties = new WordTextProperties
+                {
+                    Size = "24",
+                    JustificationType = WordJustificationType.Center
+                }
+            });
+
+            //заполнение абзацев текстом
+            foreach (var manufacture in info.Manufactures)
+            {
+                CreateParagraph(new WordParagraph
+                {
+                    Texts = new List<(string, WordTextProperties)> { (manufacture.ManufactureName + " ", new WordTextProperties { Bold = true, Size = "24", }),
+                    (manufacture.Price.ToString(), new WordTextProperties { Size = "24" }) },
+                    TextProperties = new WordTextProperties
+                    {
+                        Size = "24",
+                        JustificationType = WordJustificationType.Both
+                    }
+                });
+            }
+
+            SaveWord(info);
+        }
+
+        // Создание doc-файла
+        protected abstract void CreateWord(WordInfo info);
+
+        // Создание абзаца с текстом
+        protected abstract void CreateParagraph(WordParagraph paragraph);
+
+        // Сохранение файла
+        protected abstract void SaveWord(WordInfo info);
+
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums
+{
+    //вспомогательное перечисление для оформления exel 
+    public enum ExcelStyleInfoType
+    {
+        //заголовок
+        Title,
+
+        //просто текст
+        Text,
+
+        //текст в рамке
+        TextWithBroder
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums
+{
+    //вспомогательное перечисление для оформления pdf документа
+    public enum PdfParagraphAlignmentType
+    {
+        //либо по центру
+        Center,
+
+        //либо с левого края
+        Left,
+
+        //либо с правого края
+        Right
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums
+{
+    //вспомогательное перечисление для настройки формата word документа
+    public enum WordJustificationType
+    {
+        //выравниваем либо по центру
+        Center,
+
+        //либо на всю ширину
+        Both
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -0,0 +1,28 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //информация по ячейке в таблице excel
+    public class ExcelCellParameters
+    {
+        //название колонки
+        public string ColumnName { get; set; } = string.Empty;
+
+        //строка
+        public uint RowIndex { get; set; }
+
+        //тект в ячейке
+        public string Text { get; set; } = string.Empty;
+
+        //геттер для того, чтобы не искать каждый раз
+        public string CellReference => $"{ColumnName}{RowIndex}";
+
+        //в каком стиле выводить информацию
+        public ExcelStyleInfoType StyleInfo { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -0,0 +1,22 @@
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //информация по excel файлу, который хотим создать
+    public class ExcelInfo
+    {
+        //название файла
+        public string FileName { get; set; } = string.Empty; 
+
+        //заголовок
+        public string Title { get; set; } = string.Empty;
+
+        //список заготовок по изделиям
+        public List<ReportManufactureWorkPieceViewModel> ManufactureWorkPieces { get; set; } = new();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //информация для объединения ячеек
+    public class ExcelMergeParameters
+    {
+        public string CellFromName { get; set; } = string.Empty;
+
+        public string CellToName { get; set; } = string.Empty;
+
+        //гетер для указания диапазона для объединения, чтобы каждый раз его не вычислять
+        public string Merge => $"{CellFromName}:{CellToName}";
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -0,0 +1,24 @@
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //общая информация по pdf файлу
+    public class PdfInfo
+    {
+        public string FileName { get; set; } = string.Empty;
+
+        public string Title { get; set; } = string.Empty;
+
+        public DateTime DateFrom { get; set; }
+
+        public DateTime DateTo { get; set; }
+
+        //перечень заказов за указанный период для вывода/сохранения
+        public List<ReportOrdersViewModel> Orders { get; set; } = new();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -0,0 +1,20 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //информация п параграфу в pdf документе
+    public class PdfParagraph
+    {
+        public string Text { get; set; } = string.Empty;
+
+        public string Style { get; set; } = string.Empty;
+
+        //информация по выравниванию текста в параграфе
+        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -0,0 +1,22 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //информация по параметрам строк таблицы
+    public class PdfRowParameters
+    {
+        //набор текстов
+        public List<string> Texts { get; set; } = new();
+
+        //стиль к текстам
+        public string Style { get; set; } = string.Empty;
+
+        //как выравниваем
+        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -0,0 +1,20 @@
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //общая информация по документу
+    public class WordInfo
+    {
+        public string FileName { get; set; } = string.Empty;
+
+        public string Title { get; set; } = string.Empty;
+
+        //список заготовок для вывода и сохранения
+        public List<ManufactureViewModel> Manufactures { get; set; } = new();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //модель параграфов, которые есть в тексте
+    public class WordParagraph
+    {
+        //набор текстов в абзаце (для случая, если в абзаце текст разных стилей)
+        public List<(string, WordTextProperties)> Texts { get; set; } = new();
+
+        //свойства параграфа, если они есть
+        public WordTextProperties? TextProperties { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -0,0 +1,22 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+    //модель свойств текста, которые нам нужны в word документе
+    public class WordTextProperties
+    {
+        //размере текста
+        public string Size { get; set; } = string.Empty;
+
+        //надо ли делать его жирным
+        public bool Bold { get; set; }
+
+        //выравнивание
+        public WordJustificationType JustificationType { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -0,0 +1,393 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Office2016.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToExcel : AbstractSaveToExcel
+    {
+        private SpreadsheetDocument? _spreadsheetDocument;
+
+        private SharedStringTablePart? _shareStringPart;
+
+        private Worksheet? _worksheet;
+
+        //Настройка стилей для файла
+        private static void CreateStyles(WorkbookPart workbookpart)
+        {
+            var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
+            sp.Stylesheet = new Stylesheet();
+
+            //настройка шрифта простого текста
+            var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+
+            var fontUsual = new Font();
+            fontUsual.Append(new FontSize() { Val = 12D });
+            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontUsual.Append(new FontName() { Val = "Times New Roman" });
+            fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
+            fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+            //настройка шрифта заголока
+            var fontTitle = new Font();
+            fontTitle.Append(new Bold());
+            fontTitle.Append(new FontSize() { Val = 14D });
+            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontTitle.Append(new FontName() { Val = "Times New Roman" });
+            fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
+            fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+            //добавление созданных шрифтов
+            fonts.Append(fontUsual);
+            fonts.Append(fontTitle);
+
+            //создание заливки
+            var fills = new Fills() { Count = 2U };
+
+            var fill1 = new Fill();
+            fill1.Append(new PatternFill() 
+            { 
+                PatternType = PatternValues.None 
+            });
+
+            var fill2 = new Fill();
+            fill2.Append(new PatternFill()
+            {
+                PatternType = PatternValues.Gray125
+            });
+
+            fills.Append(fill1);
+            fills.Append(fill2);
+
+            //стиль границ ячейки - незакрашенный (для заголовка) и закрашенный
+            var borders = new Borders() { Count = 2U };
+
+            var borderNoBorder = new Border();
+            borderNoBorder.Append(new LeftBorder());
+            borderNoBorder.Append(new RightBorder());
+            borderNoBorder.Append(new TopBorder());
+            borderNoBorder.Append(new BottomBorder());
+            borderNoBorder.Append(new DiagonalBorder());
+
+            var borderThin = new Border();
+
+            var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
+            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var rightBorder = new RightBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
+            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            var bottomBorder = new BottomBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+            borderThin.Append(leftBorder);
+            borderThin.Append(rightBorder);
+            borderThin.Append(topBorder);
+            borderThin.Append(bottomBorder);
+            borderThin.Append(new DiagonalBorder());
+
+            borders.Append(borderNoBorder);
+            borders.Append(borderThin);
+
+            //формирование CellFormat из комбинаций шрифтов, заливок и т. д.
+            var cellStyleFormats = new CellStyleFormats() { Count = 1U };
+
+            var cellFormatStyle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 0U
+            };
+
+            cellStyleFormats.Append(cellFormatStyle);
+
+            var cellFormats = new CellFormats() { Count = 3U };
+
+            var cellFormatFont = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                ApplyFont = true
+            };
+
+            var cellFormatFontAndBorder = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 1U,
+                FormatId = 0U,
+                ApplyFont = true,
+                ApplyBorder = true
+            };
+
+            var cellFormatTitle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 1U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                Alignment = new Alignment()
+                {
+                    Vertical = VerticalAlignmentValues.Center,
+                    WrapText = true,
+                    Horizontal = HorizontalAlignmentValues.Center
+                },
+                ApplyFont = true
+            };
+
+            //по итогу создали 3 стиля
+            cellFormats.Append(cellFormatFont);
+            cellFormats.Append(cellFormatFontAndBorder);
+            cellFormats.Append(cellFormatTitle);
+
+            var cellStyles = new CellStyles() { Count = 1U };
+
+            cellStyles.Append(new CellStyle()
+            {
+                Name = "Normal",
+                FormatId = 0U,
+                BuiltinId = 0U
+            });
+
+            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
+
+            var tableStyles = new TableStyles()
+            {
+                Count = 0U,
+                DefaultTableStyle = "TableStyleMedium2",
+                DefaultPivotStyle = "PivotStyleLight16"
+            };
+
+            var stylesheetExtensionList = new StylesheetExtensionList();
+            var stylesheetExtension1 = new StylesheetExtension()
+            {
+                Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+            };
+
+            stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+            stylesheetExtension1.Append(new SlicerStyles()
+            {
+                DefaultSlicerStyle = "SlicerStyleLight1"
+            });
+
+            var stylesheetExtension2 = new StylesheetExtension()
+            {
+                Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+            };
+
+            stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+            
+            stylesheetExtension2.Append(new TimelineStyles()
+            {
+                DefaultTimelineStyle = "TimeSlicerStyleLight1"
+            });
+
+            stylesheetExtensionList.Append(stylesheetExtension1);
+            stylesheetExtensionList.Append(stylesheetExtension2);
+
+            sp.Stylesheet.Append(fonts);
+            sp.Stylesheet.Append(fills);
+            sp.Stylesheet.Append(borders);
+            sp.Stylesheet.Append(cellStyleFormats);
+            sp.Stylesheet.Append(cellFormats);
+            sp.Stylesheet.Append(cellStyles);
+            sp.Stylesheet.Append(differentialFormats);
+            sp.Stylesheet.Append(tableStyles);
+            sp.Stylesheet.Append(stylesheetExtensionList);
+        }
+
+        //Получение номера стиля (одного из 3-х нами созданных) из типа
+        private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+        {
+            return styleInfo switch
+            {
+                ExcelStyleInfoType.Title => 2U,
+                ExcelStyleInfoType.TextWithBroder => 1U,
+                ExcelStyleInfoType.Text => 0U,
+                _ => 0U,
+            };
+        }
+
+        protected override void CreateExcel(ExcelInfo info)
+        {
+            //создаём документ Excel
+            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
+
+            // Создаем книгу (в ней хранятся листы)
+            var workbookpart = _spreadsheetDocument.AddWorkbookPart();
+
+            workbookpart.Workbook = new Workbook();
+
+            CreateStyles(workbookpart);
+
+            // Получаем/создаем хранилище текстов для книги
+            _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
+                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
+                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
+
+            // Создаем SharedStringTable, если его нет
+            if (_shareStringPart.SharedStringTable == null)
+            {
+                _shareStringPart.SharedStringTable = new SharedStringTable();
+            }
+
+            // Создаем лист в книгу
+            var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
+            worksheetPart.Worksheet = new Worksheet(new SheetData());
+
+            // Добавляем лист в книгу
+            var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+
+            var sheet = new Sheet()
+            {
+                Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+                SheetId = 1,
+                Name = "Лист"
+            };
+
+            sheets.Append(sheet);
+
+            _worksheet = worksheetPart.Worksheet;
+        }
+
+        //метод вставки в лист книги
+        protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
+        {
+            if (_worksheet == null || _shareStringPart == null)
+            {
+                return;
+            }
+
+            var sheetData = _worksheet.GetFirstChild<SheetData>();
+
+            if (sheetData == null)
+            {
+                return;
+            }
+
+            // Ищем строку, либо добавляем ее
+            Row row;
+
+            if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
+            {
+                row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+            }
+            else
+            {
+                row = new Row() { RowIndex = excelParams.RowIndex };
+                sheetData.Append(row);
+            }
+
+            // Ищем нужную ячейку
+            Cell cell;
+
+            if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+            {
+                cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
+            }
+            else
+            {
+                // Все ячейки должны быть последовательно друг за другом расположены
+                // нужно определить, после какой вставлять
+                Cell? refCell = null;
+
+                foreach (Cell rowCell in row.Elements<Cell>())
+                {
+                    if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
+                    {
+                        refCell = rowCell;
+                        break;
+                    }
+                }
+
+                var newCell = new Cell()
+                {
+                    CellReference = excelParams.CellReference
+                };
+
+                row.InsertBefore(newCell, refCell);
+                cell = newCell;
+            }
+
+            // вставляем новый текст
+            _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
+            _shareStringPart.SharedStringTable.Save();
+
+            cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
+            cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
+            cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+        }
+
+        //метод объединения ячеек
+        protected override void MergeCells(ExcelMergeParameters excelParams)
+        {
+            if (_worksheet == null)
+            {
+                return;
+            }
+
+            MergeCells mergeCells;
+
+            if (_worksheet.Elements<MergeCells>().Any())
+            {
+                mergeCells = _worksheet.Elements<MergeCells>().First();
+            }
+            else
+            {
+                mergeCells = new MergeCells();
+
+                if (_worksheet.Elements<CustomSheetView>().Any())
+                {
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+                }
+                else
+                {
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
+                }
+            }
+
+            var mergeCell = new MergeCell()
+            {
+                Reference = new StringValue(excelParams.Merge)
+            };
+
+            mergeCells.Append(mergeCell);
+        }
+
+        protected override void SaveExcel(ExcelInfo info)
+        {
+            if (_spreadsheetDocument == null)
+            {
+                return;
+            }
+
+            _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+            _spreadsheetDocument.Close();
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -0,0 +1,131 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
+{
+    //реализация астрактного класса создания pdf документа
+    public class SaveToPdf : AbstractSaveToPdf
+    {
+        private Document? _document;
+
+        private Section? _section;
+
+        private Table? _table;
+
+        //преобразование необходимого типа выравнивания в соотвествующее выравнивание в MigraDoc
+        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+        {
+            return type switch
+            {
+                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
+                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
+                PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
+                _ => ParagraphAlignment.Justify,
+            };
+        }
+
+        //Создание стилей для документа
+        private static void DefineStyles(Document document)
+        {
+            var style = document.Styles["Normal"];
+
+            style.Font.Name = "Times New Roman";
+            style.Font.Size = 14;
+
+            style = document.Styles.AddStyle("NormalTitle", "Normal");
+            style.Font.Bold = true;
+        }
+
+        protected override void CreatePdf(PdfInfo info)
+        {
+            //создаём документ
+            _document = new Document();
+
+            //передаём для него стили
+            DefineStyles(_document);
+
+            //получение первой секции документа
+            _section = _document.AddSection();
+        }
+
+        protected override void CreateParagraph(PdfParagraph pdfParagraph)
+        {
+            if (_section == null)
+            {
+                return;
+            }
+
+            var paragraph = _section.AddParagraph(pdfParagraph.Text);
+            paragraph.Format.SpaceAfter = "1cm";
+            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+            paragraph.Style = pdfParagraph.Style;
+        }
+
+        protected override void CreateTable(List<string> columns)
+        {
+            if (_document == null)
+            {
+                return;
+            }
+
+            //добавляем таблицу в документ как последнюю секцию (?)
+            _table = _document.LastSection.AddTable();
+
+            foreach (var elem in columns)
+            {
+                _table.AddColumn(elem);
+            }
+        }
+
+        protected override void CreateRow(PdfRowParameters rowParameters)
+        {
+            if (_table == null)
+            {
+                return;
+            }
+
+            //добавление строки в таблицу
+            var row = _table.AddRow();
+
+            for (int i = 0; i < rowParameters.Texts.Count; ++i)
+            {
+                //ячейка добавляется добавлением параграфа
+                row.Cells[i].AddParagraph(rowParameters.Texts[i]);
+
+                if (!string.IsNullOrEmpty(rowParameters.Style))
+                {
+                    row.Cells[i].Style = rowParameters.Style;
+                }
+
+                Unit borderWidth = 0.5;
+
+                row.Cells[i].Borders.Left.Width = borderWidth;
+                row.Cells[i].Borders.Right.Width = borderWidth;
+                row.Cells[i].Borders.Top.Width = borderWidth;
+                row.Cells[i].Borders.Bottom.Width = borderWidth;
+
+                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
+                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
+            }
+        }
+
+        protected override void SavePdf(PdfInfo info)
+        {
+            var renderer = new PdfDocumentRenderer(true)
+            {
+                Document = _document
+            };
+
+            renderer.RenderDocument();
+            renderer.PdfDocument.Save(info.FileName);
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -0,0 +1,154 @@
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
+{
+    //реализация абстрактного класса сохранения в word
+    public class SaveToWord : AbstractSaveToWord
+    {
+        private WordprocessingDocument? _wordDocument;
+
+        private Body? _docBody;
+
+        //Получение типа выравнивания
+        private static JustificationValues GetJustificationValues(WordJustificationType type)
+        {
+            //выравнивание слева будет в том случае, если передаётся неизвестный тип выравнивания
+            return type switch
+            {
+                WordJustificationType.Both => JustificationValues.Both,
+                WordJustificationType.Center => JustificationValues.Center,
+                _ => JustificationValues.Left,
+            };
+        }
+
+        //Настройки страницы
+        private static SectionProperties CreateSectionProperties()
+        {
+            var properties = new SectionProperties();
+
+            //прописываем портретную ориентацию
+            var pageSize = new PageSize
+            {
+                Orient = PageOrientationValues.Portrait
+            };
+
+            properties.AppendChild(pageSize);
+
+            return properties;
+        }
+
+        //Задание форматирования для абзаца
+        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+        {
+            if (paragraphProperties == null)
+            {
+                return null;
+            }
+
+            var properties = new ParagraphProperties();
+
+            //вытаскиваем выравнивание текста
+            properties.AppendChild(new Justification()
+            {
+                Val = GetJustificationValues(paragraphProperties.JustificationType)
+            });
+
+            properties.AppendChild(new SpacingBetweenLines
+            {
+                LineRule = LineSpacingRuleValues.Auto
+            });
+
+            properties.AppendChild(new Indentation());
+
+            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+
+            if (!string.IsNullOrEmpty(paragraphProperties.Size))
+            {
+                paragraphMarkRunProperties.AppendChild(new FontSize
+                {
+                    Val = paragraphProperties.Size
+                });
+            }
+
+            properties.AppendChild(paragraphMarkRunProperties);
+
+            return properties;
+        }
+
+        protected override void CreateWord(WordInfo info)
+        {
+            //создаём документ word
+            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
+
+            //вытаскиваем главную часть из вордовского документа
+            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+
+            mainPart.Document = new Document();
+
+            //генерируем тело основной части документа
+            _docBody = mainPart.Document.AppendChild(new Body());
+        }
+
+        protected override void CreateParagraph(WordParagraph paragraph)
+        {
+            //проверка на то, был ли вызван WordprocessingDocument.Create (создался ли документ) и есть ли вообще параграф для вставки
+            if (_docBody == null || paragraph == null)
+            {
+                return;
+            }
+
+            var docParagraph = new Paragraph();
+
+            //добавляем свойства параграфа
+            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+
+            //вставляем блоки текста (их называют Run)
+            foreach (var run in paragraph.Texts)
+            {
+                var docRun = new Run();
+                var properties = new RunProperties();
+
+                //задание свойств текста - размер и жирность
+                properties.AppendChild(new FontSize { Val = run.Item2.Size });
+
+                if (run.Item2.Bold)
+                {
+                    properties.AppendChild(new Bold());
+                }
+
+                docRun.AppendChild(properties);
+
+                docRun.AppendChild(new Text
+                {
+                    Text = run.Item1,
+                    Space = SpaceProcessingModeValues.Preserve
+                });
+
+                docParagraph.AppendChild(docRun);
+            }
+
+            _docBody.AppendChild(docParagraph);
+        }
+
+        //метод сохранения документа
+        protected override void SaveWord(WordInfo info)
+        {
+            if (_docBody == null || _wordDocument == null)
+            {
+                return;
+            }
+
+            //вставляем информацию по секциям (смотри, что является входным параметром)
+            _docBody.AppendChild(CreateSectionProperties());
+
+            //сохраняем документ
+            _wordDocument.MainDocumentPart!.Document.Save();
+
+            _wordDocument.Close();
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ReportBindingModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BindingModels
+{
+    public class ReportBindingModel
+    {
+        public string FileName { get; set; } = string.Empty;
+
+        public DateTime? DateFrom { get; set; }
+
+        public DateTime? DateTo { get; set;}
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs

@@ -1,24 +0,0 @@
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public DateTime DateOpen { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; set; } = new();
-
-        public int Id { get; set; }
-
-        public int MaxCountManufactures { get; set; }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -0,0 +1,28 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
+{
+    public interface IReportLogic
+    {
+        //Получение списка заготовок с указанием, в каких изделиях используются
+        List<ReportManufactureWorkPieceViewModel> GetManufactureWorkPiece();
+
+        //Получение списка заказов за определенный период
+        List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
+
+        //Сохранение изделий в файл-Word
+        void SaveManufacturesToWordFile(ReportBindingModel model);
+
+        //Сохранение заготовок с указанием изделий в файл-Excel
+        void SaveManufactureWorkPieceToExcelFile(ReportBindingModel model);
+
+        //Сохранение заказов в файл-Pdf
+        void SaveOrdersToPdfFile(ReportBindingModel model);
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,31 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-
-        ShopViewModel? ReadElement(ShopSearchModel model);
-
-        bool Create(ShopBindingModel model);
-
-        bool Update(ShopBindingModel model);
-
-        bool Delete(ShopBindingModel model);
-
-        bool AddManufacture(ShopSearchModel model, IManufactureModel manufacture, int count);
-    
-        bool SellManufatures(IManufactureModel model, int count);
-
-        bool AddManufactures(IManufactureModel model, int count);
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/OrderSearchModel.cs

@@ -11,6 +11,10 @@ namespace BlacksmithWorkshopContracts.SearchModels
     {
         //для поиска по идентификатору
         public int? Id { get; set; }
-    }
 
+        //два поля для возможности производить выборку
+        public DateTime? DateFrom { get; set; }
+
+        public DateTime? DateTo { get; set; }
+    }
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.SearchModels
-{
-    public class ShopSearchModel
-    {
-        //для поиска по идентификатору
-        public int? Id { get; set; }
-
-        //для поиска по названию
-        public string? ShopName { get; set; }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs

@@ -1,29 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-
-        ShopViewModel? GetElement(ShopSearchModel model);
-
-        ShopViewModel? Insert(ShopBindingModel model);
-
-        ShopViewModel? Update(ShopBindingModel model);
-
-        ShopViewModel? Delete(ShopBindingModel model);
-
-        bool SellManufactures(IManufactureModel model, int count);
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ReportManufactureWorkPieceViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.ViewModels
+{
+    public class ReportManufactureWorkPieceViewModel
+    {
+        public string ManufactureName { get; set; } = string.Empty;
+
+        public int TotalCount { get; set; }
+
+        //список кортежей
+        public List<(string WorkPiece, int Count)> WorkPieces { get; set; } = new();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ReportOrdersViewModel.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.ViewModels
+{
+    public class ReportOrdersViewModel
+    {
+        public int Id { get; set; }
+
+        public DateTime DateCreate { get; set; }
+
+        public string ManufactureName { get; set; } = string.Empty;
+
+        public double Sum { get; set; }
+
+        public string OrderStatus { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ShopViewModel.cs

@@ -1,29 +0,0 @@
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.ViewModels
-{
-    public class ShopViewModel
-    {
-        public int Id { get; set; }
-
-        [DisplayName("Название магазина")]
-        public string ShopName { get; set; } = string.Empty;
-
-        [DisplayName("Адрес магазина")]
-        public string Address { get; set; } = string.Empty;
-
-        [DisplayName("Дата открытия")]
-        public DateTime DateOpen { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; set; } = new();
-
-        [DisplayName("Вместимость магазина")]
-        public int MaxCountManufactures { get; set; }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IShopModel.cs

@@ -1,28 +0,0 @@
-using BlacksmithWorkshopDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopDataModels.Models
-{
-    //интерфес сущности "Магазин"
-    public interface IShopModel : IId
-    {
-        //название магазина
-        string ShopName { get; }
-
-        //адрес магазина
-        string Address { get; }
-
-        //дата открытия магазина
-        DateTime DateOpen { get; }
-
-        //максимальное кол-во изделий в магазине
-        int MaxCountManufactures { get; }
-
-        //изделия в магазине
-        Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/BlacksmithWorkshopDatabase.cs

@@ -28,9 +28,5 @@ namespace BlacksmithWorkshopDatabaseImplement
         public virtual DbSet<ManufactureWorkPiece> ManufactureWorkPieces { set; get; }
 
         public virtual DbSet<Order> Orders { set; get; }
-
-        public virtual DbSet<Shop> Shops { set; get; }
-
-        public virtual DbSet<ShopManufacture> ShopManufactures { get; set; }
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/BlacksmithWorkshopDatabaseImplement.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Implements/OrderStorage.cs

@@ -17,16 +17,22 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new BlacksmithWorkshopDatabase();
+
             var element = context.Orders
-                .Include(x => x.Manufacture)
                 .FirstOrDefault(rec => rec.Id == model.Id);
 
             if (element != null)
             {
+                // для отображения КОРРЕКТНОЙ ViewModel-и
+                var deletedElement = context.Orders
+                    .Include(x => x.Manufacture)
+                    .FirstOrDefault(x => x.Id == model.Id)
+                    ?.GetViewModel;
+
                 context.Orders.Remove(element);
                 context.SaveChanges();
 
-                return element.GetViewModel;
+                return deletedElement;
             }
 
             return null;
@@ -49,18 +55,27 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
             {
                 return new();
             }
 
             using var context = new BlacksmithWorkshopDatabase();
 
-            return context.Orders
+            if(!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
+            {
+                return context.Orders
                     .Include(x => x.Manufacture)
-                    .Where(x => x.Id == model.Id)
+                    .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
                     .Select(x => x.GetViewModel)
                     .ToList();
+            }
+
+            return context.Orders
+                .Include(x => x.Manufacture)
+                .Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .ToList();
         }
 
         public List<OrderViewModel> GetFullList()
@@ -68,9 +83,9 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
             using var context = new BlacksmithWorkshopDatabase();
 
             return context.Orders
-                    .Include(x => x.Manufacture)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
+                .Include(x => x.Manufacture)
+                .Select(x => x.GetViewModel)
+                .ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -83,6 +98,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
             }
 
             using var context = new BlacksmithWorkshopDatabase();
+
             context.Orders.Add(newOrder);
             context.SaveChanges();
 
@@ -95,7 +111,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new BlacksmithWorkshopDatabase();
-            var order = context.Orders.Include(x => x.Manufacture).FirstOrDefault(x => x.Id == model.Id);
+            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
 
             if (order == null)
             {
@@ -105,7 +121,10 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements
             order.Update(model);
             context.SaveChanges();
 
-            return order.GetViewModel;
+            return context.Orders
+                .Include(x => x.Manufacture)
+                .FirstOrDefault(x => x.Id == model.Id)
+                ?.GetViewModel;
         }
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Implements/ShopStorage.cs

@@ -1,179 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDatabaseImplement.Models;
-using BlacksmithWorkshopDataModels.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopDatabaseImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        public List<ShopViewModel> GetFullList()
-        {
-            using var context = new BlacksmithWorkshopDatabase();
-
-            return context.Shops
-                    .Include(x => x.Manufactures)
-                    .ThenInclude(x => x.Manufacture)
-                    .ToList()
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-
-            using var context = new BlacksmithWorkshopDatabase();
-
-            return context.Shops
-                    .Include(x => x.Manufactures)
-                    .ThenInclude(x => x.Manufacture)
-                    .Where(x => x.ShopName.Contains(model.ShopName))
-                    .ToList()
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-
-            using var context = new BlacksmithWorkshopDatabase();
-
-            return context.Shops
-                .Include(x => x.Manufactures)
-                .ThenInclude(x => x.Manufacture)
-                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-                                (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            using var context = new BlacksmithWorkshopDatabase();
-            var newShop = Shop.Create(context, model);
-
-            if (newShop == null)
-            {
-                return null;
-            }
-
-            context.Shops.Add(newShop);
-            context.SaveChanges();
-
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            using var context = new BlacksmithWorkshopDatabase();
-            using var transaction = context.Database.BeginTransaction();
-
-            try
-            {
-                var shop = context.Shops.FirstOrDefault(rec => rec.Id == model.Id);
-                
-                if (shop == null)
-                {
-                    return null;
-                }
-
-                shop.Update(model);
-                context.SaveChanges();
-                shop.UpdateManufactures(context, model);
-                transaction.Commit();
-
-                return shop.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-
-                throw;
-            }
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            using var context = new BlacksmithWorkshopDatabase();
-
-            var element = context.Shops
-                .Include(x => x.Manufactures)
-                .FirstOrDefault(rec => rec.Id == model.Id);
-
-            if (element != null)
-            {
-                context.Shops.Remove(element);
-                context.SaveChanges();
-
-                return element.GetViewModel;
-            }
-
-            return null;
-        }
-
-        public bool SellManufactures(IManufactureModel model, int count)
-        {
-            using var context = new BlacksmithWorkshopDatabase();
-            using var transaction = context.Database.BeginTransaction();
-
-            try
-            {
-                var shops = context.ShopManufactures
-                    .Include(x => x.Shop)
-                    .ToList()
-                    .Where(rec => rec.ManufactureId == model.Id);
-
-                if (shops == null)
-                {
-                    return false;
-                }
-
-                foreach (var shop in shops)
-                {
-                    if (shop.Count < count)
-                    {
-                        count -= shop.Count;
-                        shop.Count = 0;
-                    }
-                    else
-                    {
-                        shop.Count = shop.Count - count;
-                        count -= count;
-                    }
-
-                    if (count == 0)
-                    {
-                        context.SaveChanges();
-                        transaction.Commit();
-
-                        return true;
-                    }
-                }
-
-                transaction.Rollback();
-
-                return false;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20230324151111_ThirdHardLabWork.Designer.cs

@@ -1,250 +0,0 @@
-// <auto-generated />
-using System;
-using BlacksmithWorkshopDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace BlacksmithWorkshopDatabaseImplement.Migrations
-{
-    [DbContext(typeof(BlacksmithWorkshopDatabase))]
-    [Migration("20230324151111_ThirdHardLabWork")]
-    partial class ThirdHardLabWork
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.4")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ManufactureName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Manufactures");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ManufactureWorkPiece", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ManufactureId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkPieceId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ManufactureId");
-
-                    b.HasIndex("WorkPieceId");
-
-                    b.ToTable("ManufactureWorkPieces");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("ManufactureId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ManufactureId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("DateOpen")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("MaxCountManufactures")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ShopManufacture", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ManufactureId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ManufactureId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopManufactures");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.WorkPiece", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.Property<string>("WorkPieceName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("WorkPieces");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ManufactureWorkPiece", b =>
-                {
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
-                        .WithMany("WorkPieces")
-                        .HasForeignKey("ManufactureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.WorkPiece", "WorkPiece")
-                        .WithMany("ManufactureWorkPieces")
-                        .HasForeignKey("WorkPieceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Manufacture");
-
-                    b.Navigation("WorkPiece");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
-                        .WithMany("Orders")
-                        .HasForeignKey("ManufactureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Manufacture");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ShopManufacture", b =>
-                {
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
-                        .WithMany("Shops")
-                        .HasForeignKey("ManufactureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Manufactures")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Manufacture");
-
-                    b.Navigation("Shop");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", b =>
-                {
-                    b.Navigation("Orders");
-
-                    b.Navigation("Shops");
-
-                    b.Navigation("WorkPieces");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Manufactures");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.WorkPiece", b =>
-                {
-                    b.Navigation("ManufactureWorkPieces");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20230324151111_ThirdHardLabWork.cs

@@ -1,78 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BlacksmithWorkshopDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class ThirdHardLabWork : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Shops",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Address = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    MaxCountManufactures = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Shops", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ShopManufactures",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopId = table.Column<int>(type: "int", nullable: false),
-                    ManufactureId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopManufactures", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopManufactures_Manufactures_ManufactureId",
-                        column: x => x.ManufactureId,
-                        principalTable: "Manufactures",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopManufactures_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopManufactures_ManufactureId",
-                table: "ShopManufactures",
-                column: "ManufactureId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopManufactures_ShopId",
-                table: "ShopManufactures",
-                column: "ShopId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ShopManufactures");
-
-            migrationBuilder.DropTable(
-                name: "Shops");
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/BlacksmithWorkshopDatabaseModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.4")
+                .HasAnnotation("ProductVersion", "7.0.3")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -101,59 +101,6 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                     b.ToTable("Orders");
                 });
 
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("DateOpen")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("MaxCountManufactures")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ShopManufacture", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ManufactureId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ManufactureId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopManufactures");
-                });
-
             modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.WorkPiece", b =>
                 {
                     b.Property<int>("Id")
@@ -204,39 +151,13 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                     b.Navigation("Manufacture");
                 });
 
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ShopManufacture", b =>
-                {
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
-                        .WithMany("Shops")
-                        .HasForeignKey("ManufactureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Manufactures")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Manufacture");
-
-                    b.Navigation("Shop");
-                });
-
             modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", b =>
                 {
                     b.Navigation("Orders");
 
-                    b.Navigation("Shops");
-
                     b.Navigation("WorkPieces");
                 });
 
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Manufactures");
-                });
-
             modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.WorkPiece", b =>
                 {
                     b.Navigation("ManufactureWorkPieces");

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Manufacture.cs

@@ -47,9 +47,6 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
         [ForeignKey("ManufactureId")]
         public virtual List<Order> Orders { get; set; } = new();
 
-        [ForeignKey("ManufactureId")]
-        public virtual List<ShopManufacture> Shops { get; set; } = new();
-
         public static Manufacture Create(BlacksmithWorkshopDatabase context, ManufactureBindingModel model)
         {
             return new Manufacture()
@@ -79,6 +76,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
             ManufactureWorkPieces = ManufactureWorkPieces
         };
 
+        Dictionary<int, (IWorkPieceModel, int)> IManufactureModel.ManufactureWorkPieces => throw new NotImplementedException();
+
         public void UpdateWorkPieces(BlacksmithWorkshopDatabase context, ManufactureBindingModel model)
         {
             var manufactureWorkPieces = context.ManufactureWorkPieces.Where(rec => rec.ManufactureId == model.Id).ToList();
@@ -101,13 +100,13 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
 
             var manufacture = context.Manufactures.First(x => x.Id == Id);
 
-            foreach (var mwp in model.ManufactureWorkPieces)
+            foreach (var pc in model.ManufactureWorkPieces)
             {
                 context.ManufactureWorkPieces.Add(new ManufactureWorkPiece
                 {
                     Manufacture = manufacture,
-                    WorkPiece = context.WorkPieces.First(x => x.Id == mwp.Key),
-                    Count = mwp.Value.Item2
+                    WorkPiece = context.WorkPieces.First(x => x.Id == pc.Key),
+                    Count = pc.Value.Item2
                 });
 
                 context.SaveChanges();

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs

@@ -26,10 +26,10 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
         public double Sum { get; private set; }
 
         [Required]
-        public OrderStatus Status { get; private set; }
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
         [Required]
-        public DateTime DateCreate { get; private set; }
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
 
         public DateTime? DateImplement { get; private set; }
 

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Shop.cs

@@ -1,119 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopDatabaseImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public string ShopName { get; set; } = string.Empty;
-
-        [Required]
-        public string Address { get; set; } = string.Empty;
-
-        [Required]
-        public DateTime DateOpen { get; set; }
-
-        [Required]
-        public int MaxCountManufactures { get; set; }
-
-        private Dictionary<int, (IManufactureModel, int)>? _shopManufactures = null;
-
-        [Required]
-        public Dictionary<int, (IManufactureModel, int)> ShopManufactures
-        {
-            get
-            {
-                if (_shopManufactures == null)
-                {
-                    _shopManufactures = Manufactures.ToDictionary(recSI => recSI.ManufactureId, recSI => (recSI.Manufacture as IManufactureModel, recSI.Count));
-                }
-                return _shopManufactures;
-            }
-        }
-
-        [ForeignKey("ShopId")]
-        public virtual List<ShopManufacture> Manufactures { get; set; } = new();
-
-        public static Shop? Create(BlacksmithWorkshopDatabase context, ShopBindingModel model)
-        {
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpen = model.DateOpen,
-                Manufactures = model.ShopManufactures.Select(x => new ShopManufacture
-                {
-                    Manufacture = context.Manufactures.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList(),
-                MaxCountManufactures = model.MaxCountManufactures
-            };
-        }
-
-        public void Update(ShopBindingModel model)
-        {
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpen = model.DateOpen;
-            MaxCountManufactures = model.MaxCountManufactures;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpen = DateOpen,
-            MaxCountManufactures = MaxCountManufactures,
-            ShopManufactures = ShopManufactures
-        };
-
-        public void UpdateManufactures(BlacksmithWorkshopDatabase context, ShopBindingModel model)
-        {
-            var shopManufactures = context.ShopManufactures.Where(rec => rec.ShopId == model.Id).ToList();
-
-            if (shopManufactures != null && shopManufactures.Count > 0)
-            {   // удалили те, которых нет в модели
-                context.ShopManufactures.RemoveRange(shopManufactures.Where(rec => !model.ShopManufactures.ContainsKey(rec.ManufactureId)));
-                context.SaveChanges();
-
-                // обновили количество у существующих записей
-                foreach (var _shopManufactures in shopManufactures)
-                {
-                    _shopManufactures.Count = model.ShopManufactures[_shopManufactures.ManufactureId].Item2;
-                    model.ShopManufactures.Remove(_shopManufactures.ManufactureId);
-                }
-
-                context.SaveChanges();
-            }
-
-            var shop = context.Shops.First(x => x.Id == Id);
-
-            foreach (var sm in model.ShopManufactures)
-            {
-                context.ShopManufactures.Add(new ShopManufacture
-                {
-                    Shop = shop,
-                    Manufacture = context.Manufactures.First(x => x.Id == sm.Key),
-                    Count = sm.Value.Item2
-                });
-
-                context.SaveChanges();
-            }
-
-            _shopManufactures = null;
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/ShopManufacture.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopDatabaseImplement.Models
-{
-    public class ShopManufacture
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public int ShopId { get; set; }
-
-        [Required]
-        public int ManufactureId { get; set; }
-
-        [Required]
-        public int Count { get; set; }
-
-        public virtual Shop Shop { get; set; } = new();
-
-        public virtual Manufacture Manufacture { get; set; } = new();
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopFileImplement/DataFileSingleton.cs

@@ -18,16 +18,12 @@ namespace BlacksmithWorkshopFileImplement
 
         private readonly string ManufactureFileName = "Manufacture.xml";
 
-        private readonly string ShopFileName = "Shop.xml";
-
         public List<WorkPiece> WorkPieces { get; private set; }
 
         public List<Order> Orders { get; private set; }
 
         public List<Manufacture> Manufactures { get; private set; }
 
-        public List<Shop> Shops { get; private set; }
-
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -44,14 +40,11 @@ namespace BlacksmithWorkshopFileImplement
 
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
 
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
-
         private DataFileSingleton()
         {
             WorkPieces = LoadData(WorkPieceFileName, "WorkPiece", x => WorkPiece.Create(x)!)!;
             Manufactures = LoadData(ManufactureFileName, "Manufacture", x => Manufacture.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
 
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)

BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Implements/OrderStorage.cs

@@ -28,9 +28,11 @@ namespace BlacksmithWorkshopFileImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
-                return new();
+                return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+                    .Select(x => GetViewModel(x))
+                    .ToList();
             }
 
             return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();

BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Implements/ShopStorage.cs

@@ -1,139 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using BlacksmithWorkshopFileImplement.Models;
-using System.Net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return _source.Shops.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-
-            return _source.Shops.Where(x => x.ShopName.Contains(model.ShopName))
-                .Select(x => x.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-
-            return _source.Shops.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) 
-                || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = _source.Shops.Count > 0 ? _source.Shops.Max(x => x.Id) + 1 : 1;
-
-            var newShop = Shop.Create(model);
-
-            if (newShop == null)
-            {
-                return null;
-            }
-
-            _source.Shops.Add(newShop);
-            _source.SaveShops();
-
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = _source.Shops.FirstOrDefault(x => x.ShopName.Contains(model.ShopName) || x.Id == model.Id);
-            
-            if (shop == null)
-            {
-                return null;
-            }
-
-            shop.Update(model);
-            _source.SaveShops();
-
-            return shop.GetViewModel;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var element = _source.Shops.FirstOrDefault(x => x.Id == model.Id);
-
-            if (element != null)
-            {
-                _source.Shops.Remove(element);
-                _source.SaveShops();
-
-                return element.GetViewModel;
-            }
-
-            return null;
-        }
-
-        public bool SellManufactures(IManufactureModel model, int count)
-        {
-            if (_source.Shops.Select(x => x.ShopManufactures.FirstOrDefault(x => x.Key == model.Id).Value.Item2).Sum() < count)
-            {
-                return false;
-            }
-
-            var list = _source.Shops.Where(x => x.ShopManufactures.ContainsKey(model.Id));
-
-            foreach (var shop in list)
-            {
-                if (shop.ShopManufactures[model.Id].Item2 < count)
-                {
-                    count -= shop.ShopManufactures[model.Id].Item2;
-                    shop.ShopManufactures[model.Id] = (shop.ShopManufactures[model.Id].Item1, 0);
-                }
-                else
-                {
-                    shop.ShopManufactures[model.Id] = (shop.ShopManufactures[model.Id].Item1, shop.ShopManufactures[model.Id].Item2 - count);
-                    count -= count;
-                }
-
-                Update(new()
-                {
-                    ShopName = shop.ShopName,
-                    Address = shop.Address,
-                    DateOpen = shop.DateOpen,
-                    MaxCountManufactures = shop.MaxCountManufactures,
-                    ShopManufactures = shop.ShopManufactures
-                });
-
-                if (count == 0)
-                {
-                    return true;
-                }
-            }
-
-            return true;
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Shop.cs

@@ -1,112 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace BlacksmithWorkshopFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; set; }
-
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public DateTime DateOpen { get; set; }
-
-        public int MaxCountManufactures { get; set; }
-
-        public Dictionary<int, int> Manufactures { get; private set; } = new();
-
-        public Dictionary<int, (IManufactureModel, int)> _manufactures = null;
-    
-        public Dictionary<int, (IManufactureModel, int)> ShopManufactures
-        {
-            get
-            {
-                if (_manufactures == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _manufactures = Manufactures.ToDictionary(x => x.Key, y => ((source.Manufactures.FirstOrDefault(z => z.Id == y.Key) as IManufactureModel)!, y.Value));
-                }
-
-                return _manufactures;
-            }
-        }
-
-        public static Shop? Create(ShopBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpen = model.DateOpen,
-                MaxCountManufactures = model.MaxCountManufactures,
-                Manufactures = model.ShopManufactures.ToDictionary(x => x.Key, x => x.Value.Item2)
-            };
-        }
-
-        public static Shop? Create(XElement element)
-
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ShopName = element.Element("ShopName")!.Value,
-                Address = element.Element("Address")!.Value,
-                DateOpen = Convert.ToDateTime(element.Element("DateOpen")!.Value),
-                MaxCountManufactures = Convert.ToInt32(element.Element("MaxCountManufactures")!.Value),
-                Manufactures = element.Element("Manufactures")!.Elements("Manufactures").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpen = model.DateOpen;
-            MaxCountManufactures = model.MaxCountManufactures;
-            Manufactures = model.ShopManufactures.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _manufactures = null;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpen = DateOpen,
-            MaxCountManufactures = MaxCountManufactures,
-            ShopManufactures = ShopManufactures
-        };
-
-        public XElement GetXElement => new("Shop",
-            new XAttribute("Id", Id),
-            new XElement("ShopName", ShopName),
-            new XElement("Address", Address),
-            new XElement("DateOpen", DateOpen.ToString()),
-            new XElement("MaxCountManufactures", MaxCountManufactures.ToString()),
-            new XElement("Manufactures", Manufactures.Select(x => new XElement("Manufactures",
-                new XElement("Key", x.Key),
-                new XElement("Value", x.Value))).ToArray()));
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopListImplement/DataListSingleton.cs

@@ -21,15 +21,11 @@ namespace BlacksmithWorkshopListImplement
         //список для хранения заказов
         public List<Order> Orders { get; set; }
 
-        //список для хранения Магазинов
-        public List<Shop> Shops { get; set; }
-
         public DataListSingleton()
         {
             WorkPieces = new List<WorkPiece>();
             Manufactures = new List<Manufacture>();
             Orders = new List<Order>();
-            Shops = new List<Shop>();
         }
 
         public static DataListSingleton GetInstance()

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs

@@ -41,8 +41,16 @@ namespace BlacksmithWorkshopListImplement.Implements
         {
             var result = new List<OrderViewModel>();
 
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
+                foreach (var order in _source.Orders)
+                {
+                    if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
+                    {
+                        result.Add(GetViewModel(order));
+                    }
+                }
+
                 return result;
             }
 

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs

@@ -1,134 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using BlacksmithWorkshopListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) || (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-
-            return null;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return result;
-            }
-
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.ShopName.Contains(model.ShopName))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-
-            return result;
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-
-            return result;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-
-            var newShop = Shop.Create(model);
-
-            if (newShop == null)
-            {
-                return null;
-            }
-
-            _source.Shops.Add(newShop);
-
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-
-                    return shop.GetViewModel;
-                }
-            }
-
-            return null;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-
-                    return element.GetViewModel;
-                }
-            }
-
-            return null;
-        }
-
-        public bool SellManufactures(IManufactureModel model, int count)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs

@@ -1,66 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public DateTime DateOpen { get; set; }
-
-        public int Id { get; set; }
-
-        public int MaxCountManufactures { get; set; }
-
-        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; private set; } =
-            new Dictionary<int, (IManufactureModel, int)>();
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if(model == null)
-            {
-                return null;
-            }
-
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Address = model.Address,
-                DateOpen = model.DateOpen,
-                ShopManufactures = model.ShopManufactures
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if(model == null)
-            {
-                return;
-            }
-
-            ShopName = model.ShopName;
-            Address = model.Address;
-            DateOpen = model.DateOpen;
-            ShopManufactures = model.ShopManufactures;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            DateOpen = DateOpen,
-            ShopManufactures = ShopManufactures
-        };
-    }
-}