fix lab

AbstractFurnitureAssemblyDataModels/FurnitureAssemblyDataModels.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <BaseOutputPath>bin\</BaseOutputPath>
   </PropertyGroup>
 
 </Project>

AbstractFurnitureAssemblyDataModels/Models/IImplementerModel.cs

@@ -1,17 +0,0 @@
-using AbstractFurnitureAssemblyDataModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyDataModels.Models
-{
-    public interface IImplementerModel : IId
-    {
-        string ImplementerFIO { get; }
-        string Password { get; }
-        int WorkExperience { get; }
-        int Qualification { get; }
-    }
-}

AbstractFurnitureAssemblyDataModels/Models/IMessageInfoModel.cs

@@ -1,19 +0,0 @@
-using AbstractFurnitureAssemblyDataModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyDataModels.Models
-{
-    public interface IMessageInfoModel : IId
-    {
-        string MessageId { get; }
-        int? ClientId { get; }
-        string SenderName { get; }
-        DateTime DateDelivery { get; }
-        string Subject { get; }
-        string Body { get; }
-    }
-}

AbstractFurnitureAssemblyDataModels/Models/IOrderModel.cs

@@ -16,6 +16,5 @@ namespace AbstractFurnitureAssemblyDataModels.Models
         DateTime DateCreate { get; }
         DateTime? DateImplement { get; }
         int ClientId { get; }
-        int? ImplementerId { get; }
     }
 }

AbstractFurnitureAssemblyDataModels/Models/IShopModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractFurnitureAssemblyDataModels.Models
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Address { get; }
+        DateTime DateOpening { get; }
+        int MaxCount { get; }
+        Dictionary<int, (IFurnitureModel, int)> Furnitures { get; }
+    }
+}

FurnitureAssembly/App.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="SmtpClientHost" value="smtp.gmail.com" />
-		<add key="SmtpClientPort" value="587" />
-		<add key="PopHost" value="pop.gmail.com" />
-		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="MailNoNameLab@gmail.com" />
-		<add key="MailPassword" value="cpdj ykey loip jxwj" />
-	</appSettings>
-</configuration>

FurnitureAssembly/ClientsForm.cs

@@ -32,7 +32,17 @@ namespace FurnitureAssemblyView
         {
             try
             {
-                dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ClientFIO"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["Email"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["Password"].Visible = false;
+                }
                 _logger.LogInformation("Загрузка клиентов");
             }
             catch (Exception ex)

FurnitureAssembly/ComponentsForm.cs

@@ -1,7 +1,6 @@
 using FurnitureAssembly;
 using FurnitureAssemblyContracts.BindingModels;
 using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -34,7 +33,14 @@ namespace FurnitureAssemblyView
         {
             try
             {
-                dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ComponentName"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
@@ -47,22 +53,19 @@ namespace FurnitureAssemblyView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<ComponentForm>();          
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(ComponentForm));
+            if (service is ComponentForm form)
             {
+                if (form.ShowDialog() == DialogResult.OK)
+                {
                     LoadData();
+                }
             }
         }
 
         private void buttonUpdate_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<ComponentForm>();
-            form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                LoadData();
-            }
-        
+            LoadData();
         }
 
         private void buttonDelete_Click(object sender, EventArgs e)
@@ -100,11 +103,15 @@ namespace FurnitureAssemblyView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<ComponentForm>();
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                var service =
+               Program.ServiceProvider?.GetService(typeof(ComponentForm));
+                if (service is ComponentForm form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

FurnitureAssembly/CreateOrderForm.Designer.cs

@@ -0,0 +1,177 @@
+namespace FurnitureAssemblyView
+{
+    partial class CreateOrderForm
+    {
+        /// <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.comboBoxClientEmail = new System.Windows.Forms.ComboBox();
+            this.labelClient = new System.Windows.Forms.Label();
+            this.ButtonCancel = new System.Windows.Forms.Button();
+            this.ButtonSave = new System.Windows.Forms.Button();
+            this.textBoxSum = new System.Windows.Forms.TextBox();
+            this.comboBoxProduct = new System.Windows.Forms.ComboBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.labelSum = new System.Windows.Forms.Label();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.labelFurniture = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // comboBoxClientEmail
+            // 
+            this.comboBoxClientEmail.FormattingEnabled = true;
+            this.comboBoxClientEmail.Location = new System.Drawing.Point(199, 49);
+            this.comboBoxClientEmail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.comboBoxClientEmail.Name = "comboBoxClientEmail";
+            this.comboBoxClientEmail.Size = new System.Drawing.Size(423, 33);
+            this.comboBoxClientEmail.TabIndex = 19;
+            // 
+            // labelClient
+            // 
+            this.labelClient.AutoSize = true;
+            this.labelClient.Location = new System.Drawing.Point(62, 54);
+            this.labelClient.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelClient.Name = "labelClient";
+            this.labelClient.Size = new System.Drawing.Size(71, 25);
+            this.labelClient.TabIndex = 18;
+            this.labelClient.Text = "Клиент:";
+            // 
+            // ButtonCancel
+            // 
+            this.ButtonCancel.Location = new System.Drawing.Point(473, 279);
+            this.ButtonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ButtonCancel.Name = "ButtonCancel";
+            this.ButtonCancel.Size = new System.Drawing.Size(150, 48);
+            this.ButtonCancel.TabIndex = 17;
+            this.ButtonCancel.Text = "Отмена";
+            this.ButtonCancel.UseVisualStyleBackColor = true;
+            this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // ButtonSave
+            // 
+            this.ButtonSave.Location = new System.Drawing.Point(288, 279);
+            this.ButtonSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ButtonSave.Name = "ButtonSave";
+            this.ButtonSave.Size = new System.Drawing.Size(150, 48);
+            this.ButtonSave.TabIndex = 16;
+            this.ButtonSave.Text = "Сохранить";
+            this.ButtonSave.UseVisualStyleBackColor = true;
+            this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // textBoxSum
+            // 
+            this.textBoxSum.Location = new System.Drawing.Point(199, 231);
+            this.textBoxSum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.textBoxSum.Name = "textBoxSum";
+            this.textBoxSum.Size = new System.Drawing.Size(423, 31);
+            this.textBoxSum.TabIndex = 15;
+            // 
+            // comboBoxProduct
+            // 
+            this.comboBoxProduct.FormattingEnabled = true;
+            this.comboBoxProduct.Location = new System.Drawing.Point(199, 112);
+            this.comboBoxProduct.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.comboBoxProduct.Name = "comboBoxProduct";
+            this.comboBoxProduct.Size = new System.Drawing.Size(423, 33);
+            this.comboBoxProduct.TabIndex = 14;
+            this.comboBoxProduct.SelectedIndexChanged += new System.EventHandler(this.comboBoxProduct_SelectedIndexChanged);
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(199, 171);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(423, 31);
+            this.textBoxCount.TabIndex = 13;
+            this.textBoxCount.TextChanged += new System.EventHandler(this.textBoxCount_TextChanged);
+            // 
+            // labelSum
+            // 
+            this.labelSum.AutoSize = true;
+            this.labelSum.Location = new System.Drawing.Point(62, 236);
+            this.labelSum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelSum.Name = "labelSum";
+            this.labelSum.Size = new System.Drawing.Size(67, 25);
+            this.labelSum.TabIndex = 12;
+            this.labelSum.Text = "Сумма";
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(62, 176);
+            this.labelCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(111, 25);
+            this.labelCount.TabIndex = 11;
+            this.labelCount.Text = "Количество:";
+            // 
+            // labelFurniture
+            // 
+            this.labelFurniture.AutoSize = true;
+            this.labelFurniture.Location = new System.Drawing.Point(62, 117);
+            this.labelFurniture.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelFurniture.Name = "labelFurniture";
+            this.labelFurniture.Size = new System.Drawing.Size(84, 25);
+            this.labelFurniture.TabIndex = 10;
+            this.labelFurniture.Text = "Изделие:";
+            // 
+            // CreateOrderForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(733, 387);
+            this.Controls.Add(this.comboBoxClientEmail);
+            this.Controls.Add(this.labelClient);
+            this.Controls.Add(this.ButtonCancel);
+            this.Controls.Add(this.ButtonSave);
+            this.Controls.Add(this.textBoxSum);
+            this.Controls.Add(this.comboBoxProduct);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.labelSum);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.labelFurniture);
+            this.Name = "CreateOrderForm";
+            this.Text = "Создание заказа";
+            this.Load += new System.EventHandler(this.CreateOrderForm_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private ComboBox comboBoxClientEmail;
+        private Label labelClient;
+        private Button ButtonCancel;
+        private Button ButtonSave;
+        private TextBox textBoxSum;
+        private ComboBox comboBoxProduct;
+        private TextBox textBoxCount;
+        private Label labelSum;
+        private Label labelCount;
+        private Label labelFurniture;
+    }
+}

FurnitureAssembly/CreateOrderForm.cs

@@ -0,0 +1,146 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyContracts.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 FurnitureAssemblyView
+{
+    public partial class CreateOrderForm : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IfurnitureLogic _logicF;
+        private readonly IOrderLogic _logicO;
+        private readonly IClientLogic _logicC;
+        public CreateOrderForm(ILogger<CreateOrderForm> logger, IfurnitureLogic logicF, IOrderLogic logicO, IClientLogic logicC)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicF = logicF;
+            _logicO = logicO;
+            _logicC = logicC;
+        }
+
+        private void CreateOrderForm_Load(object sender, EventArgs e)
+        {
+             _logger.LogInformation("Загрузка изделий и клиентов для заказа");
+            LoadData();
+        }
+        private void LoadData()
+        {
+            var _list = _logicF.ReadList(null);
+            if (_list != null)
+            {
+                comboBoxProduct.DisplayMember = "FurnitureName";
+                comboBoxProduct.ValueMember = "Id";
+                comboBoxProduct.DataSource = _list;
+                comboBoxProduct.SelectedItem = null;
+            }
+            var _listCli = _logicC.ReadList(null);
+            if (_listCli != null)
+            {
+                comboBoxClientEmail.DisplayMember = "Email"; // по нему однозначно можно определить клиента 
+                comboBoxClientEmail.ValueMember = "Id";
+                comboBoxClientEmail.DataSource = _listCli;
+                comboBoxClientEmail.SelectedItem = null;
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле Количество", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxProduct.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxClientEmail.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите клиента", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Создание заказа");
+            try
+            {
+                var operationResult = _logicO.CreateOrder(new OrderBindingModel
+                {
+                    FurnitureId = Convert.ToInt32(comboBoxProduct.SelectedValue),
+                    Count = Convert.ToInt32(textBoxCount.Text),
+                    Sum = Convert.ToDouble(textBoxSum.Text),
+                    ClientId = Convert.ToInt32(comboBoxClientEmail.SelectedValue)
+                });
+                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();
+        }
+
+        private void comboBoxProduct_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            CalcSum();
+        }
+
+        private void textBoxCount_TextChanged(object sender, EventArgs e)
+        {
+            CalcSum();
+        }
+        private void CalcSum()
+        {
+            if (comboBoxProduct.SelectedValue != null &&
+           !string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                try
+                {
+                    int id = Convert.ToInt32(comboBoxProduct.SelectedValue);
+                    var product = _logicF.ReadElement(new FurnitureSearchModel
+                    {
+                        Id
+                    = id
+                    });
+                    int count = Convert.ToInt32(textBoxCount.Text);
+                    textBoxSum.Text = Math.Round(count * (product?.Price ?? 0),
+                    2).ToString();
+                    _logger.LogInformation("Расчет суммы заказа");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка расчета суммы заказа");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+                }
+            }
+        }
+    }
+}

FurnitureAssembly/DataGridViewExtension.cs

@@ -1,51 +0,0 @@
-using FurnitureAssemblyContracts.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyView
-{
-    public static class DataGridViewExtension
-    {
-        public static void FillandConfigGrid<T>(this DataGridView grid, List<T>? data)
-        {
-            if (data == null)
-            {
-                return;
-            }
-            grid.DataSource = data;
-            var type = typeof(T);
-            var properties = type.GetProperties();
-            foreach (DataGridViewColumn column in grid.Columns)
-            {
-                var property = properties.FirstOrDefault(x => x.Name == column.Name);
-                if (property == null)
-                {
-                    throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем { column.Name }");
-                }
-                var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault();
-                if (attribute == null)
-                {
-                    throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства { property.Name }");
-                }
-                // ищем нужный нам атрибут
-                if (attribute is ColumnAttribute columnAttr)
-                {
-                    column.HeaderText = columnAttr.Title;
-                    column.Visible = columnAttr.Visible;
-                    if (columnAttr.IsUseAutoSize)
-                    {
-                        column.AutoSizeMode =
-                       (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());
-                    }
-                    else
-                    {
-                        column.Width = columnAttr.Width;
-                    }
-                }
-            }
-        }
-    }
-}

FurnitureAssembly/FormAddToShop.Designer.cs

@@ -0,0 +1,142 @@
+namespace FurnitureAssembly
+{
+    partial class FormAddToShop
+    {
+        /// <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.comboBoxShop = new System.Windows.Forms.ComboBox();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.comboBoxFurniture = new System.Windows.Forms.ComboBox();
+            this.labelFurniture = new System.Windows.Forms.Label();
+            this.labelNum = new System.Windows.Forms.Label();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // comboBoxShop
+            // 
+            this.comboBoxShop.FormattingEnabled = true;
+            this.comboBoxShop.Location = new System.Drawing.Point(133, 18);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(296, 23);
+            this.comboBoxShop.TabIndex = 0;
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(46, 21);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(54, 15);
+            this.labelShop.TabIndex = 1;
+            this.labelShop.Text = "Магазин";
+            // 
+            // comboBoxFurniture
+            // 
+            this.comboBoxFurniture.FormattingEnabled = true;
+            this.comboBoxFurniture.Location = new System.Drawing.Point(133, 62);
+            this.comboBoxFurniture.Name = "comboBoxFurniture";
+            this.comboBoxFurniture.Size = new System.Drawing.Size(296, 23);
+            this.comboBoxFurniture.TabIndex = 2;
+            // 
+            // labelFurniture
+            // 
+            this.labelFurniture.AutoSize = true;
+            this.labelFurniture.Location = new System.Drawing.Point(46, 65);
+            this.labelFurniture.Name = "labelFurniture";
+            this.labelFurniture.Size = new System.Drawing.Size(53, 15);
+            this.labelFurniture.TabIndex = 4;
+            this.labelFurniture.Text = "Изделие";
+            // 
+            // labelNum
+            // 
+            this.labelNum.AutoSize = true;
+            this.labelNum.Location = new System.Drawing.Point(46, 106);
+            this.labelNum.Name = "labelNum";
+            this.labelNum.Size = new System.Drawing.Size(72, 15);
+            this.labelNum.TabIndex = 5;
+            this.labelNum.Text = "Количество";
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(194, 161);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(99, 29);
+            this.buttonAdd.TabIndex = 6;
+            this.buttonAdd.Text = "Пополнить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(330, 161);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(99, 29);
+            this.buttonCancel.TabIndex = 7;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(133, 103);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(160, 23);
+            this.textBoxCount.TabIndex = 8;
+            // 
+            // FormReplenishmentShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(479, 214);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonAdd);
+            this.Controls.Add(this.labelNum);
+            this.Controls.Add(this.labelFurniture);
+            this.Controls.Add(this.comboBoxFurniture);
+            this.Controls.Add(this.labelShop);
+            this.Controls.Add(this.comboBoxShop);
+            this.Name = "FormReplenishmentShop";
+            this.Text = "Пополнение магазина";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private ComboBox comboBoxShop;
+        private Label labelShop;
+        private ComboBox comboBoxFurniture;
+        private Label labelFurniture;
+        private Label labelNum;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private TextBox textBoxCount;
+    }
+}

FurnitureAssembly/FormAddToShop.cs

@@ -0,0 +1,129 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.ViewModels;
+using AbstractFurnitureAssemblyDataModels.Models;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using System;
+using System.Collections;
+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;
+using Microsoft.Extensions.Logging;
+
+namespace FurnitureAssembly
+{
+    public partial class FormAddToShop : Form
+    {
+
+        private readonly List<ShopViewModel>? _listShops;
+        private readonly List<FurnitureViewModel>? _listFurnitures;
+        private IShopLogic _shopLogic;
+        private ILogger _logger;
+
+
+        public int Id
+        {
+            get
+            {
+                return Convert.ToInt32(comboBoxShop.SelectedValue);
+            }
+            set
+            {
+                comboBoxShop.SelectedValue = value;
+            }
+        }
+
+
+        public int FurnitureId
+        {
+            get
+            {
+                return Convert.ToInt32(comboBoxFurniture.SelectedValue);
+            }
+            set
+            {
+                comboBoxFurniture.SelectedValue = value;
+            }
+        }
+
+        public int Count
+        {
+            get { return Convert.ToInt32(textBoxCount.Text); }
+            set
+            { textBoxCount.Text = value.ToString(); }
+        }
+        public FormAddToShop(IShopLogic shopLogic, IfurnitureLogic furnitureLogic, ILogger<FormShop> logger)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _shopLogic = shopLogic;
+            _listShops = shopLogic.ReadList(null);
+            _listFurnitures = furnitureLogic.ReadList(null);
+            if (_listShops != null)
+            {
+                comboBoxShop.DisplayMember = "ShopName";
+                comboBoxShop.ValueMember = "Id";
+                comboBoxShop.DataSource = _listShops;
+                comboBoxShop.SelectedItem = null;
+            }
+            if (_listFurnitures != null)
+            {
+                comboBoxFurniture.DisplayMember = "FurnitureName";
+                comboBoxFurniture.ValueMember = "Id";
+                comboBoxFurniture.DataSource = _listFurnitures;
+                comboBoxFurniture.SelectedItem = null;
+            }
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxFurniture.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Укажите количество поступившего изделия", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            try
+            {
+                _logger.LogInformation("Добавление в магазин с id = {ShopName} изделия: id = { FurnitureName} - { Count}", Id, FurnitureId, Count);
+                var operationResult = _shopLogic.AddFurniture(new ShopBindingModel { Id = Id }, new FurnitureBindingModel { Id = FurnitureId }, Count);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при пополнении магазина.  Дополнительная информация в логах.");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка при пополнении магазина c id = " + Id);
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+
+            MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+    }
+}

FurnitureAssembly/FormSell.Designer.cs

@@ -0,0 +1,119 @@
+namespace FurnitureAssemblyView
+{
+    partial class FormSell
+    {
+        /// <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.labelFurniture = new System.Windows.Forms.Label();
+            this.comboBoxToSell = new System.Windows.Forms.ComboBox();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.buttonSell = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // labelFurniture
+            // 
+            this.labelFurniture.AutoSize = true;
+            this.labelFurniture.Location = new System.Drawing.Point(38, 53);
+            this.labelFurniture.Name = "labelFurniture";
+            this.labelFurniture.Size = new System.Drawing.Size(80, 25);
+            this.labelFurniture.TabIndex = 0;
+            this.labelFurniture.Text = "Изделие";
+            // 
+            // comboBoxToSell
+            // 
+            this.comboBoxToSell.FormattingEnabled = true;
+            this.comboBoxToSell.Location = new System.Drawing.Point(174, 50);
+            this.comboBoxToSell.Name = "comboBoxToSell";
+            this.comboBoxToSell.Size = new System.Drawing.Size(182, 33);
+            this.comboBoxToSell.TabIndex = 1;
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(43, 133);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(107, 25);
+            this.labelCount.TabIndex = 2;
+            this.labelCount.Text = "Количество";
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(178, 131);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(150, 31);
+            this.textBoxCount.TabIndex = 3;
+            // 
+            // buttonSell
+            // 
+            this.buttonSell.Location = new System.Drawing.Point(38, 225);
+            this.buttonSell.Name = "buttonSell";
+            this.buttonSell.Size = new System.Drawing.Size(112, 34);
+            this.buttonSell.TabIndex = 4;
+            this.buttonSell.Text = "Продать";
+            this.buttonSell.UseVisualStyleBackColor = true;
+            this.buttonSell.Click += new System.EventHandler(this.buttonSell_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(216, 225);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(112, 34);
+            this.buttonCancel.TabIndex = 5;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // FormSell
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(463, 313);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSell);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.comboBoxToSell);
+            this.Controls.Add(this.labelFurniture);
+            this.Name = "FormSell";
+            this.Text = "Продажа мебели";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelFurniture;
+        private ComboBox comboBoxToSell;
+        private Label labelCount;
+        private TextBox textBoxCount;
+        private Button buttonSell;
+        private Button buttonCancel;
+    }
+}

FurnitureAssembly/FormSell.cs

@@ -0,0 +1,113 @@
+using AbstractFurnitureAssemblyDataModels.Models;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyContracts.ViewModels;
+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 FurnitureAssemblyView
+{
+    public partial class FormSell : Form
+    {
+        private readonly IShopLogic _shopLogic;
+        private readonly List<FurnitureViewModel>? _listFurnitures;
+
+        public int Id
+        {
+            get
+            {
+                return Convert.ToInt32(comboBoxToSell.SelectedValue);
+            }
+            set
+            {
+                comboBoxToSell.SelectedValue = value;
+            }
+        }
+
+        public IFurnitureModel? FurnitureModel
+        {
+            get
+            {
+                if (_listFurnitures == null)
+                {
+                    return null;
+                }
+                foreach (var elem in _listFurnitures)
+                {
+                    if (elem.Id == Id)
+                    {
+                        return elem;
+                    }
+                }
+                return null;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return Convert.ToInt32(textBoxCount.Text);
+            }
+            set
+            {
+                textBoxCount.Text = value.ToString();
+            }
+        }
+        public FormSell(IShopLogic shopLogic, IfurnitureLogic furnitureLogic)
+        {
+            InitializeComponent();
+
+            _shopLogic = shopLogic;
+
+            _listFurnitures = furnitureLogic.ReadList(null);
+            if (_listFurnitures != null)
+            {
+                comboBoxToSell.DisplayMember = "FurnitureName";
+                comboBoxToSell.ValueMember = "Id";
+                comboBoxToSell.DataSource = _listFurnitures;
+                comboBoxToSell.SelectedItem = null;
+            }
+        }
+
+        private void buttonSell_Click(object sender, EventArgs e)
+        {
+            if (FurnitureModel == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка",
+              MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            if (Count <= 0)
+            {
+                MessageBox.Show("Укажите количество изделия", "Ошибка",
+              MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            if (!_shopLogic.Sell(new() { Id = FurnitureModel.Id }, Count))
+            {
+                MessageBox.Show("Не удалось продать изделие " + FurnitureModel.FurnitureName, "Ошибка",
+             MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            MessageBox.Show("Продажа прошла успешно", "Сообщение",
+               MessageBoxButtons.OK, MessageBoxIcon.Information);
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

FurnitureAssembly/FormShop.Designer.cs

@@ -0,0 +1,220 @@
+namespace FurnitureAssembly
+{
+    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.labelShopName = new System.Windows.Forms.Label();
+            this.textBoxName = new System.Windows.Forms.TextBox();
+            this.textBoxAddress = new System.Windows.Forms.TextBox();
+            this.labelAddress = new System.Windows.Forms.Label();
+            this.labelDate = new System.Windows.Forms.Label();
+            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.ButtonSave = new System.Windows.Forms.Button();
+            this.ButtonCancel = new System.Windows.Forms.Button();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.FurnitureId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FurnitureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.labelMaxCount = new System.Windows.Forms.Label();
+            this.textBoxMaxCount = new System.Windows.Forms.TextBox();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // labelShopName
+            // 
+            this.labelShopName.AutoSize = true;
+            this.labelShopName.Location = new System.Drawing.Point(53, 75);
+            this.labelShopName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelShopName.Name = "labelShopName";
+            this.labelShopName.Size = new System.Drawing.Size(170, 25);
+            this.labelShopName.TabIndex = 0;
+            this.labelShopName.Text = "Название магазина";
+            // 
+            // textBoxName
+            // 
+            this.textBoxName.Location = new System.Drawing.Point(240, 70);
+            this.textBoxName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.textBoxName.Name = "textBoxName";
+            this.textBoxName.Size = new System.Drawing.Size(401, 31);
+            this.textBoxName.TabIndex = 1;
+            // 
+            // textBoxAddress
+            // 
+            this.textBoxAddress.Location = new System.Drawing.Point(240, 138);
+            this.textBoxAddress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.textBoxAddress.Name = "textBoxAddress";
+            this.textBoxAddress.Size = new System.Drawing.Size(401, 31);
+            this.textBoxAddress.TabIndex = 3;
+            // 
+            // labelAddress
+            // 
+            this.labelAddress.AutoSize = true;
+            this.labelAddress.Location = new System.Drawing.Point(53, 143);
+            this.labelAddress.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelAddress.Name = "labelAddress";
+            this.labelAddress.Size = new System.Drawing.Size(62, 25);
+            this.labelAddress.TabIndex = 2;
+            this.labelAddress.Text = "Адрес";
+            // 
+            // labelDate
+            // 
+            this.labelDate.AutoSize = true;
+            this.labelDate.Location = new System.Drawing.Point(53, 213);
+            this.labelDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelDate.Name = "labelDate";
+            this.labelDate.Size = new System.Drawing.Size(131, 25);
+            this.labelDate.TabIndex = 4;
+            this.labelDate.Text = "Дата открытия";
+            // 
+            // dateTimePicker
+            // 
+            this.dateTimePicker.Location = new System.Drawing.Point(240, 203);
+            this.dateTimePicker.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.dateTimePicker.Name = "dateTimePicker";
+            this.dateTimePicker.Size = new System.Drawing.Size(401, 31);
+            this.dateTimePicker.TabIndex = 6;
+            // 
+            // ButtonSave
+            // 
+            this.ButtonSave.Location = new System.Drawing.Point(546, 817);
+            this.ButtonSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ButtonSave.Name = "ButtonSave";
+            this.ButtonSave.Size = new System.Drawing.Size(141, 47);
+            this.ButtonSave.TabIndex = 7;
+            this.ButtonSave.Text = "Сохранить";
+            this.ButtonSave.UseVisualStyleBackColor = true;
+            this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // ButtonCancel
+            // 
+            this.ButtonCancel.Location = new System.Drawing.Point(727, 817);
+            this.ButtonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ButtonCancel.Name = "ButtonCancel";
+            this.ButtonCancel.Size = new System.Drawing.Size(141, 47);
+            this.ButtonCancel.TabIndex = 8;
+            this.ButtonCancel.Text = "Отмена";
+            this.ButtonCancel.UseVisualStyleBackColor = true;
+            this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.FurnitureId,
+            this.FurnitureName,
+            this.Count});
+            this.dataGridView1.Location = new System.Drawing.Point(53, 371);
+            this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.RowHeadersWidth = 62;
+            this.dataGridView1.RowTemplate.Height = 25;
+            this.dataGridView1.Size = new System.Drawing.Size(816, 406);
+            this.dataGridView1.TabIndex = 9;
+            // 
+            // FurnitureId
+            // 
+            this.FurnitureId.HeaderText = "Id";
+            this.FurnitureId.MinimumWidth = 8;
+            this.FurnitureId.Name = "FurnitureId";
+            this.FurnitureId.Visible = false;
+            this.FurnitureId.Width = 150;
+            // 
+            // FurnitureName
+            // 
+            this.FurnitureName.HeaderText = "Название";
+            this.FurnitureName.MinimumWidth = 8;
+            this.FurnitureName.Name = "FurnitureName";
+            this.FurnitureName.Width = 150;
+            // 
+            // Count
+            // 
+            this.Count.HeaderText = "Количество";
+            this.Count.MinimumWidth = 8;
+            this.Count.Name = "Count";
+            this.Count.Width = 150;
+            // 
+            // labelMaxCount
+            // 
+            this.labelMaxCount.AutoSize = true;
+            this.labelMaxCount.Location = new System.Drawing.Point(58, 275);
+            this.labelMaxCount.Name = "labelMaxCount";
+            this.labelMaxCount.Size = new System.Drawing.Size(117, 25);
+            this.labelMaxCount.TabIndex = 10;
+            this.labelMaxCount.Text = "Вместимость";
+            // 
+            // textBoxMaxCount
+            // 
+            this.textBoxMaxCount.Location = new System.Drawing.Point(242, 267);
+            this.textBoxMaxCount.Name = "textBoxMaxCount";
+            this.textBoxMaxCount.Size = new System.Drawing.Size(399, 31);
+            this.textBoxMaxCount.TabIndex = 11;
+            // 
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(901, 883);
+            this.Controls.Add(this.textBoxMaxCount);
+            this.Controls.Add(this.labelMaxCount);
+            this.Controls.Add(this.dataGridView1);
+            this.Controls.Add(this.ButtonCancel);
+            this.Controls.Add(this.ButtonSave);
+            this.Controls.Add(this.dateTimePicker);
+            this.Controls.Add(this.labelDate);
+            this.Controls.Add(this.textBoxAddress);
+            this.Controls.Add(this.labelAddress);
+            this.Controls.Add(this.textBoxName);
+            this.Controls.Add(this.labelShopName);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Name = "FormShop";
+            this.Text = "Магазин";
+            this.Load += new System.EventHandler(this.FormShop_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelShopName;
+        private TextBox textBoxName;
+        private TextBox textBoxAddress;
+        private Label labelAddress;
+        private Label labelDate;
+        private DateTimePicker dateTimePicker;
+        private Button ButtonSave;
+        private Button ButtonCancel;
+        private DataGridView dataGridView1;
+        private DataGridViewTextBoxColumn FurnitureId;
+        private DataGridViewTextBoxColumn FurnitureName;
+        private DataGridViewTextBoxColumn Count;
+        private Label labelMaxCount;
+        private TextBox textBoxMaxCount;
+    }
+}

FurnitureAssembly/FormShop.cs

@@ -0,0 +1,144 @@
+using AbstractFurnitureAssemblyDataModels.Models;
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.SearchModels;
+using AbstractFurnitureAssemblyDataModels.Models;
+using Microsoft.Extensions.Logging;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+
+namespace FurnitureAssembly
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _logic;
+        private Dictionary<int, (IFurnitureModel, int)> _shopFurnitures;
+
+        private int? _id;
+        public int Id { set { _id = value; } }
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {            
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _shopFurnitures = new Dictionary<int, (IFurnitureModel, int)>();
+        }
+
+
+        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;
+            }
+            if (string.IsNullOrEmpty(dateTimePicker.Text))
+            {
+                MessageBox.Show("Заполните дату открытия", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (Convert.ToInt32(textBoxMaxCount.Text) <= 0)
+            {
+                MessageBox.Show("Некорректная вместимость", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Сохранение магазина");
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    ShopName = textBoxName.Text,
+                    Address = textBoxAddress.Text,
+                    DateOpening = dateTimePicker.Value,
+                    MaxCount = Convert.ToInt32(textBoxMaxCount.Text)
+
+                };
+                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();
+        }
+
+        private void FormShop_Load(object sender, EventArgs e)
+        {
+            if (_id.HasValue)
+            {
+                try
+                {
+                    _logger.LogInformation("Получение магазина");
+                    var view = _logic.ReadElement(new ShopSearchModel
+                    {
+                        Id = _id.Value
+                    });
+                    if (view != null)
+                    {
+                        textBoxName.Text = view.ShopName;
+                        textBoxAddress.Text = view.Address.ToString();
+                        dateTimePicker.Value = view.DateOpening;
+                        textBoxMaxCount.Text = view.MaxCount.ToString();
+                        _shopFurnitures = view.Furnitures ?? new
+                        Dictionary<int, (IFurnitureModel, int)>();
+                        LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка получения магазина");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Загрузка компонент изделия");
+            try
+            {
+                if (_shopFurnitures != null)
+                {
+                    dataGridView1.Rows.Clear();
+                    foreach (var pc in _shopFurnitures)
+                    {
+                        dataGridView1.Rows.Add(new object[] { pc.Key, pc.Value.Item1.FurnitureName, pc.Value.Item2 });
+                    }
+                    
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки компонент изделия");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+               MessageBoxIcon.Error);
+            }
+        }
+    }
+}

FurnitureAssembly/FormShop.resx

@@ -0,0 +1,69 @@
+<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>
+  <metadata name="FurnitureId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="FurnitureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

FurnitureAssembly/FormShops.Designer.cs

@@ -1,6 +1,6 @@
-namespace FurnitureAssemblyView
+namespace FurnitureAssembly
 {
-    partial class ImplementersForm
+    partial class FormShops
     {
         /// <summary>
         /// Required designer variable.
@@ -28,82 +28,76 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ButtonRef = new System.Windows.Forms.Button();
-            this.ButtonDel = new System.Windows.Forms.Button();
-            this.ButtonUpd = new System.Windows.Forms.Button();
-            this.ButtonAdd = new System.Windows.Forms.Button();
             this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ButtonRef = new System.Windows.Forms.Button();
+            this.ButtonUpd = new System.Windows.Forms.Button();
+            this.ButtonDel = new System.Windows.Forms.Button();
+            this.ButtonAdd = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
             // 
-            // ButtonRef
-            // 
-            this.ButtonRef.Location = new System.Drawing.Point(749, 309);
-            this.ButtonRef.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.ButtonRef.Name = "ButtonRef";
-            this.ButtonRef.Size = new System.Drawing.Size(150, 48);
-            this.ButtonRef.TabIndex = 16;
-            this.ButtonRef.Text = "Обновить";
-            this.ButtonRef.UseVisualStyleBackColor = true;
-            this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // ButtonDel
-            // 
-            this.ButtonDel.Location = new System.Drawing.Point(749, 212);
-            this.ButtonDel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.ButtonDel.Name = "ButtonDel";
-            this.ButtonDel.Size = new System.Drawing.Size(150, 48);
-            this.ButtonDel.TabIndex = 15;
-            this.ButtonDel.Text = "Удалить";
-            this.ButtonDel.UseVisualStyleBackColor = true;
-            this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // ButtonUpd
-            // 
-            this.ButtonUpd.Location = new System.Drawing.Point(749, 117);
-            this.ButtonUpd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.ButtonUpd.Name = "ButtonUpd";
-            this.ButtonUpd.Size = new System.Drawing.Size(150, 48);
-            this.ButtonUpd.TabIndex = 14;
-            this.ButtonUpd.Text = "Изменить";
-            this.ButtonUpd.UseVisualStyleBackColor = true;
-            this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // ButtonAdd
-            // 
-            this.ButtonAdd.Location = new System.Drawing.Point(749, 24);
-            this.ButtonAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.ButtonAdd.Name = "ButtonAdd";
-            this.ButtonAdd.Size = new System.Drawing.Size(150, 48);
-            this.ButtonAdd.TabIndex = 13;
-            this.ButtonAdd.Text = "Добавить";
-            this.ButtonAdd.UseVisualStyleBackColor = true;
-            this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
             // dataGridView
             // 
             this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(13, 14);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.dataGridView.Location = new System.Drawing.Point(-1, -1);
             this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 62;
             this.dataGridView.RowTemplate.Height = 25;
-            this.dataGridView.Size = new System.Drawing.Size(707, 540);
-            this.dataGridView.TabIndex = 12;
+            this.dataGridView.Size = new System.Drawing.Size(559, 453);
+            this.dataGridView.TabIndex = 6;
             // 
-            // ImplementersForm
+            // ButtonRef
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.ButtonRef.Location = new System.Drawing.Point(601, 223);
+            this.ButtonRef.Name = "ButtonRef";
+            this.ButtonRef.Size = new System.Drawing.Size(105, 29);
+            this.ButtonRef.TabIndex = 13;
+            this.ButtonRef.Text = "Обновить";
+            this.ButtonRef.UseVisualStyleBackColor = true;
+            this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click);
+            // 
+            // ButtonUpd
+            // 
+            this.ButtonUpd.Location = new System.Drawing.Point(601, 168);
+            this.ButtonUpd.Name = "ButtonUpd";
+            this.ButtonUpd.Size = new System.Drawing.Size(105, 29);
+            this.ButtonUpd.TabIndex = 12;
+            this.ButtonUpd.Text = "Изменить";
+            this.ButtonUpd.UseVisualStyleBackColor = true;
+            this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
+            // 
+            // ButtonDel
+            // 
+            this.ButtonDel.Location = new System.Drawing.Point(601, 113);
+            this.ButtonDel.Name = "ButtonDel";
+            this.ButtonDel.Size = new System.Drawing.Size(105, 29);
+            this.ButtonDel.TabIndex = 11;
+            this.ButtonDel.Text = "Удалить";
+            this.ButtonDel.UseVisualStyleBackColor = true;
+            this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click);
+            // 
+            // ButtonAdd
+            // 
+            this.ButtonAdd.Location = new System.Drawing.Point(601, 59);
+            this.ButtonAdd.Name = "ButtonAdd";
+            this.ButtonAdd.Size = new System.Drawing.Size(105, 29);
+            this.ButtonAdd.TabIndex = 10;
+            this.ButtonAdd.Text = "Добавить";
+            this.ButtonAdd.UseVisualStyleBackColor = true;
+            this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+            // 
+            // FormShops
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(992, 568);
+            this.ClientSize = new System.Drawing.Size(743, 451);
             this.Controls.Add(this.ButtonRef);
-            this.Controls.Add(this.ButtonDel);
             this.Controls.Add(this.ButtonUpd);
+            this.Controls.Add(this.ButtonDel);
             this.Controls.Add(this.ButtonAdd);
             this.Controls.Add(this.dataGridView);
-            this.Name = "ImplementersForm";
-            this.Text = "Исполнители";
-            this.Load += new System.EventHandler(this.ImplementersForm_Load);
+            this.Name = "FormShops";
+            this.Text = "Магазины";
+            this.Load += new System.EventHandler(this.FormShops_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.ResumeLayout(false);
 
@@ -111,10 +105,10 @@
 
         #endregion
 
-        private Button ButtonRef;
-        private Button ButtonDel;
-        private Button ButtonUpd;
-        private Button ButtonAdd;
         private DataGridView dataGridView;
+        private Button ButtonRef;
+        private Button ButtonUpd;
+        private Button ButtonDel;
+        private Button ButtonAdd;
     }
 }

FurnitureAssembly/FormShops.cs

@@ -1,72 +1,73 @@
-using FurnitureAssembly;
-using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.BindingModels;
 using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.DI;
 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 FurnitureAssemblyView
+
+namespace FurnitureAssembly
 {
-    public partial class ImplementersForm : Form
+    public partial class FormShops : Form
     {
         private readonly ILogger _logger;
-        private readonly IImplementerLogic _logic;
-        public ImplementersForm(ILogger<ImplementersForm> logger, IImplementerLogic logic)
+        private readonly IShopLogic _logic;
+
+        public FormShops(ILogger<FormShop> logger, IShopLogic logic)
         {
             InitializeComponent();
             _logger = logger;
             _logic = logic;
         }
 
-        private void ImplementersForm_Load(object sender, EventArgs e)
+        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 FormShops_Load(object sender, EventArgs e)
         {
             LoadData();
         }
+
         private void LoadData()
         {
             try
             {
-                dataGridView.FillandConfigGrid(_logic.ReadList(null));
-                _logger.LogInformation("Загрузка исполнителей");
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка магазинов");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки исполнителей");
+                _logger.LogError(ex, "Ошибка загрузки магазинов");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
                MessageBoxIcon.Error);
             }
         }
 
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var form = DependencyManager.Instance.Resolve<ImplementerForm>();
-
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                LoadData();
-                
-            }
-        }
-
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<ImplementerForm>();
-
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                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();
+                    }
                 }
             }
         }
@@ -80,13 +81,10 @@ namespace FurnitureAssemblyView
                 {
                     int id =
                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление исполнителя");
+                    _logger.LogInformation("Удаление магазина");
                     try
                     {
-                        if (!_logic.Delete(new ImplementerBindingModel
-                        {
-                            Id = id
-                        }))
+                        if (!_logic.Delete(new ShopBindingModel{ Id = id}))
                         {
                             throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
                         }
@@ -94,7 +92,7 @@ namespace FurnitureAssemblyView
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError(ex, "Ошибка удаления исполнителя");
+                        _logger.LogError(ex, "Ошибка удаления магазина");
                         MessageBox.Show(ex.Message, "Ошибка",
                        MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }

FurnitureAssembly/FormShops.resx

@@ -0,0 +1,60 @@
+<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>

FurnitureAssembly/FurnitureAssembly.sln

@@ -20,9 +20,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyFileImplem
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyDatabaseImplement", "..\FurnitureAssemblyDatabaseImplement\FurnitureAssemblyDatabaseImplement.csproj", "{36ED9141-7BD9-40C6-808F-93C7CA6E6391}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssemblyRestApi", "..\FurnitureAssemblyRestApi\FurnitureAssemblyRestApi.csproj", "{4EEFC2A5-829A-4C0D-BBE0-76E765995FDB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyRestApi", "..\FurnitureAssemblyRestApi\FurnitureAssemblyRestApi.csproj", "{4EEFC2A5-829A-4C0D-BBE0-76E765995FDB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssemblyClientApp", "..\FurnitureAssemblyClientApp\FurnitureAssemblyClientApp.csproj", "{34C0C84A-FEAF-478A-8794-768FB9FD4692}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyClientApp", "..\FurnitureAssemblyClientApp\FurnitureAssemblyClientApp.csproj", "{34C0C84A-FEAF-478A-8794-768FB9FD4692}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyShopWorkApp", "..\FurnitureAssemblyShopWorkApp\FurnitureAssemblyShopWorkApp.csproj", "{31F20108-5750-4B26-B5BA-440441CEE692}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -66,6 +68,10 @@ Global
 		{34C0C84A-FEAF-478A-8794-768FB9FD4692}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34C0C84A-FEAF-478A-8794-768FB9FD4692}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{34C0C84A-FEAF-478A-8794-768FB9FD4692}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31F20108-5750-4B26-B5BA-440441CEE692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31F20108-5750-4B26-B5BA-440441CEE692}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31F20108-5750-4B26-B5BA-440441CEE692}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31F20108-5750-4B26-B5BA-440441CEE692}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FurnitureAssembly/FurnitureAssemblyView.csproj

@@ -6,7 +6,6 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <BaseOutputPath>bin\</BaseOutputPath>
   </PropertyGroup>
 
   <ItemGroup>

FurnitureAssembly/FurnitureForm.cs

@@ -2,7 +2,6 @@
 using FurnitureAssembly;
 using FurnitureAssemblyContracts.BindingModels;
 using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.DI;
 using FurnitureAssemblyContracts.SearchModels;
 using Microsoft.Extensions.Logging;
 using System;
@@ -86,27 +85,27 @@ namespace FurnitureAssemblyView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FurnitureComponentForm>();
-
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FurnitureComponentForm));
+            if (service is FurnitureComponentForm form)
             {
-                if (form.ComponentModel == null)
+                if (form.ShowDialog() == DialogResult.OK)
                 {
-                    return;
+                    if (form.ComponentModel == null)
+                    {
+                        return;
+                    }
+                    _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
+                    if (_furnitureComponents.ContainsKey(form.Id))
+                    {
+                        _furnitureComponents[form.Id] = (form.ComponentModel, form.Count);
+                    }
+                    else
+                    {
+                        _furnitureComponents.Add(form.Id, (form.ComponentModel, form.Count));
+                    }
+                    LoadData();
                 }
             }
-            _logger.LogInformation("Добавление нового компонента: { ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
-            if (_furnitureComponents.ContainsKey(form.Id))
-            {
-                _furnitureComponents[form.Id] = (form.ComponentModel,
-                form.Count);
-            }
-            else
-            {
-                _furnitureComponents.Add(form.Id, (form.ComponentModel,
-                form.Count));
-            }
-            LoadData();
 
         }
 
@@ -114,7 +113,7 @@ namespace FurnitureAssemblyView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = DependencyManager.Instance.Resolve<FurnitureComponentForm>();
+                var service = Program.ServiceProvider?.GetService(typeof(FurnitureComponentForm));
                 if (service is FurnitureComponentForm form)
                 {
                     int id =
@@ -127,8 +126,8 @@ namespace FurnitureAssemblyView
                         {
                             return;
                         }
-                        _logger.LogInformation("Изменение компонента: { ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
-                        _furnitureComponents[form.Id] = (form.ComponentModel, form.Count);
+                        _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
+                     _furnitureComponents[form.Id] = (form.ComponentModel, form.Count);
                         LoadData();
                     }
                 }

FurnitureAssembly/FurnituresForm.cs

@@ -9,11 +9,9 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using FurnitureAssembly;
 using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.Attributes;
 using FurnitureAssemblyContracts.BusinessLogicsContracts;
 using FurnitureAssemblyView;
 using Microsoft.Extensions.Logging;
-using FurnitureAssemblyContracts.DI;
 
 namespace FurnitureAssemblyView
 {
@@ -33,7 +31,14 @@ namespace FurnitureAssemblyView
         {
             try
             {
-                DataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+
+                if (list != null)
+                {
+                    DataGridView.DataSource = list;
+                    DataGridView.Columns["Id"].Visible = false;
+                    DataGridView.Columns["FurnitureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
 
                 _logger.LogInformation("Загрузка компонентов");
 
@@ -47,26 +52,31 @@ namespace FurnitureAssemblyView
 
         private void AddButton_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FurnitureForm>();
+            var service = Program.ServiceProvider?.GetService(typeof(FurnitureForm));
 
-            if (form.ShowDialog() == DialogResult.OK)
+            if (service is FurnitureForm form)
             {
-                LoadData();
-                
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
         private void ChangeButton_Click(object sender, EventArgs e)
         {
             if (DataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FurnitureForm>();
+                var service = Program.ServiceProvider?.GetService(typeof(FurnitureForm));
 
-                form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                if (service is FurnitureForm form)
                 {
-                    LoadData();
-                }
+                    form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
 
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
             }
         }
         private void DeleteButton_Click(object sender, EventArgs e)
@@ -106,16 +116,7 @@ namespace FurnitureAssemblyView
 
         private void FurnituresForm_Load(object sender, EventArgs e)
         {
-            if (DataGridView.SelectedRows.Count == 1)
-            {
-                var form = DependencyManager.Instance.Resolve<FurnitureForm>();
-
-                form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
+            LoadData();
         }
 
     }

FurnitureAssembly/ImplementerForm.Designer.cs

@@ -1,177 +0,0 @@
-namespace FurnitureAssemblyView
-{
-    partial class ImplementerForm
-    {
-        /// <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.numericUpDownQual = new System.Windows.Forms.NumericUpDown();
-            this.numericUpDownWE = new System.Windows.Forms.NumericUpDown();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.labelName = new System.Windows.Forms.Label();
-            this.textBoxPassword = new System.Windows.Forms.TextBox();
-            this.textBoxFIO = new System.Windows.Forms.TextBox();
-            this.ButtonCancel = new System.Windows.Forms.Button();
-            this.ButtonSave = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQual)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWE)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // numericUpDownQual
-            // 
-            this.numericUpDownQual.Location = new System.Drawing.Point(269, 258);
-            this.numericUpDownQual.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.numericUpDownQual.Name = "numericUpDownQual";
-            this.numericUpDownQual.Size = new System.Drawing.Size(171, 31);
-            this.numericUpDownQual.TabIndex = 27;
-            // 
-            // numericUpDownWE
-            // 
-            this.numericUpDownWE.Location = new System.Drawing.Point(269, 187);
-            this.numericUpDownWE.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.numericUpDownWE.Name = "numericUpDownWE";
-            this.numericUpDownWE.Size = new System.Drawing.Size(171, 31);
-            this.numericUpDownWE.TabIndex = 26;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(129, 262);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(130, 25);
-            this.label3.TabIndex = 25;
-            this.label3.Text = "Квалификация";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(129, 190);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(118, 25);
-            this.label2.TabIndex = 24;
-            this.label2.Text = "Стаж работы";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(129, 123);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 25);
-            this.label1.TabIndex = 23;
-            this.label1.Text = "Пароль";
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(129, 55);
-            this.labelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(52, 25);
-            this.labelName.TabIndex = 22;
-            this.labelName.Text = "ФИО";
-            // 
-            // textBoxPassword
-            // 
-            this.textBoxPassword.Location = new System.Drawing.Point(269, 118);
-            this.textBoxPassword.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.textBoxPassword.Name = "textBoxPassword";
-            this.textBoxPassword.Size = new System.Drawing.Size(400, 31);
-            this.textBoxPassword.TabIndex = 21;
-            // 
-            // textBoxFIO
-            // 
-            this.textBoxFIO.Location = new System.Drawing.Point(269, 50);
-            this.textBoxFIO.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.textBoxFIO.Name = "textBoxFIO";
-            this.textBoxFIO.Size = new System.Drawing.Size(400, 31);
-            this.textBoxFIO.TabIndex = 20;
-            // 
-            // ButtonCancel
-            // 
-            this.ButtonCancel.Location = new System.Drawing.Point(564, 363);
-            this.ButtonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.ButtonCancel.Name = "ButtonCancel";
-            this.ButtonCancel.Size = new System.Drawing.Size(107, 38);
-            this.ButtonCancel.TabIndex = 19;
-            this.ButtonCancel.Text = "Отмена";
-            this.ButtonCancel.UseVisualStyleBackColor = true;
-            this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // ButtonSave
-            // 
-            this.ButtonSave.Location = new System.Drawing.Point(415, 363);
-            this.ButtonSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.ButtonSave.Name = "ButtonSave";
-            this.ButtonSave.Size = new System.Drawing.Size(107, 38);
-            this.ButtonSave.TabIndex = 18;
-            this.ButtonSave.Text = "Сохранить";
-            this.ButtonSave.UseVisualStyleBackColor = true;
-            this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // ImplementerForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.numericUpDownQual);
-            this.Controls.Add(this.numericUpDownWE);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.labelName);
-            this.Controls.Add(this.textBoxPassword);
-            this.Controls.Add(this.textBoxFIO);
-            this.Controls.Add(this.ButtonCancel);
-            this.Controls.Add(this.ButtonSave);
-            this.Name = "ImplementerForm";
-            this.Text = "Исполнитель";
-            this.Load += new System.EventHandler(this.ImplementerForm_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQual)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWE)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private NumericUpDown numericUpDownQual;
-        private NumericUpDown numericUpDownWE;
-        private Label label3;
-        private Label label2;
-        private Label label1;
-        private Label labelName;
-        private TextBox textBoxPassword;
-        private TextBox textBoxFIO;
-        private Button ButtonCancel;
-        private Button ButtonSave;
-    }
-}

FurnitureAssembly/ImplementerForm.cs

@@ -1,109 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.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 FurnitureAssemblyView
-{
-    public partial class ImplementerForm : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-        public ImplementerForm(ILogger<ImplementerForm> logger, IImplementerLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void ImplementerForm_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                try
-                {
-                    _logger.LogInformation("Получение исполнителя");
-                    var view = _logic.ReadElement(new ImplementerSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxFIO.Text = view.ImplementerFIO;
-                        textBoxPassword.Text = view.Password;
-                        numericUpDownWE.Value = view.WorkExperience;
-                        numericUpDownQual.Value = view.Qualification;
-                    }
-                }
-                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(textBoxFIO.Text))
-            {
-                MessageBox.Show("Заполните ФИО", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxPassword.Text))
-            {
-                MessageBox.Show("Заполните пароль", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение исполнителя");
-            try
-            {
-                var model = new ImplementerBindingModel
-                {
-                    Id = _id ?? 0,
-                    ImplementerFIO = textBoxFIO.Text,
-                    Password = textBoxPassword.Text,
-                    WorkExperience = Convert.ToInt32(numericUpDownWE.Value),
-                    Qualification = Convert.ToInt32(numericUpDownQual.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();
-        }
-    }
-}

FurnitureAssembly/MailForm.Designer.cs

@@ -1,64 +0,0 @@
-namespace FurnitureAssemblyView
-{
-    partial class MailForm
-    {
-        /// <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.dataGridViewMail = new System.Windows.Forms.DataGridView();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewMail)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // dataGridViewMail
-            // 
-            this.dataGridViewMail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridViewMail.Location = new System.Drawing.Point(0, 2);
-            this.dataGridViewMail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.dataGridViewMail.Name = "dataGridViewMail";
-            this.dataGridViewMail.RowHeadersWidth = 62;
-            this.dataGridViewMail.RowTemplate.Height = 25;
-            this.dataGridViewMail.Size = new System.Drawing.Size(965, 592);
-            this.dataGridViewMail.TabIndex = 1;
-            // 
-            // MailForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(965, 593);
-            this.Controls.Add(this.dataGridViewMail);
-            this.Name = "MailForm";
-            this.Text = "Письма";
-            this.Load += new System.EventHandler(this.MailForm_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewMail)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridView dataGridViewMail;
-    }
-}

FurnitureAssembly/MailForm.cs

@@ -1,41 +0,0 @@
-using FurnitureAssemblyContracts.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 FurnitureAssemblyView
-{
-    public partial class MailForm : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoLogic _logic;
-        public MailForm(ILogger<MailForm> logger, IMessageInfoLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void MailForm_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                dataGridViewMail.FillandConfigGrid(_logic.ReadList(null));
-                _logger.LogInformation("Загрузка писем");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки писем");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
-            }
-        }
-    }
-}

FurnitureAssembly/MainForm.Designer.cs

@@ -39,14 +39,16 @@
             this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.пополнениеМагазинаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.FurnituresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.FurnituresComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.создатьБэкапToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокМагазиновToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.изделияВМагазинахToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокЗаказовПоДатамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.buttonSell = new System.Windows.Forms.Button();
             buttonReady = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.menuStrip.SuspendLayout();
@@ -69,7 +71,7 @@
             this.dataGridView.Name = "dataGridView";
             this.dataGridView.RowHeadersWidth = 62;
             this.dataGridView.RowTemplate.Height = 33;
-            this.dataGridView.Size = new System.Drawing.Size(1227, 386);
+            this.dataGridView.Size = new System.Drawing.Size(1227, 441);
             this.dataGridView.TabIndex = 0;
             // 
             // buttonCreate
@@ -117,15 +119,8 @@
             this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.справочникиToolStripMenuItem,
-            this.отчетыToolStripMenuItem,
-            this.запускРаботToolStripMenuItem,
-            this.письмаToolStripMenuItem,
-            this.создатьБэкапToolStripMenuItem});
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Size = new System.Drawing.Size(1530, 33);
-            this.menuStrip.TabIndex = 6;
-            this.menuStrip.Text = "menuStrip1";
+            this.пополнениеМагазинаToolStripMenuItem,
+            this.отчетыToolStripMenuItem});
             // 
             // справочникиToolStripMenuItem
             // 
@@ -133,7 +128,7 @@
             this.компонентыToolStripMenuItem,
             this.изделияToolStripMenuItem,
             this.клиентыToolStripMenuItem,
-            this.исполнителиToolStripMenuItem});
+            this.магазиныToolStripMenuItem});
             this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(139, 29);
             this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -141,37 +136,47 @@
             // компонентыToolStripMenuItem
             // 
             this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
+            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(218, 34);
             this.компонентыToolStripMenuItem.Text = "Компоненты";
             this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
             // 
             // изделияToolStripMenuItem
             // 
             this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
-            this.изделияToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
+            this.изделияToolStripMenuItem.Size = new System.Drawing.Size(218, 34);
             this.изделияToolStripMenuItem.Text = "Изделия";
             this.изделияToolStripMenuItem.Click += new System.EventHandler(this.изделияToolStripMenuItem_Click);
             // 
             // клиентыToolStripMenuItem
             // 
             this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
+            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(218, 34);
             this.клиентыToolStripMenuItem.Text = "Клиенты";
             this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.ClientsToolStripMenuItem_Click);
             // 
-            // исполнителиToolStripMenuItem
+            // магазиныToolStripMenuItem
             // 
-            this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-            this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
-            this.исполнителиToolStripMenuItem.Text = "Исполнители";
-            this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
+            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(218, 34);
+            this.магазиныToolStripMenuItem.Text = "Магазины";
+            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.ShopToolStripMenuItem_Click);
+            // 
+            // пополнениеМагазинаToolStripMenuItem
+            // 
+            this.пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
+            this.пополнениеМагазинаToolStripMenuItem.Size = new System.Drawing.Size(210, 29);
+            this.пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
+            this.пополнениеМагазинаToolStripMenuItem.Click += new System.EventHandler(this.AddToShopToolStripMenuItem_Click);
             // 
             // отчетыToolStripMenuItem
             // 
             this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FurnituresToolStripMenuItem,
             this.FurnituresComponentsToolStripMenuItem,
-            this.списокЗаказовToolStripMenuItem});
+            this.списокЗаказовToolStripMenuItem,
+            this.списокМагазиновToolStripMenuItem,
+            this.изделияВМагазинахToolStripMenuItem,
+            this.списокЗаказовПоДатамToolStripMenuItem});
             this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(88, 29);
             this.отчетыToolStripMenuItem.Text = "Отчеты";
@@ -197,32 +202,43 @@
             this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
             this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
             // 
-            // запускРаботToolStripMenuItem
+            // списокМагазиновToolStripMenuItem
             // 
-            this.запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
-            this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(141, 29);
-            this.запускРаботToolStripMenuItem.Text = " Запуск работ";
-            this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.doWorkToolStripMenuItem_Click);
+            this.списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem";
+            this.списокМагазиновToolStripMenuItem.Size = new System.Drawing.Size(325, 34);
+            this.списокМагазиновToolStripMenuItem.Text = "Список магазинов";
+            this.списокМагазиновToolStripMenuItem.Click += new System.EventHandler(this.ShopsToolStripMenuItem_Click);
             // 
-            // письмаToolStripMenuItem
+            // изделияВМагазинахToolStripMenuItem
             // 
-            this.письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-            this.письмаToolStripMenuItem.Size = new System.Drawing.Size(90, 29);
-            this.письмаToolStripMenuItem.Text = "Письма";
-            this.письмаToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
+            this.изделияВМагазинахToolStripMenuItem.Name = "изделияВМагазинахToolStripMenuItem";
+            this.изделияВМагазинахToolStripMenuItem.Size = new System.Drawing.Size(325, 34);
+            this.изделияВМагазинахToolStripMenuItem.Text = "Изделия в магазинах";
+            this.изделияВМагазинахToolStripMenuItem.Click += new System.EventHandler(this.ShopsFurnituresToolStripMenuItem_Click);
             // 
-            // создатьБэкапToolStripMenuItem
+            // списокЗаказовПоДатамToolStripMenuItem
             // 
-            this.создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem";
-            this.создатьБэкапToolStripMenuItem.Size = new System.Drawing.Size(144, 29);
-            this.создатьБэкапToolStripMenuItem.Text = "Создать Бэкап";
-            this.создатьБэкапToolStripMenuItem.Click += new System.EventHandler(this.CreateBackUpToolStripMenuItem_Click);
+            this.списокЗаказовПоДатамToolStripMenuItem.Name = "списокЗаказовПоДатамToolStripMenuItem";
+            this.списокЗаказовПоДатамToolStripMenuItem.Size = new System.Drawing.Size(325, 34);
+            this.списокЗаказовПоДатамToolStripMenuItem.Text = "Список заказов по датам";
+            this.списокЗаказовПоДатамToolStripMenuItem.Click += new System.EventHandler(this.OrderDateToolStripMenuItem_Click);
+            // 
+            // buttonSell
+            // 
+            this.buttonSell.Location = new System.Drawing.Point(1280, 450);
+            this.buttonSell.Name = "buttonSell";
+            this.buttonSell.Size = new System.Drawing.Size(208, 34);
+            this.buttonSell.TabIndex = 7;
+            this.buttonSell.Text = "Продать";
+            this.buttonSell.UseVisualStyleBackColor = true;
+            this.buttonSell.Click += new System.EventHandler(this.buttonSell_Click);
             // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1530, 450);
+            this.ClientSize = new System.Drawing.Size(1530, 505);
+            this.Controls.Add(this.buttonSell);
             this.Controls.Add(this.buttonRefresh);
             this.Controls.Add(this.buttonPut);
             this.Controls.Add(buttonReady);
@@ -253,14 +269,17 @@
         private ToolStripMenuItem справочникиToolStripMenuItem;
         private ToolStripMenuItem компонентыToolStripMenuItem;
         private ToolStripMenuItem изделияToolStripMenuItem;
+        private ToolStripMenuItem магазиныToolStripMenuItem;
+        private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
+        private Button buttonSell;
         private ToolStripMenuItem отчетыToolStripMenuItem;
         private ToolStripMenuItem FurnituresToolStripMenuItem;
         private ToolStripMenuItem FurnituresComponentsToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+
+        private ToolStripMenuItem списокМагазиновToolStripMenuItem;
+        private ToolStripMenuItem изделияВМагазинахToolStripMenuItem;
+        private ToolStripMenuItem списокЗаказовПоДатамToolStripMenuItem;
         private ToolStripMenuItem клиентыToolStripMenuItem;
-        private ToolStripMenuItem исполнителиToolStripMenuItem;
-        private ToolStripMenuItem запускРаботToolStripMenuItem;
-        private ToolStripMenuItem письмаToolStripMenuItem;
-        private ToolStripMenuItem создатьБэкапToolStripMenuItem;
     }
 }

FurnitureAssembly/MainForm.cs

@@ -2,7 +2,6 @@
 using FurnitureAssembly;
 using FurnitureAssemblyContracts.BindingModels;
 using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -20,17 +19,17 @@ namespace FurnitureAssemblyView
     {
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
-        private readonly IReportLogic _reportLogic;
-        private readonly IWorkProcess _workModeling;
-        private readonly IBackUpLogic _backUpLogic;
-        public MainForm(ILogger<MainForm> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workModeling, IBackUpLogic backUpLogic)
+        private readonly IShopLogic _shopLogic;
+		private readonly IReportLogic _reportLogic;
+
+        
+        public MainForm(ILogger<MainForm> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IShopLogic shopLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
+            _shopLogic = shopLogic;
             _reportLogic = reportLogic;
-            _workModeling = workModeling;
-            _backUpLogic = backUpLogic;
         }
 
         private void MainForm_Load(object sender, EventArgs e)
@@ -42,7 +41,14 @@ namespace FurnitureAssemblyView
             _logger.LogInformation("Загрузка заказов");
             try
             {
-                dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
+                var list = _orderLogic.ReadList(null);
+
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["FurnitureId"].Visible = false;
+                    dataGridView.Columns["ClientId"].Visible = false;
+                }
 
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -55,24 +61,31 @@ namespace FurnitureAssemblyView
 
         private void компонентыToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<ComponentsForm>();
-
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(ComponentsForm));
+            if (service is ComponentsForm form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void изделияToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FurnituresForm>();
+            var service = Program.ServiceProvider?.GetService(typeof(FurnituresForm));
 
-            form.ShowDialog();
+            if (service is FurnituresForm form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<OrderForm>();
-
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(OrderForm));
+            if (service is OrderForm form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
 
         private void buttonToWork_Click(object sender, EventArgs e)
@@ -120,8 +133,7 @@ namespace FurnitureAssemblyView
             {
                 int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                 _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
-                try
-                {
+                try { 
                     var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
                     {
                         Id = id,
@@ -131,10 +143,8 @@ namespace FurnitureAssemblyView
                         Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
                         DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
                     });
-                    if (!operationResult)
-                    {
-                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                    }
+                    
+                   
                     LoadData();
                 }
                 catch (Exception ex)
@@ -186,7 +196,26 @@ namespace FurnitureAssemblyView
             LoadData();
         }
 
-        private void FurnituresToolStripMenuItem_Click(object sender, EventArgs e)
+        private void ShopToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void AddToShopToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormAddToShop));
+            if (service is FormAddToShop form)
+            {
+                form.ShowDialog();
+            }
+        }
+		private void FurnituresToolStripMenuItem_Click(object sender, EventArgs e)
         {
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
@@ -203,67 +232,73 @@ namespace FurnitureAssemblyView
         private void FurnituresComponentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
 
-            var form = DependencyManager.Instance.Resolve<FormReportFurnitureComponents>();
+            var service =
+           Program.ServiceProvider?.GetService(typeof(FormReportFurnitureComponents));
+            if (service is FormReportFurnitureComponents 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();
+            }
+		}
 
-            form.ShowDialog();
+        private void buttonSell_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSell));
+            if (service is FormSell form)
+            {
+                form.ShowDialog();
+            }
         }
 
-        private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+        private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormReportOrders>();
+            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                _reportLogic.SaveShopsToWordFile(new ReportBindingModel
+                {
+                    FileName = dialog.FileName
+                });
+                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+               MessageBoxIcon.Information);
+            }
+        }
 
-            form.ShowDialog();
+        private void ShopsFurnituresToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(ReportShopFurnituresForm));
+            if (service is ReportShopFurnituresForm form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void OrderDateToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(ReportCountOrdersByPeriodForm));
+            if (service is ReportCountOrdersByPeriodForm form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<ClientsForm>();
-            form.ShowDialog();
-        }
-
-        private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var form = DependencyManager.Instance.Resolve<ImplementersForm>();
-
-            form.ShowDialog();
-        }
-
-        private void doWorkToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            _workModeling.DoWork((
-                 DependencyManager.Instance.Resolve<IImplementerLogic>() as IImplementerLogic)!,
-                 _orderLogic);
-        }
-
-        private void mailToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var form = DependencyManager.Instance.Resolve<MailForm>();
-            form.ShowDialog();
-        }
-
-        private void CreateBackUpToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
+            var service = Program.ServiceProvider?.GetService(typeof(ClientsForm));
+            if (service is ClientsForm form)
             {
-                if (_backUpLogic != null)
-                {
-                    var fbd = new FolderBrowserDialog();
-                    if (fbd.ShowDialog() == DialogResult.OK)
-                    {
-                        _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
-                        {
-                            FolderName = fbd.SelectedPath
-                        });
-                        MessageBox.Show("Бекап создан", "Сообщение",
-                       MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
+                form.ShowDialog();
             }
         }
+
     }
 }

FurnitureAssembly/OrderForm.Designer.cs

@@ -36,14 +36,12 @@
             this.textBoxSum = new System.Windows.Forms.TextBox();
             this.buttonSave = new System.Windows.Forms.Button();
             this.buttonCancel = new System.Windows.Forms.Button();
-            this.comboBoxClientEmail = new System.Windows.Forms.ComboBox();
-            this.labelClient = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // comboBoxFurniture
             // 
             this.comboBoxFurniture.FormattingEnabled = true;
-            this.comboBoxFurniture.Location = new System.Drawing.Point(115, 70);
+            this.comboBoxFurniture.Location = new System.Drawing.Point(115, 14);
             this.comboBoxFurniture.Name = "comboBoxFurniture";
             this.comboBoxFurniture.Size = new System.Drawing.Size(250, 33);
             this.comboBoxFurniture.TabIndex = 0;
@@ -51,7 +49,7 @@
             // labelFurniture
             // 
             this.labelFurniture.AutoSize = true;
-            this.labelFurniture.Location = new System.Drawing.Point(12, 78);
+            this.labelFurniture.Location = new System.Drawing.Point(12, 22);
             this.labelFurniture.Name = "labelFurniture";
             this.labelFurniture.Size = new System.Drawing.Size(80, 25);
             this.labelFurniture.TabIndex = 1;
@@ -60,7 +58,7 @@
             // labelCount
             // 
             this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(12, 123);
+            this.labelCount.Location = new System.Drawing.Point(12, 67);
             this.labelCount.Name = "labelCount";
             this.labelCount.Size = new System.Drawing.Size(107, 25);
             this.labelCount.TabIndex = 2;
@@ -69,7 +67,7 @@
             // labelSum
             // 
             this.labelSum.AutoSize = true;
-            this.labelSum.Location = new System.Drawing.Point(12, 174);
+            this.labelSum.Location = new System.Drawing.Point(12, 118);
             this.labelSum.Name = "labelSum";
             this.labelSum.Size = new System.Drawing.Size(67, 25);
             this.labelSum.TabIndex = 3;
@@ -77,7 +75,7 @@
             // 
             // textBoxCount
             // 
-            this.textBoxCount.Location = new System.Drawing.Point(115, 120);
+            this.textBoxCount.Location = new System.Drawing.Point(115, 64);
             this.textBoxCount.Name = "textBoxCount";
             this.textBoxCount.Size = new System.Drawing.Size(250, 31);
             this.textBoxCount.TabIndex = 4;
@@ -85,7 +83,7 @@
             // 
             // textBoxSum
             // 
-            this.textBoxSum.Location = new System.Drawing.Point(115, 171);
+            this.textBoxSum.Location = new System.Drawing.Point(115, 115);
             this.textBoxSum.Name = "textBoxSum";
             this.textBoxSum.ReadOnly = true;
             this.textBoxSum.Size = new System.Drawing.Size(250, 31);
@@ -93,7 +91,7 @@
             // 
             // buttonSave
             // 
-            this.buttonSave.Location = new System.Drawing.Point(31, 217);
+            this.buttonSave.Location = new System.Drawing.Point(31, 161);
             this.buttonSave.Name = "buttonSave";
             this.buttonSave.Size = new System.Drawing.Size(112, 34);
             this.buttonSave.TabIndex = 6;
@@ -103,7 +101,7 @@
             // 
             // buttonCancel
             // 
-            this.buttonCancel.Location = new System.Drawing.Point(253, 217);
+            this.buttonCancel.Location = new System.Drawing.Point(253, 161);
             this.buttonCancel.Name = "buttonCancel";
             this.buttonCancel.Size = new System.Drawing.Size(112, 34);
             this.buttonCancel.TabIndex = 7;
@@ -111,32 +109,11 @@
             this.buttonCancel.UseVisualStyleBackColor = true;
             this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
             // 
-            // comboBoxClientEmail
-            // 
-            this.comboBoxClientEmail.FormattingEnabled = true;
-            this.comboBoxClientEmail.Location = new System.Drawing.Point(115, 14);
-            this.comboBoxClientEmail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.comboBoxClientEmail.Name = "comboBoxClientEmail";
-            this.comboBoxClientEmail.Size = new System.Drawing.Size(270, 33);
-            this.comboBoxClientEmail.TabIndex = 11;
-            // 
-            // labelClient
-            // 
-            this.labelClient.AutoSize = true;
-            this.labelClient.Location = new System.Drawing.Point(21, 17);
-            this.labelClient.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.labelClient.Name = "labelClient";
-            this.labelClient.Size = new System.Drawing.Size(71, 25);
-            this.labelClient.TabIndex = 10;
-            this.labelClient.Text = "Клиент:";
-            // 
             // OrderForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(389, 277);
-            this.Controls.Add(this.comboBoxClientEmail);
-            this.Controls.Add(this.labelClient);
+            this.ClientSize = new System.Drawing.Size(401, 207);
             this.Controls.Add(this.buttonCancel);
             this.Controls.Add(this.buttonSave);
             this.Controls.Add(this.textBoxSum);
@@ -163,7 +140,5 @@
         private TextBox textBoxSum;
         private Button buttonSave;
         private Button buttonCancel;
-        private ComboBox comboBoxClientEmail;
-        private Label labelClient;
     }
 }

FurnitureAssembly/OrderForm.cs

@@ -19,14 +19,12 @@ namespace FurnitureAssemblyView
         private readonly ILogger _logger;
         private readonly IfurnitureLogic _logicP;
         private readonly IOrderLogic _logicO;
-        private readonly IClientLogic _logicC;
-        public OrderForm(ILogger<OrderForm> logger, IfurnitureLogic logicF, IOrderLogic logicO, IClientLogic logicC)
+        public OrderForm(ILogger<OrderForm> logger, IfurnitureLogic logicP, IOrderLogic logicO)
         {
             InitializeComponent();
             _logger = logger;
-            _logicP = logicF;
+            _logicP = logicP;
             _logicO = logicO;
-            _logicC = logicC;
         }
 
         private void OrderForm_Load(object sender, EventArgs e)
@@ -37,23 +35,12 @@ namespace FurnitureAssemblyView
                 var list = _logicP.ReadList(null);
                 if (list != null)
                 {
-                    comboBoxFurniture.DisplayMember = "FurnitureName";
+                    comboBoxFurniture.DisplayMember = "Furniture";
                     comboBoxFurniture.ValueMember = "Id";
-                    comboBoxFurniture.DataSource = list;
+                    comboBoxFurniture.DataSource = list.Select(c => c.FurnitureName).ToList();
                     comboBoxFurniture.SelectedItem = null;
-                    //comboBoxProduct.ValueMember = "Id";
-                    //comboBoxProduct.DataSource = _list;
-                    //comboBoxProduct.SelectedItem = null;
                 }
-                var _listCli = _logicC.ReadList(null);
-                if (_listCli != null)
-                {
-                    comboBoxClientEmail.DisplayMember = "Email"; // по нему однозначно можно определить клиента 
-                    comboBoxClientEmail.ValueMember = "Id";
-                    comboBoxClientEmail.DataSource = _listCli;
-                    comboBoxClientEmail.SelectedItem = null;
 
-                }
             }
             catch (Exception ex)
             {
@@ -63,20 +50,17 @@ namespace FurnitureAssemblyView
         }
         private void CalcSum()
         {
-            if (comboBoxFurniture.SelectedValue != null &&
-           !string.IsNullOrEmpty(textBoxCount.Text))
+            if (comboBoxFurniture.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text))
             {
                 try
                 {
-                    int id = Convert.ToInt32(comboBoxFurniture.SelectedValue);
-                    var product = _logicP.ReadElement(new FurnitureSearchModel
+                    int id = Convert.ToInt32(comboBoxFurniture.SelectedIndex)+1;
+                    var furniture = _logicP.ReadElement(new FurnitureSearchModel
                     {
-                        Id
-                    = id
+                        Id = id
                     });
                     int count = Convert.ToInt32(textBoxCount.Text);
-                    textBoxSum.Text = Math.Round(count * (product?.Price ?? 0),
-                    2).ToString();
+                    textBoxSum.Text = Math.Round(count * (furniture?.Price ?? 0), 2).ToString();
                     _logger.LogInformation("Расчет суммы заказа");
                 }
                 catch (Exception ex)
@@ -112,17 +96,15 @@ namespace FurnitureAssemblyView
             {
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
-                    FurnitureId = Convert.ToInt32(comboBoxFurniture.SelectedValue),
+                    FurnitureId = Convert.ToInt32(comboBoxFurniture.SelectedIndex)+1,
                     Count = Convert.ToInt32(textBoxCount.Text),
-                    Sum = Convert.ToDouble(textBoxSum.Text),
-                    ClientId = Convert.ToInt32(comboBoxClientEmail.SelectedValue)
+                    Sum = Convert.ToDouble(textBoxSum.Text)
                 });
                 if (!operationResult)
                 {
                     throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");
                 }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение",
-               MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 DialogResult = DialogResult.OK;
                 Close();
             }

FurnitureAssembly/Program.cs

@@ -3,19 +3,19 @@ using Microsoft.Extensions.DependencyInjection;
 using FurnitureAssemblyDatabaseImplement.Implements;
 using FurnitureAssemblyBusinessLogic.BusinessLogics;
 using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyBusinessLogic.BusinessLogics;
 using NLog.Extensions.Logging;
 using FurnitureAssemblyView;
 using Microsoft.Extensions.Logging;
 using FurnitureAssemblyBusinessLogic.OfficePackage;
 using FurnitureAssemblyBusinessLogic.OfficePackage.Implements;
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyFileImplement.Implements;
-using FurnitureAssemblyContracts.DI;
 
 namespace FurnitureAssembly
 {
     internal static class Program
     {
+        private static ServiceProvider? _serviceProvider;
+        public static ServiceProvider? ServiceProvider => _serviceProvider;
         /// <summary>
         ///  The main entry point for the application.
         /// </summary>
@@ -23,76 +23,52 @@ namespace FurnitureAssembly
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-            InitDependency();
-            try
-            {
-                var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
-                mailSender?.MailConfig(new MailConfigBindingModel
-                {
-                    MailLogin =
-                System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ??
-                string.Empty,
-                    MailPassword =
-                System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ??
-                string.Empty,
-                    SmtpClientHost =
-                System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ??
-                string.Empty,
-                    SmtpClientPort =
-                Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-                    PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-                    PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
-                });
-                var timer = new System.Threading.Timer(new
-                TimerCallback(MailCheck!), null, 0, 100000);
-            }
-            catch (Exception ex)
-            {
-                var logger = DependencyManager.Instance.Resolve<ILogger>();
-                logger?.LogError(ex, "Error");
-            }
-            Application.Run(DependencyManager.Instance.Resolve<MainForm>());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            _serviceProvider = services.BuildServiceProvider();
+            Application.Run(_serviceProvider.GetRequiredService<MainForm>());
         }
-        private static void InitDependency()
+        private static void ConfigureServices(ServiceCollection services)
         {
-            DependencyManager.InitDependency();
-
-            DependencyManager.Instance.AddLogging(option =>
+            services.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
+            services.AddTransient<IComponentStorage, ComponentStorage>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
+            services.AddTransient<IFurnitureStorage, FurnitureStorage>();
+            services.AddTransient<IShopStorage, ShopStorage>();
+            services.AddTransient<IClientStorage, ClientStorage>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IfurnitureLogic, FurnitureLogic>();
+            services.AddTransient<IShopLogic, ShopLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+            services.AddTransient<IClientLogic, ClientLogic>();
+            services.AddTransient<MainForm>();
+            services.AddTransient<ComponentForm>();
+            services.AddTransient<ComponentsForm>();
+            services.AddTransient<OrderForm>();
+            services.AddTransient<FurnitureForm>();
+            services.AddTransient<FurnituresForm>();
+            services.AddTransient<FurnitureComponentForm>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormAddToShop>();
+            services.AddTransient<FormSell>();
+            services.AddTransient<ReportShopFurnituresForm>();
+            services.AddTransient<ReportCountOrdersByPeriodForm>();
+            services.AddTransient<ClientsForm>();
 
-            DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-            DependencyManager.Instance.RegisterType<IfurnitureLogic, FurnitureLogic>();
-            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+            services.AddTransient<FormReportFurnitureComponents>();
+            services.AddTransient<FormReportOrders>();
 
-            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
-
-            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-
-            DependencyManager.Instance.RegisterType<MainForm>();
-            DependencyManager.Instance.RegisterType<ComponentForm>();
-            DependencyManager.Instance.RegisterType<ComponentsForm>();
-            DependencyManager.Instance.RegisterType<OrderForm>();
-            DependencyManager.Instance.RegisterType<FurnitureForm>();
-            DependencyManager.Instance.RegisterType<FurnitureComponentForm>();
-            DependencyManager.Instance.RegisterType<FurnituresForm>();
-            DependencyManager.Instance.RegisterType<FormReportFurnitureComponents>();
-            DependencyManager.Instance.RegisterType<FormReportOrders>();
-            DependencyManager.Instance.RegisterType<ClientsForm>();
-            DependencyManager.Instance.RegisterType<ImplementersForm>();
-            DependencyManager.Instance.RegisterType<ImplementerForm>();
-            DependencyManager.Instance.RegisterType<MailForm>();
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
         }
-        private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+
+
     }
 }

FurnitureAssembly/ReportCountOrdersByPeriodForm.Designer.cs

@@ -0,0 +1,133 @@
+namespace FurnitureAssemblyView
+{
+    partial class ReportCountOrdersByPeriodForm
+    {
+        /// <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.buttonMake_Pdf = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.buttonToPdf = new System.Windows.Forms.Button();
+            this.buttonMake = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.panel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel
+            // 
+            this.panel.Controls.Add(this.button2);
+            this.panel.Controls.Add(this.buttonMake_Pdf);
+            this.panel.Controls.Add(this.button1);
+            this.panel.Controls.Add(this.buttonToPdf);
+            this.panel.Controls.Add(this.buttonMake);
+            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel.Location = new System.Drawing.Point(0, 0);
+            this.panel.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.panel.Name = "panel";
+            this.panel.Size = new System.Drawing.Size(986, 67);
+            this.panel.TabIndex = 3;
+            // 
+            // buttonMake_Pdf
+            // 
+            this.buttonMake_Pdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonMake_Pdf.Location = new System.Drawing.Point(1966, 13);
+            this.buttonMake_Pdf.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.buttonMake_Pdf.Name = "buttonMake_Pdf";
+            this.buttonMake_Pdf.Size = new System.Drawing.Size(199, 45);
+            this.buttonMake_Pdf.TabIndex = 7;
+            this.buttonMake_Pdf.Text = "В Pdf";
+            this.buttonMake_Pdf.UseVisualStyleBackColor = true;
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.Location = new System.Drawing.Point(3020, 13);
+            this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(199, 45);
+            this.button1.TabIndex = 6;
+            this.button1.Text = "В Pdf";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
+            // buttonToPdf
+            // 
+            this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonToPdf.Location = new System.Drawing.Point(4289, 13);
+            this.buttonToPdf.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.buttonToPdf.Name = "buttonToPdf";
+            this.buttonToPdf.Size = new System.Drawing.Size(199, 45);
+            this.buttonToPdf.TabIndex = 5;
+            this.buttonToPdf.Text = "В Pdf";
+            this.buttonToPdf.UseVisualStyleBackColor = true;
+            // 
+            // buttonMake
+            // 
+            this.buttonMake.Location = new System.Drawing.Point(126, 14);
+            this.buttonMake.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.buttonMake.Name = "buttonMake";
+            this.buttonMake.Size = new System.Drawing.Size(199, 45);
+            this.buttonMake.TabIndex = 4;
+            this.buttonMake.Text = "Сформировать";
+            this.buttonMake.UseVisualStyleBackColor = true;
+            this.buttonMake.Click += new System.EventHandler(this.buttonMake_Click);
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.Location = new System.Drawing.Point(584, 14);
+            this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(199, 45);
+            this.button2.TabIndex = 8;
+            this.button2.Text = "В Pdf";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // ReportCountOrdersByPeriodForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(986, 491);
+            this.Controls.Add(this.panel);
+            this.Name = "ReportCountOrdersByPeriodForm";
+            this.Text = "Заказы по датам";
+            this.Load += new System.EventHandler(this.ReportCountOrdersByPeriodForm_Load);
+            this.panel.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Panel panel;
+        private Button button2;
+        private Button buttonMake_Pdf;
+        private Button button1;
+        private Button buttonToPdf;
+        private Button buttonMake;
+    }
+}

FurnitureAssembly/ReportCountOrdersByPeriodForm.cs

@@ -0,0 +1,87 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.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 FurnitureAssemblyView
+{
+    public partial class ReportCountOrdersByPeriodForm : Form
+    {
+        private readonly ReportViewer reportViewer;
+
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
+
+        public ReportCountOrdersByPeriodForm(ILogger<ReportCountOrdersByPeriodForm> logger, IReportLogic reportLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = reportLogic;
+            reportViewer = new ReportViewer
+            {
+                Dock = DockStyle.Fill
+            };
+            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrdersCount.rdlc", FileMode.Open)); // другой файл
+            Controls.Clear();
+            Controls.Add(reportViewer);
+            Controls.Add(panel);
+        }
+
+        private void ReportCountOrdersByPeriodForm_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void buttonMake_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                var dataSource = _logic.GetCountOrders();
+                var source = new ReportDataSource("DataSetOrders", dataSource);
+                reportViewer.LocalReport.DataSources.Clear();
+                reportViewer.LocalReport.DataSources.Add(source);
+
+
+                reportViewer.RefreshReport();
+                _logger.LogInformation("Загрузка списка заказов, объединенных по дате");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveCountOrdersToPdfFile(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);
+                }
+            }
+        }
+    }
+}

FurnitureAssembly/ReportCountOrdersByPeriodForm.resx

@@ -0,0 +1,60 @@
+<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>

FurnitureAssembly/ReportOrdersCount.rdlc

@@ -0,0 +1,459 @@
+<?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="FurnitureAssemblyContractsViewModels">
+      <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>FurnitureAssemblyContractsViewModels</DataSourceName>
+        <CommandText>/* Local Query */</CommandText>
+      </Query>
+      <Fields>       
+        <Field Name="DateCreate">
+          <DataField>DateCreate</DataField>
+          <rd:TypeName>System.DateTime</rd:TypeName>
+        </Field>
+        <Field Name="CountOrders">
+          <DataField>CountOrders</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
+        <Field Name="TotalSumOrders">
+          <DataField>TotalSumOrders</DataField>
+          <rd:TypeName>System.Double</rd:TypeName>
+        </Field>       
+      </Fields>
+      <rd:DataSetInfo>
+        <rd:DataSetName>FurnitureAssemblyContracts.ViewModels</rd:DataSetName>
+        <rd:TableName>ReportCountOrdersViewModel</rd:TableName>
+        <rd:ObjectDataSourceType>FurnitureAssemblyContracts.ViewModels.ReportCountOrdersViewModel, FurnitureAssemblyContracts, 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>3cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>7cm</Width>
+                </TablixColumn>
+		</TablixColumns>               
+              <TablixRows>
+                <TablixRow>
+                  <Height>0.6cm</Height>
+                  <TablixCells>                 
+                    <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="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="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="CountOrders">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!CountOrders.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>CountOrders</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="TotalSumOrders">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!TotalSumOrders.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>TotalSumOrders</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 />
+              </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.84713cm</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.39958cm</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!TotalSumOrders.Value, "DataSetOrders")</Value>
+                    <Style>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Top>4cm</Top>
+            <Left>17.89958cm</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>

FurnitureAssembly/ReportShopFurnituresForm.Designer.cs

@@ -0,0 +1,110 @@
+namespace FurnitureAssemblyView
+{
+    partial class ReportShopFurnituresForm
+    {
+        /// <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.Shop = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Furniture = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ButtonSaveToExcel = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Shop,
+            this.Furniture,
+            this.Count});
+            this.dataGridView.Location = new System.Drawing.Point(10, 76);
+            this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 62;
+            this.dataGridView.RowTemplate.Height = 25;
+            this.dataGridView.Size = new System.Drawing.Size(777, 384);
+            this.dataGridView.TabIndex = 4;
+            // 
+            // Shop
+            // 
+            this.Shop.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Shop.HeaderText = "Магазин";
+            this.Shop.MinimumWidth = 8;
+            this.Shop.Name = "Shop";
+            // 
+            // Furniture
+            // 
+            this.Furniture.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Furniture.HeaderText = "Изделие";
+            this.Furniture.MinimumWidth = 8;
+            this.Furniture.Name = "Furniture";
+            // 
+            // Count
+            // 
+            this.Count.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.Count.HeaderText = "Количество";
+            this.Count.MinimumWidth = 8;
+            this.Count.Name = "Count";
+            this.Count.Width = 143;
+            // 
+            // ButtonSaveToExcel
+            // 
+            this.ButtonSaveToExcel.Location = new System.Drawing.Point(10, 17);
+            this.ButtonSaveToExcel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ButtonSaveToExcel.Name = "ButtonSaveToExcel";
+            this.ButtonSaveToExcel.Size = new System.Drawing.Size(181, 49);
+            this.ButtonSaveToExcel.TabIndex = 3;
+            this.ButtonSaveToExcel.Text = "Сохранить в Excel";
+            this.ButtonSaveToExcel.UseVisualStyleBackColor = true;
+            this.ButtonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+            // 
+            // ReportShopFurnituresForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 476);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.ButtonSaveToExcel);
+            this.Name = "ReportShopFurnituresForm";
+            this.Text = "Магазины и изделия";
+            this.Load += new System.EventHandler(this.ReportShopFurnituresForm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn Shop;
+        private DataGridViewTextBoxColumn Furniture;
+        private DataGridViewTextBoxColumn Count;
+        private Button ButtonSaveToExcel;
+    }
+}

FurnitureAssembly/ReportShopFurnituresForm.cs

@@ -0,0 +1,87 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.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 FurnitureAssemblyView
+{
+    public partial class ReportShopFurnituresForm : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IReportLogic _logic;
+        public ReportShopFurnituresForm(ILogger<ReportShopFurnituresForm> logger, IReportLogic reportLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = reportLogic;
+        }
+
+        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "xlsx|*.xlsx"
+            };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveShopFurnituresToExcelFile(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);
+                }
+            }
+        }
+
+        private void ReportShopFurnituresForm_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                var dict = _logic.GetShopFurnitures();
+                if (dict != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in dict)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
+                        foreach (var listElem in elem.Furnitures)
+                        {
+                            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);
+            }
+        }
+    }
+}

FurnitureAssembly/ReportShopFurnituresForm.resx

@@ -0,0 +1,78 @@
+<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>
+  <metadata name="Shop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Furniture.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Shop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Furniture.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

FurnitureAssemblyBusinessLogic/BusinessLogics/AbstractMailWorker.cs

@@ -1,87 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyBusinessLogic.BusinessLogics
-{
-    public abstract class AbstractMailWorker
-    {
-        protected string _mailLogin = string.Empty;
-        protected string _mailPassword = string.Empty;
-        protected string _smtpClientHost = string.Empty;
-        protected int _smtpClientPort;
-        protected string _popHost = string.Empty;
-        protected int _popPort;
-        private readonly IMessageInfoLogic _messageInfoLogic;
-        private readonly ILogger _logger;
-        private readonly IClientLogic _clientLogic;
-
-        public AbstractMailWorker(ILogger<AbstractMailWorker> logger,
-       IMessageInfoLogic messageInfoLogic,
-       IClientLogic clientLogic)
-        {
-            _logger = logger;
-            _messageInfoLogic = messageInfoLogic;
-            _clientLogic = clientLogic;
-        }
-        public void MailConfig(MailConfigBindingModel config)
-        {
-            _mailLogin = config.MailLogin;
-            _mailPassword = config.MailPassword;
-            _smtpClientHost = config.SmtpClientHost;
-            _smtpClientPort = config.SmtpClientPort;
-            _popHost = config.PopHost;
-            _popPort = config.PopPort;
-            _logger.LogDebug("Config: {login}, {password}, {clientHost},{ clientPOrt}, { popHost}, { popPort}", _mailLogin, _mailPassword, _smtpClientHost,
-       _smtpClientPort, _popHost, _popPort);
-        }
-        public async void MailSendAsync(MailSendInfoBindingModel info)
-        {
-            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(info.MailAddress) ||
-           string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
-            {
-                return;
-            }
-            _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress,
-           info.Subject);
-            await SendMailAsync(info);
-        }
-        public async void MailCheck()
-        {
-            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
-            {
-                return;
-            }
-            if (_messageInfoLogic == null)
-            {
-                return;
-            }
-            //var list = await ReceiveMailAsync();
-            //_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
-            //foreach (var mail in list)
-            //{
-            //    mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
-            //    _messageInfoLogic.Create(mail);
-            //}
-        }
-        protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-        protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
-    }
-}

FurnitureAssemblyBusinessLogic/BusinessLogics/BackUpLogic.cs

@@ -1,102 +0,0 @@
-using AbstractFurnitureAssemblyDataModels;
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.StoragesContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyBusinessLogic.BusinessLogics
-{
-    public class BackUpLogic : IBackUpLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IBackUpInfo _backUpInfo;
-        public BackUpLogic(ILogger<BackUpLogic> logger, IBackUpInfo backUpInfo)
-        {
-            _logger = logger;
-            _backUpInfo = backUpInfo;
-        }
-        public void CreateBackUp(BackUpSaveBinidngModel model)
-        {
-            if (_backUpInfo == null)
-            {
-                return;
-            }
-            try
-            {
-                _logger.LogDebug("Clear folder");
-                // зачистка папки и удаление старого архива
-                var dirInfo = new DirectoryInfo(model.FolderName);
-                if (dirInfo.Exists)
-                {
-                    foreach (var file in dirInfo.GetFiles())
-                    {
-                        file.Delete();
-                    }
-                }
-                _logger.LogDebug("Delete archive");
-                string fileName = $"{model.FolderName}.zip";
-                if (File.Exists(fileName))
-                {
-                    File.Delete(fileName);
-                }
-                // берем метод для сохранения
-                _logger.LogDebug("Get assembly");
-                var typeIId = typeof(IId);
-                var assembly = typeIId.Assembly;
-                if (assembly == null)
-                {
-                    throw new ArgumentNullException("Сборка не найдена",
-                   nameof(assembly));
-                }
-                var types = assembly.GetTypes();
-                var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance);
-                _logger.LogDebug("Find {count} types", types.Length);
-                foreach (var type in types)
-                {
-                    if (type.IsInterface && type.GetInterface(typeIId.Name) != null)
-                    {
-                        var modelType = _backUpInfo.GetTypeByModelInterface(type.Name);
-                        if (modelType == null)
-                        {
-                            throw new InvalidOperationException($"Не найден класс - модель для { type.Name }");
-                        }
-                        _logger.LogDebug("Call SaveToFile method for {name} type", type.Name);
-                        // вызываем метод на выполнение
-                        method?.MakeGenericMethod(modelType).Invoke(this, new
-                        object[] { model.FolderName });
-                    }
-                }
-                _logger.LogDebug("Create zip and remove folder");
-                // архивируем
-                ZipFile.CreateFromDirectory(model.FolderName, fileName);
-                // удаляем папку
-                dirInfo.Delete(true);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-        private void SaveToFile<T>(string folderName) where T : class, new()
-        {
-            var records = _backUpInfo.GetList<T>();
-            if (records == null)
-            {
-                _logger.LogWarning("{type} type get null list", typeof(T).Name);
-                return;
-            }
-            var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
-            using var fs = new FileStream(string.Format("{0}/{1}.json",
-            folderName, typeof(T).Name), FileMode.OpenOrCreate);
-            jsonFormatter.WriteObject(fs, records);
-        }
-    }
-}

FurnitureAssemblyBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace FurnitureAssemblyBusinessLogic.BusinessLogics
@@ -113,15 +112,6 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
                 throw new ArgumentNullException("Нет пароля пользователя",
                nameof(model.Password));
             }
-            if (!Regex.IsMatch(model.Email, @"^([\w\.\-]+)@([\w\-]+)((\.(\w){2,})+)$"))
-            {
-                throw new ArgumentException("Некорректно введена почта клиента", nameof(model.Email));
-            }
-            if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$"))
-            {
-                throw new ArgumentException("Некорректно введен пароль клиента", nameof(model.Password));
-            }
-
             _logger.LogInformation("Component. ClientFIO:{ClientFIO}. Email:{ Email}. Id: { Id}", model.ClientFIO, model.Email, model.Id);
             var element = _clientStorage.GetElement(new ClientSearchModel { Email = model.Email });
             if (element != null && element.Id != model.Id)

FurnitureAssemblyBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -1,131 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.SearchModels;
-using FurnitureAssemblyContracts.StoragesContracts;
-using FurnitureAssemblyContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyBusinessLogic.BusinessLogics
-{
-    public class ImplementerLogic : IImplementerLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerStorage _implementerStorage;
-
-        public ImplementerLogic(ILogger<ImplementerLogic> logger, IImplementerStorage implementerStorage)
-        {
-            _logger = logger;
-            _implementerStorage = implementerStorage;
-        }
-
-        public bool Create(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ImplementerBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_implementerStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ImplementerFIO: {ImplementerFIO} Id:{ Id}", model.ImplementerFIO, model.Id);
-            var element = _implementerStorage.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<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ImplementerFIO: {ImplementerFIO}. Id:{ Id}", model?.ImplementerFIO, model?.Id);
-            var list = model == null ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public bool Update(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        private void CheckModel(ImplementerBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (!withParams)
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(model.ImplementerFIO))
-            {
-                throw new ArgumentNullException("Нет ФИО исполнителя",
-               nameof(model.ImplementerFIO));
-            }
-
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля пользователя",
-               nameof(model.Password));
-            }
-
-            if (model.WorkExperience < 0)
-            {
-                throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience));
-            }
-            if (model.Qualification < 0)
-            {
-                throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification));
-            }
-
-            _logger.LogInformation("Implementer. ImplementerFIO:{ImplementerFIO}. Id: { Id}", model.ImplementerFIO, model.Id);
-            var element = _implementerStorage.GetElement(new ImplementerSearchModel { ImplementerFIO = model.ImplementerFIO });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Исполнитель с таким логином уже есть");
-            }
-        }
-    }
-}

FurnitureAssemblyBusinessLogic/BusinessLogics/MailKitWorker.cs

@@ -1,82 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using MailKit.Net.Pop3;
-using MailKit.Security;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Mail;
-using System.Security.Authentication;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyBusinessLogic.BusinessLogics
-{
-    public class MailKitWorker : AbstractMailWorker
-    {
-        public MailKitWorker(Microsoft.Extensions.Logging.ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
-        protected override async Task SendMailAsync(MailSendInfoBindingModel
-       info)
-        {
-            using var objMailMessage = new MailMessage();
-            using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
-            try
-            {
-                objMailMessage.From = new MailAddress(_mailLogin);
-                objMailMessage.To.Add(new MailAddress(info.MailAddress));
-                objMailMessage.Subject = info.Subject;
-                objMailMessage.Body = info.Text;
-                objMailMessage.SubjectEncoding = Encoding.UTF8;
-                objMailMessage.BodyEncoding = Encoding.UTF8;
-                objSmtpClient.UseDefaultCredentials = false;
-                objSmtpClient.EnableSsl = true;
-                objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
-                objSmtpClient.Credentials = new NetworkCredential(_mailLogin,
-               _mailPassword);
-                await Task.Run(() => objSmtpClient.Send(objMailMessage));
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-        protected override async Task<List<MessageInfoBindingModel>>
-       ReceiveMailAsync()
-        {
-            var list = new List<MessageInfoBindingModel>();
-            using var client = new Pop3Client();
-            await Task.Run(() =>
-            {
-                try
-                {
-                    client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
-                    client.Authenticate(_mailLogin, _mailPassword);
-                    for (int i = 0; i < client.Count; i++)
-                    {
-                        var message = client.GetMessage(i);
-                        foreach (var mail in message.From.Mailboxes)
-                        {
-                            list.Add(new MessageInfoBindingModel
-                            {
-                                DateDelivery = message.Date.DateTime,
-                                MessageId = message.MessageId,
-                                SenderName = mail.Address,
-                                Subject = message.Subject,
-                                Body = message.TextBody
-                            });
-                        }
-                    }
-                }
-                catch (System.Security.Authentication.AuthenticationException)
-                { }
-                finally
-                {
-                    client.Disconnect(true);
-                }
-            });
-            return list;
-        }
-
-    }
-}

FurnitureAssemblyBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -1,49 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.SearchModels;
-using FurnitureAssemblyContracts.StoragesContracts;
-using FurnitureAssemblyContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyBusinessLogic.BusinessLogics
-{
-    public class MessageInfoLogic : IMessageInfoLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoStorage _messageInfoStorage;
-
-        public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageInfoStorage)
-        {
-            _logger = logger;
-            _messageInfoStorage = messageInfoStorage;
-        }
-
-        public bool Create(MessageInfoBindingModel model)
-        {
-            if (_messageInfoStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ClientId:{ClientId}. MessageId:{ MessageId}", model?.ClientId, model?.MessageId);
-            var list = model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-    }
-}

FurnitureAssemblyBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -17,79 +17,58 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly AbstractMailWorker _mailWorker;
-        private readonly IClientLogic _clientLogic;
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IClientLogic clientLogic, AbstractMailWorker abstractMailWorker)
+        private readonly IShopLogic _shopLogic;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _clientLogic = clientLogic;
-            _mailWorker = abstractMailWorker;
-        }
-        private bool ChangeStatus(OrderBindingModel model, OrderStatus orderStatus)
-        {
-            if (model.Status + 1 != orderStatus)
-            {
-                return false;
-            }
-            model.Status = orderStatus;
-            SendMail(model.ClientId, $"Статус заказа {model.Id} изменен", $"Заказ {model.Id} переведен в статус {model.Status}");
-            return true;
+            _shopLogic = shopLogic;
         }
+
         public bool CreateOrder(OrderBindingModel model)
         {
             CheckModel(model);
             if (model.Status != OrderStatus.Неизвестен) return false;
             model.Status = OrderStatus.Принят;
-            var order = _orderStorage.Insert(model);
-            if (order == null) { 
+            if (_orderStorage.Insert(model) == null)
+            {
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
-            SendMail(model.ClientId, $"Создание заказа {order.Id}", $"Заказ под номером {order.Id} создан {model.DateCreate}");
             return true;
         }
 
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            var modelNew = ReadElement(new OrderSearchModel { Id = model.Id }); // в связи с обновлением контракта, предыдущий метод не нужен
-            if (modelNew == null)
+            CheckModel(model);
+            if (model.Status != OrderStatus.Готов) return false;
+            if (!_shopLogic.AddFurnituresAtShops(new FurnitureBindingModel() { Id = model.FurnitureId }, model.Count))
             {
+                _logger.LogWarning("There are not empty places at shops. Replenishment is impossible");
                 return false;
             }
-            model.Id = modelNew.Id;
-            model.Status = modelNew.Status;
-            model.ClientId = modelNew.ClientId;
-            model.ImplementerId = modelNew.ImplementerId;
-            model.DateImplement = modelNew.DateImplement;
-            if (!ChangeStatus(model, OrderStatus.Выдан))
+            model.Status = OrderStatus.Выдан;
+            model.DateImplement = DateTime.Now;
+            if (_orderStorage.Update(model) == null)
             {
-                _logger.LogWarning("Order's status is wrong");
+                _logger.LogWarning("Update operation failed");
                 return false;
             }
-
-            _orderStorage.Update(model);
+            
             return true;
         }
 
         public bool FinishOrder(OrderBindingModel model)
         {
-            var modelNew = ReadElement(new OrderSearchModel { Id = model.Id });
-            if (modelNew == null)
+            CheckModel(model);
+            if (model.Status != OrderStatus.Выполняется) return false;
+
+            model.Status = OrderStatus.Готов;
+            if (_orderStorage.Update(model) == null)
             {
+                _logger.LogWarning("Update operation failed");
                 return false;
             }
-            model.Id = modelNew.Id;
-            model.Status = modelNew.Status;
-            model.ClientId = modelNew.ClientId;
-            model.ImplementerId = modelNew.ImplementerId;
-            if (!ChangeStatus(model, OrderStatus.Готов))
-            {
-                _logger.LogWarning("Order's status is wrong");
-                return false;
-            }
-            model.DateImplement = DateTime.Now;
-            _orderStorage.Update(model);
             return true;
         }
 
@@ -108,20 +87,14 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
 
         public bool TakeOrderInWork(OrderBindingModel model)
         {
-            var modelNew = ReadElement(new OrderSearchModel { Id = model.Id }); 
-            if (modelNew == null)
+            CheckModel(model);
+            if (model.Status != OrderStatus.Принят) return false;
+            model.Status = OrderStatus.Выполняется;
+            if (_orderStorage.Update(model) == null)
             {
+                _logger.LogWarning("Update operation failed");
                 return false;
             }
-            model.Status = modelNew.Status;
-            model.ClientId = modelNew.ClientId;
-            model.Id = modelNew.Id;
-            if (!ChangeStatus(model, OrderStatus.Выполняется))
-            {
-                _logger.LogWarning("Order's status is wrong");
-                return false;
-            }
-            _orderStorage.Update(model);
             return true;
         }
 
@@ -154,37 +127,6 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
 
             _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. PackageId: { PackageId}", model.Id, model.Sum, model.FurnitureId);
         }
-        public OrderViewModel? ReadElement(OrderSearchModel? model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. Status: {Status}. ImplementerId: {ImplementerId} Id:{ Id}", model.Status, model.ImplementerId, model.Id);
-            var element = _orderStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-        private bool SendMail(int clientId, string subject, string text)
-        {
-            var client = _clientLogic.ReadElement(new() { Id = clientId });
-            if (client == null)
-            {
-                _logger.LogWarning("Email sending failed. Client with id {Id} not found", clientId);
-                return false;
-            }
-            _mailWorker.MailSendAsync(new MailSendInfoBindingModel()
-            {
-                Subject = subject,
-                Text = text,
-                MailAddress = client.Email
-            });
-            return true;
-        }
+
     }
 }

FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -15,21 +15,21 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
 {
     public class ReportLogic : IReportLogic
     {
-        private readonly IComponentStorage _componentStorage;
         private readonly IFurnitureStorage _furnitureStorage;
         private readonly IOrderStorage _orderStorage;
+        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
-        public ReportLogic(IFurnitureStorage furnitureStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, 
-            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        public ReportLogic(IFurnitureStorage furnitureStorage, IOrderStorage orderStorage,
+            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf, IShopStorage shopStorage)
         {
             _furnitureStorage = furnitureStorage;
-            _componentStorage = componentStorage;
             _orderStorage = orderStorage;
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
+            _shopStorage = shopStorage;
         }
         /// <summary>
         /// Получение списка компонент с указанием, в каких изделиях используются
@@ -38,7 +38,6 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
         public List<ReportFurnitureComponentViewModel> GetFurnitureComponent()
         {
             var furnitures = _furnitureStorage.GetFullList();
-            var components = _componentStorage.GetFullList();
             var list = new List<ReportFurnitureComponentViewModel>();
             foreach (var furniture in furnitures)
             {
@@ -48,13 +47,10 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
                     Components = new List<Tuple<string, int>>(),
                     TotalCount = 0
                 };
-                foreach (var component in components)
+                foreach (var componentCount in furniture.FurnitureComponents.Values)
                 {
-                    if (furniture.FurnitureComponents.ContainsKey(component.Id))
-                    {
-                        record.Components.Add(new Tuple<string, int>(component.ComponentName, furniture.FurnitureComponents[component.Id].Item2));
-                        record.TotalCount += furniture.FurnitureComponents[component.Id].Item2;
-                    }
+                    record.Components.Add(new Tuple<string, int>(componentCount.Item1.ComponentName, componentCount.Item2));
+                    record.TotalCount += componentCount.Item2;
                 }
                 list.Add(record);
             }
@@ -88,7 +84,7 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
         /// <param name="model"></param>
         public void SaveFurnituresToWordFile(ReportBindingModel model)
         {
-            _saveToWord.CreateDoc(new WordInfo
+            _saveToWord.CreateDoc(new WordInfoFurnitures
             {
                 FileName = model.FileName,
                 Title = "Список изделий",
@@ -101,7 +97,7 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
         /// <param name="model"></param>
         public void SaveFurnitureComponentToExcelFile(ReportBindingModel model)
         {
-            _saveToExcel.CreateReport(new ExcelInfo
+            _saveToExcel.CreateReport(new ExcelInfoFurnitures
             {
                 FileName = model.FileName,
                 Title = "Список изделий",
@@ -114,7 +110,7 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
         /// <param name="model"></param>
         public void SaveOrdersToPdfFile(ReportBindingModel model)
         {
-            _saveToPdf.CreateDoc(new PdfInfo
+            _saveToPdf.CreateDoc(new PdfInfoOrders
             {
                 FileName = model.FileName,
                 Title = "Список заказов",
@@ -123,5 +119,69 @@ namespace FurnitureAssemblyBusinessLogic.BusinessLogics
                 Orders = GetOrders(model)
             });
         }
+        /// <summary>
+        /// Сохранение магазинов в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveShopsToWordFile(ReportBindingModel model)
+        {
+            _saveToWord.CreateTableDoc(new WordInfoShops
+            {
+                FileName = model.FileName,
+                Title = "Список магазинов",
+                Shops = _shopStorage.GetFullList()
+            });
+        }
+
+        public void SaveShopFurnituresToExcelFile(ReportBindingModel model)
+        {
+            _saveToExcel.CreateReport(new ExcelInfoShops
+            {
+                FileName = model.FileName,
+                Title = "Список магазинов с изделиями",
+                ShopFurnitures = GetShopFurnitures()
+            });
+        }
+
+        public List<ReportShopFurnituresViewModel> GetShopFurnitures()
+        {
+            var shops = _shopStorage.GetFullList();
+            var list = new List<ReportShopFurnituresViewModel>();
+            foreach (var shop in shops)
+            {
+                var record = new ReportShopFurnituresViewModel
+                {
+                    ShopName = shop.ShopName,
+                    Furnitures = new List<Tuple<string, int>>(),
+                    TotalCount = 0
+                };
+                foreach (var furnitureCount in shop.Furnitures.Values)
+                {
+                    record.Furnitures.Add(new Tuple<string, int>(furnitureCount.Item1.FurnitureName, furnitureCount.Item2));
+                    record.TotalCount += furnitureCount.Item2;
+                }
+                list.Add(record);
+            }
+            return list;
+        }
+
+        public List<ReportCountOrdersViewModel> GetCountOrders()
+        {
+            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportCountOrdersViewModel
+            {
+                DateCreate = x.Key,
+                CountOrders = x.Count(),
+                TotalSumOrders = x.Sum(y => y.Sum)
+            }).ToList();
+        }
+        public void SaveCountOrdersToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateDoc(new PdfInfoCountOrders
+            {
+                FileName = model.FileName,
+                Title = "Список объединенных по дате заказов",
+                CountOrders = GetCountOrders()
+            });
+        }
     }
 }

FurnitureAssemblyBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,208 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.StoragesContracts;
+using FurnitureAssemblyContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.BusinessLogics
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+        private readonly IFurnitureStorage _furnitureStorage;
+
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IFurnitureStorage furnitureStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+            _furnitureStorage = furnitureStorage;
+        }
+        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 Create(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert 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;
+        }
+
+        public bool Update(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update 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));
+            }
+            if (model.DateOpening.Equals(null))
+            {
+                throw new ArgumentNullException("Нет даты открытия магазина", nameof(model.DateOpening));
+            }
+            if (model.MaxCount <= 0)
+            {
+                throw new ArgumentNullException("Нет вместимости магазина", nameof(model.DateOpening));
+            }
+            _logger.LogInformation("Shop. ShopName:{ShopName}. Address:{ Address}. DateOpening:{ DateOpening}. Id: { Id}", model.ShopName, model.Address, model.DateOpening, model.Id);
+            var element = _shopStorage.GetElement(new ShopSearchModel { ShopName = model.ShopName });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+
+        public bool AddFurniture(ShopBindingModel model, FurnitureBindingModel furnitureModel, int count)
+        {
+            var shop = _shopStorage.GetElement(new ShopSearchModel { Id = model.Id });
+            var furniture = _furnitureStorage.GetElement(new FurnitureSearchModel { Id = furnitureModel.Id });
+
+            if (shop == null || furniture == null)
+            {
+                return false;
+            }
+            if (GetCountFreePlaces(model.Id) < count)
+            {
+                return false;
+            }
+            if (shop.Furnitures.ContainsKey(furniture.Id))
+            {
+                int prev_count = shop.Furnitures[furniture.Id].Item2;
+                shop.Furnitures[furniture.Id] = (furniture, prev_count + count);
+            }
+            else
+            {
+                shop.Furnitures[furniture.Id] = (furniture, count);
+            }
+            model.Furnitures = shop.Furnitures;
+            model.DateOpening = shop.DateOpening;
+            model.Address = shop.Address;
+            model.MaxCount = shop.MaxCount;
+            model.ShopName = shop.ShopName;
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Replenishment operation failed");
+                return false;
+            }
+            return true;
+        }
+        private int GetCountFreePlaces(int ShopId)
+        {
+            var shop = ReadElement(new ShopSearchModel { Id = ShopId });
+            if (shop == null)
+                return 0;
+            int count = shop.MaxCount;
+            foreach (var f in shop.Furnitures)
+            {
+                count -= f.Value.Item2;
+                if (count <= 0)
+                {
+                    return 0;
+                }
+            }
+            return count;
+        }
+
+        private int GetCountFreePlaces_All()
+        {
+            return _shopStorage.GetFullList().Select(x => GetCountFreePlaces(x.Id)).Sum();
+        }
+
+        public bool AddFurnituresAtShops(FurnitureBindingModel furnitureModel, int count)
+        {
+            if (GetCountFreePlaces_All() < count)
+            {
+                return false;
+            }
+
+            foreach (var shop in _shopStorage.GetFullList())
+            {
+                int countShop = GetCountFreePlaces(shop.Id);
+                if (countShop >= count)
+                {
+                    AddFurniture(new() { Id = shop.Id }, furnitureModel, count);
+                    break;
+                }
+                else
+                {
+                    AddFurniture(new() { Id = shop.Id }, furnitureModel, countShop);
+                }
+                count -= countShop;
+            }
+            return true;
+        }
+        public bool Sell(FurnitureBindingModel furnitureBindingModel, int count)
+        {
+            return _shopStorage.Sell(furnitureBindingModel, count);
+        }
+    }
+}

FurnitureAssemblyBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -1,156 +0,0 @@
-using AbstractFurnitureAssemblyDataModels.Enums;
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.BusinessLogicsContracts;
-using FurnitureAssemblyContracts.SearchModels;
-using FurnitureAssemblyContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyBusinessLogic.BusinessLogics
-{
-    public class WorkModeling : IWorkProcess
-    {
-        private readonly ILogger _logger;
-        private readonly Random _rnd;
-        private IOrderLogic? _orderLogic;
-        public WorkModeling(ILogger<WorkModeling> logger)
-        {
-            _logger = logger;
-            _rnd = new Random(1000);
-        }
-        public void DoWork(IImplementerLogic implementerLogic, IOrderLogic
-       orderLogic)
-        {
-            _orderLogic = orderLogic;
-            var implementers = implementerLogic.ReadList(null);
-            if (implementers == null)
-            {
-                _logger.LogWarning("DoWork. Implementers is null");
-                return;
-            }
-            var orders = _orderLogic.ReadList(new OrderSearchModel
-            {
-                Status = OrderStatus.Принят
-            });
-            if (orders == null || orders.Count == 0)
-            {
-                _logger.LogWarning("DoWork. Orders is null or empty");
-                return;
-            }
-            _logger.LogDebug("DoWork for {Count} orders", orders.Count);
-
-            foreach (var implementer in implementers)
-            {
-                Task.Run(() => WorkerWorkAsync(implementer, orders));
-               
-            }
-        }
-        /// <summary>
-        /// Иммитация работы исполнителя
-        /// </summary>
-        /// <param name="implementer"></param>
-        /// <param name="orders"></param>
-        private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            
-            await Task.Run(() =>
-            {
-                foreach (var order in orders)
-                {
-                    try
-                    {
-                        RunOrderInWork(implementer);
-                        _logger.LogDebug("DoWork. Worker {Id} try get order { Order}", implementer.Id, order.Id);
-                        // пытаемся назначить заказ на исполнителя
-                        _orderLogic.TakeOrderInWork(new OrderBindingModel
-                        {
-                            Id = order.Id,
-                            ImplementerId = implementer.Id
-                        });
-                        // делаем работу
-                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(50,
-                        1000) * order.Count);
-                        _logger.LogDebug("DoWork. Worker {Id} finish order{ Order} ", implementer.Id, order.Id);
-                        _orderLogic.FinishOrder(new OrderBindingModel
-                        {
-                            Id = order.Id,
-                            ImplementerId = implementer.Id
-                        });
-                        // отдыхаем
-                        Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-                        
-                    }
-                    // кто-то мог уже перехватить заказ, игнорируем ошибку
-                    catch (InvalidOperationException ex)
-                    {
-                        _logger.LogWarning(ex, "Error try get work");
-                    }
-                    // заканчиваем выполнение имитации в случае иной ошибки
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error while do work");
-                        throw;
-                    }
-                    
-                    
-                }
-            });
-        }
-        /// <summary>
-        /// Ищем заказ, которые уже в работе (вдруг исполнителя прервали)
-        /// </summary>
-        /// <param name="implementer"></param>
-        /// <returns></returns>
-        private async Task RunOrderInWork(ImplementerViewModel implementer)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            try
-            {
-                var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
-                {
-                    ImplementerId = implementer.Id,
-                    Status = OrderStatus.Выполняется
-                }));
-                if (runOrder == null)
-                {
-                    return;
-                }
-                _logger.LogDebug("DoWork. Worker {Id} back to order {Order}",
-               implementer.Id, runOrder.Id);
-                // доделываем работу
-                Thread.Sleep(implementer.WorkExperience * _rnd.Next(50, 300) *
-               runOrder.Count);
-                _logger.LogDebug("DoWork. Worker {Id} finish order {Order}",
-               implementer.Id, runOrder.Id);
-                _orderLogic.FinishOrder(new OrderBindingModel
-                {
-                    Id = runOrder.Id,
-                    ImplementerId = implementer.Id
-                });
-                // отдыхаем
-                Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-            }
-            // заказа может не быть, просто игнорируем ошибку
-            catch (InvalidOperationException ex)
-            {
-                _logger.LogWarning(ex, "Error try get work");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error while do work");
-                throw;
-            }
-        }
-    }
-}

FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj

@@ -4,12 +4,10 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <BaseOutputPath>bin\</BaseOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
-    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>

FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -30,6 +30,19 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
                 CellToName = "C1"
             });
             uint rowIndex = 2;
+            if (info is ExcelInfoFurnitures infoFurnitures)
+            {
+                CreateExcelCellsFurnitures(infoFurnitures, rowIndex);
+            }
+            else if (info is ExcelInfoShops infoShops)
+            {
+                CreateExcelCellsShops(infoShops, rowIndex);
+            }
+
+            SaveExcel(info);
+        }
+        private void CreateExcelCellsFurnitures(ExcelInfoFurnitures info, uint rowIndex)
+        {
             foreach (var pc in info.FurnitureComponents)
             {
                 InsertCellInWorksheet(new ExcelCellParameters
@@ -76,8 +89,58 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
                 });
                 rowIndex++;
             }
-            SaveExcel(info);
         }
+
+        private void CreateExcelCellsShops(ExcelInfoShops info, uint rowIndex)
+        {
+            foreach (var sF in info.ShopFurnitures)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = sF.ShopName,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+                foreach (var furniture in sF.Furnitures)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "B",
+                        RowIndex = rowIndex,
+                        Text = furniture.Item1,
+                        StyleInfo =
+                    ExcelStyleInfoType.TextWithBroder
+                    });
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "C",
+                        RowIndex = rowIndex,
+                        Text = furniture.Item2.ToString(),
+                        StyleInfo =
+                    ExcelStyleInfoType.TextWithBroder
+                    });
+                    rowIndex++;
+                }
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = "Итого",
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "C",
+                    RowIndex = rowIndex,
+                    Text = sF.TotalCount.ToString(),
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+            }
+        }
+
         /// <summary>
         /// Создание excel-файла
         /// </summary>

FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -19,11 +19,26 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-            CreateParagraph(new PdfParagraph
+
+            if (info is PdfInfoOrders infoOrders)
             {
-                Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+                CreateParagraph(new PdfParagraph
+                {
+                    Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }",
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Center
+                });
+                CreateDocOrders(infoOrders);
+            }
+            else if (info is PdfInfoCountOrders countOrders)
+            {
+                CreateDocCountOrders(countOrders);
+            }
+            SavePdf(info);
+        }
+
+        private void CreateDocOrders(PdfInfoOrders info)
+        {
             CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
             CreateRow(new PdfRowParameters
             {
@@ -47,7 +62,33 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
                 ParagraphAlignment =
            PdfParagraphAlignmentType.Right
             });
-            SavePdf(info);
+        }
+
+        private void CreateDocCountOrders(PdfInfoCountOrders info)
+        {
+            CreateTable(new List<string> { "3cm", "3cm", "7cm" });
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Дата заказа", "Количество заказов", "Сумма" },
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            foreach (var order in info.CountOrders)
+            {
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { order.DateCreate.ToShortDateString(), order.CountOrders.ToString(), order.TotalSumOrders.ToString() },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left
+                });
+            }
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"Итого: {info.CountOrders.Sum(x => x.TotalSumOrders)}\t",
+                Style = "Normal",
+                ParagraphAlignment =
+           PdfParagraphAlignmentType.Right
+            });
         }
         /// <summary>
         /// Создание doc-файла

FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -6,6 +6,49 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
+        public void CreateTableDoc(WordInfo wordInfo)
+        {
+            CreateWord(wordInfo);
+            CreateParagraph(new WordParagraph
+            {
+                Texts = new List<(string, WordTextProperties)> { (wordInfo.Title, new WordTextProperties { Bold = true, Size = "24", }) },
+                TextProperties = new WordTextProperties
+                {
+                    Size = "24",
+                    JustificationType = WordJustificationType.Center
+                }
+            });
+            WordTable wordTable = new();
+            if (wordInfo is WordInfoShops infoShops)
+            {
+                wordTable = CreateTableDocShops(infoShops);
+            }
+            CreateTable(wordTable);
+
+            SaveWord(wordInfo);
+
+        }
+        private WordTable CreateTableDocShops(WordInfoShops wordInfo)
+        {
+            var list = new List<string>();
+            foreach (var shop in wordInfo.Shops)
+            {
+                list.Add(shop.ShopName);
+                list.Add(shop.Address);
+                list.Add(shop.DateOpening.ToString());
+            }
+
+            var wordTable = new WordTable
+            {
+                Headers = new List<string> {
+                    "Название",
+                    "Адрес",
+                    "Дата открытия"},
+                Texts = list
+            };
+            return wordTable;
+        }
+
         public void CreateDoc(WordInfo info)
         {
             CreateWord(info);
@@ -18,20 +61,23 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
                     JustificationType = WordJustificationType.Center
                 }
             });
-            foreach (var furniture in info.Furnitures)
+            if (info is WordInfoFurnitures infoFurnitures)
             {
-                CreateParagraph(new WordParagraph
+                foreach (var furniture in infoFurnitures.Furnitures)
                 {
-                    Texts = new List<(string, WordTextProperties)> { (furniture.FurnitureName, 
-                    new WordTextProperties { Size = "24", Bold=true}), 
-                        (" - " + furniture.Price.ToString(), new WordTextProperties { Size = "24", }) },
-                    TextProperties = new WordTextProperties
+                    CreateParagraph(new WordParagraph
                     {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-                
+                        Texts = new List<(string, WordTextProperties)> { (furniture.FurnitureName,
+                            new WordTextProperties { Size = "24", Bold=true}), (" - " + furniture.Price.ToString(),
+                            new WordTextProperties { Size = "24", }) },
+                        TextProperties = new WordTextProperties
+                        {
+                            Size = "24",
+                            JustificationType = WordJustificationType.Both
+                        }
+                    });
+
+                }
             }
             SaveWord(info);
         }
@@ -40,6 +86,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage
         /// </summary>
         /// <param name="info"></param>
         protected abstract void CreateWord(WordInfo info);
+        protected abstract void CreateTable(WordTable info);
         /// <summary>
         /// Создание абзаца с текстом
         /// </summary>

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/ExcelInfoFurnitures.cs

@@ -0,0 +1,19 @@
+using FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels;
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelInfoFurnitures : ExcelInfo
+    {
+        public List<ReportFurnitureComponentViewModel> FurnitureComponents
+        {
+            get;
+            set;
+        } = new();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/ExcelInfoShops.cs

@@ -0,0 +1,19 @@
+using FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels;
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelInfoShops : ExcelInfo
+    {
+        public List<ReportShopFurnituresViewModel> ShopFurnitures
+        {
+            get;
+            set;
+        } = new();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/PdfInfoCountOrders.cs

@@ -0,0 +1,15 @@
+using FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels;
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfInfoCountOrders : PdfInfo
+    {
+        public List<ReportCountOrdersViewModel> CountOrders { get; set; } = new();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/PdfInfoOrders.cs

@@ -0,0 +1,15 @@
+using FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels;
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfInfoOrders : PdfInfo
+    {
+        public List<ReportOrdersViewModel> Orders { get; set; } = new();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordInfoFurnitures.cs

@@ -0,0 +1,14 @@
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordInfoFurnitures : WordInfo
+    {
+        public List<FurnitureViewModel> Furnitures { get; set; } = new();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordInfoShops.cs

@@ -0,0 +1,14 @@
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordInfoShops : WordInfo
+    {
+        public List<ShopViewModel> Shops { get; set; } = new();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordTable.cs

@@ -0,0 +1,12 @@
+
+
+using FurnitureAssemblyContracts.ViewModels;
+
+namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels
+{
+	public class WordTable
+	{
+        public List<string> Headers { get; set; } = new();
+        public List<string> Texts { get; set; } = new ();
+    }
+}

FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -122,5 +122,90 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.Implements
             _wordDocument.MainDocumentPart!.Document.Save();
             _wordDocument.Close();
         }
+
+        protected override void CreateTable(WordTable table)
+        {
+            if (_docBody == null || table == null)
+            {
+                return;
+            }
+            Table tab = new Table();
+            TableProperties props = new TableProperties(
+               new TableBorders(
+                   new TopBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new BottomBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new LeftBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new RightBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new InsideHorizontalBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new InsideVerticalBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   }
+                   )
+            );
+            tab.AppendChild<TableProperties>(props);
+            // разметка сетки таблицы
+            TableGrid tableGrid = new TableGrid();
+            for (int i = 0; i < table.Headers.Count; i++)
+            {
+                tableGrid.AppendChild(new GridColumn());
+            }
+            tab.AppendChild(tableGrid);
+            TableRow tableRow = new TableRow();
+            // заполнение заголовков
+            foreach (var text in table.Headers)
+            {
+                tableRow.AppendChild(CreateTableCell(text));
+            }
+            tab.AppendChild(tableRow);
+            // заполнение содержимым
+            int height = table.Texts.Count / table.Headers.Count;
+            int width = table.Headers.Count;
+            for (int i = 0; i < height; i++)
+            {
+                tableRow = new TableRow();
+                for (int j = 0; j < width; j++)
+                {
+                    var element = table.Texts[i * table.Headers.Count + j];
+                    tableRow.AppendChild(CreateTableCell(element));
+                }
+                tab.AppendChild(tableRow);
+            }
+
+            _docBody.AppendChild(tab);
+
+        }
+
+        private TableCell CreateTableCell(string element)
+        {
+            var tableParagraph = new Paragraph();
+            var run = new Run();
+            run.AppendChild(new Text { Text = element });
+            tableParagraph.AppendChild(run);
+            var tableCell = new TableCell();
+            tableCell.AppendChild(tableParagraph);
+            return tableCell;
+        }
     }
 }

FurnitureAssemblyClientApp/Controllers/HomeController.cs

@@ -145,15 +145,5 @@ namespace FurnitureAssemblyClientApp.Controllers
             );
             return count * (prod?.Price ?? 1);
         }
-        [HttpGet]
-        public IActionResult Mails()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={ APIClient.Client.Id}"));
-
-        }
     }
 }

FurnitureAssemblyClientApp/FurnitureAssemblyClientApp.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <BaseOutputPath>bin\</BaseOutputPath>
   </PropertyGroup>
 
   <ItemGroup>

FurnitureAssemblyClientApp/Views/Home/Mails.cshtml

@@ -1,43 +0,0 @@
-@using FurnitureAssemblyContracts.ViewModels
-@model List<MessageInfoViewModel>
-@{
-ViewData["Title"] = "Mails";
-}
-<div class="text-center">
-	<h1 class="display-4">Заказы</h1>
-</div>
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
-		<table class="table">
-			<thead>
-				<tr>
-					<th>Дата письма</th>
-					<th>Заголовок</th>
-					<th>Текст</th>
-				</tr>
-			</thead>
-			<tbody>
-			@foreach (var item in Model)
-			{
-			<tr>
-				<td>
-					@Html.DisplayFor(modelItem =>
-					item.DateDelivery)
-				</td>
-			<td>
-				@Html.DisplayFor(modelItem => item.Subject)
-			</td>
-			<td>
-				@Html.DisplayFor(modelItem =>item.Body)
-			</td>
-			</tr>
-			}
-			</tbody>
-		</table>
-	}
-</div>

FurnitureAssemblyClientApp/Views/Shared/_Layout.cshtml

@@ -26,9 +26,6 @@
                         </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
-                        </li>
-                         <li class="nav-item">
-                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Mails">Письма</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>

FurnitureAssemblyContracts/Attributes/ColumnAttribute.cs

@@ -1,24 +0,0 @@
-using System;
-
-namespace FurnitureAssemblyContracts.Attributes
-{
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ColumnAttribute : Attribute
-    {
-        public ColumnAttribute(string title = "", bool visible = true, int width
-       = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool
-       isUseAutoSize = false)
-        {
-            Title = title;
-            Visible = visible;
-            Width = width;
-            GridViewAutoSize = gridViewAutoSize;
-            IsUseAutoSize = isUseAutoSize;
-        }
-        public string Title { get; private set; }
-        public bool Visible { get; private set; }
-        public int Width { get; private set; }
-        public GridViewAutoSize GridViewAutoSize { get; private set; }
-        public bool IsUseAutoSize { get; private set; }
-    }
-}

FurnitureAssemblyContracts/Attributes/GridViewAutoSize.cs

@@ -1,14 +0,0 @@
-namespace FurnitureAssemblyContracts.Attributes
-{
-    public enum GridViewAutoSize
-    {
-        NotSet = 0,
-        None = 1,
-        ColumnHeader = 2,
-        AllCellsExceptHeader = 4,
-        AllCells = 6,
-        DisplayedCellsExceptHeader = 8,
-        DisplayedCells = 10,
-        Fill = 16
-    }
-}

FurnitureAssemblyContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BindingModels
-{
-    public class BackUpSaveBinidngModel
-    {
-        public string FolderName { get; set; } = string.Empty;
-    }
-}

FurnitureAssemblyContracts/BindingModels/FurnitureBindingModel.cs

@@ -10,7 +10,7 @@ namespace FurnitureAssemblyContracts.BindingModels
     public class FurnitureBindingModel : IFurnitureModel
     {
         public int Id { get; set; }
-        public string FurnitureName { get; set; } //= string.Empty;
+        public string FurnitureName { get; set; } = string.Empty;
         public double Price { get; set; }
         public Dictionary<int, (IComponentModel, int)> FurnitureComponents {get; set;} = new();
     }

FurnitureAssemblyContracts/BindingModels/ImplementerBindingModel.cs

@@ -1,21 +0,0 @@
-using FurnitureAssemblyDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BindingModels
-{
-    public class ImplementerBindingModel : IImplementerModel
-    {
-        public int Id { get; set; }
-        public string ImplementerFIO { get; set; } = string.Empty;
-
-        public string Password { get; set; } = string.Empty;
-
-        public int WorkExperience { get; set; }
-
-        public int Qualification { get; set; }
-    }
-}

FurnitureAssemblyContracts/BindingModels/MailConfigBindingModel.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BindingModels
-{
-    public class MailConfigBindingModel
-    {
-        public string MailLogin { get; set; } = string.Empty;
-        public string MailPassword { get; set; } = string.Empty;
-        public string SmtpClientHost { get; set; } = string.Empty;
-        public int SmtpClientPort { get; set; }
-        public string PopHost { get; set; } = string.Empty;
-        public int PopPort { get; set; }
-
-    }
-}

FurnitureAssemblyContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BindingModels
-{
-    public class MailSendInfoBindingModel
-    {
-        public string MailAddress { get; set; } = string.Empty;
-        public string Subject { get; set; } = string.Empty;
-        public string Text { get; set; } = string.Empty;
-    }
-}

FurnitureAssemblyContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,26 +0,0 @@
-using FurnitureAssemblyDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BindingModels
-{
-    public class MessageInfoBindingModel : IMessageInfoModel
-    {
-        public string MessageId { get; set; } = string.Empty;
-
-        public int? ClientId { get; set; }
-
-        public string SenderName { get; set; } = string.Empty;
-
-        public DateTime DateDelivery { get; set; }
-
-        public string Subject { get; set; } = string.Empty;
-
-        public string Body { get; set; } = string.Empty;
-
-        public int Id => throw new NotImplementedException();
-    }
-}

FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs

@@ -18,6 +18,5 @@ namespace FurnitureAssemblyContracts.BindingModels
         public DateTime DateCreate { get; set; } = DateTime.Now;
         public DateTime? DateImplement { get; set; } = null;
         public int ClientId { get; set; }
-        public int? ImplementerId { get; set; }
     }
 }

FurnitureAssemblyContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,25 @@
+using AbstractFurnitureAssemblyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyContracts.BindingModels
+{
+    public class ShopBindingModel : IShopModel
+    {
+        public int Id { get; set; }
+        public string ShopName { get; set; } = string.Empty;
+
+        public string Address { get; set; } = string.Empty;
+
+        public DateTime DateOpening { get; set; }
+
+        public Dictionary<int, (IFurnitureModel, int)> Furnitures { get; set; } = new();
+
+        public int MaxCount { get; set; }
+
+
+    }
+}

FurnitureAssemblyContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -1,14 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BusinessLogicsContracts
-{
-    public interface IBackUpLogic
-    {
-        void CreateBackUp(BackUpSaveBinidngModel model);
-    }
-}

FurnitureAssemblyContracts/BusinessLogicsContracts/IImplementerLogic.cs

@@ -1,20 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.SearchModels;
-using FurnitureAssemblyContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BusinessLogicsContracts
-{
-    public interface IImplementerLogic
-    {
-        List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model);
-        ImplementerViewModel? ReadElement(ImplementerSearchModel model);
-        bool Create(ImplementerBindingModel model);
-        bool Update(ImplementerBindingModel model);
-        bool Delete(ImplementerBindingModel model);
-    }
-}

FurnitureAssemblyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -1,17 +0,0 @@
-using FurnitureAssemblyContracts.BindingModels;
-using FurnitureAssemblyContracts.SearchModels;
-using FurnitureAssemblyContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BusinessLogicsContracts
-{
-    public interface IMessageInfoLogic
-    {
-        List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
-        bool Create(MessageInfoBindingModel model);
-    }
-}

FurnitureAssemblyContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -12,7 +12,6 @@ namespace FurnitureAssemblyContracts.BusinessLogicsContracts
     public interface IOrderLogic
     {
         List<OrderViewModel>? ReadList(OrderSearchModel? model);
-        OrderViewModel? ReadElement(OrderSearchModel? model);
         bool CreateOrder(OrderBindingModel model);
         bool TakeOrderInWork(OrderBindingModel model);
         bool FinishOrder(OrderBindingModel model);

FurnitureAssemblyContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -31,5 +31,15 @@ namespace FurnitureAssemblyContracts.BusinessLogicsContracts
         /// </summary>
         /// <param name="model"></param>
         void SaveOrdersToPdfFile(ReportBindingModel model);
+        void SaveShopsToWordFile(ReportBindingModel model);
+        void SaveShopFurnituresToExcelFile(ReportBindingModel model);
+        List<ReportShopFurnituresViewModel> GetShopFurnitures();
+        /// <summary>
+        /// Получение объединенных по дате заказов за определенный период
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        List<ReportCountOrdersViewModel> GetCountOrders();
+        void SaveCountOrdersToPdfFile(ReportBindingModel model);
     }
 }

FurnitureAssemblyContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,23 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyContracts.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 AddFurniture(ShopBindingModel model, FurnitureBindingModel furnitureModel, int count);
+        bool AddFurnituresAtShops(FurnitureBindingModel furnitureModel, int count);
+        bool Sell(FurnitureBindingModel furnitureModel, int count);
+    }
+}

FurnitureAssemblyContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.BusinessLogicsContracts
-{
-    public interface IWorkProcess
-    {
-        /// <summary>
-        /// Запуск работ
-        /// </summary>
-        void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
-    }
-}

FurnitureAssemblyContracts/DI/DependencyManager.cs

@@ -1,64 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace FurnitureAssemblyContracts.DI
-{
-    public class DependencyManager
-    {
-        private readonly IDependencyContainer _dependencyManager;
-        private static DependencyManager? _manager;
-        private static readonly object _locjObject = new();
-        private DependencyManager()
-        {
-            _dependencyManager = new ServiceDependencyContainer();
-        }
-        public static DependencyManager Instance
-        {
-            get
-            {
-                if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } }
-                return
-        _manager;
-            }
-        }
-        /// <summary>
-        /// Иницализация библиотек, в которых идут установки зависомстей
-        /// </summary>
-        public static void InitDependency()
-        {
-            var ext = ServiceProviderLoader.GetImplementationExtensions();
-            if (ext == null)
-            {
-                throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
-            }
-            // регистрируем зависимости
-            ext.RegisterServices();
-        }
-        /// <summary>
-        /// Регистрация логгера
-        /// </summary>
-        /// <param name="configure"></param>
-        public void AddLogging(Action<ILoggingBuilder> configure) =>
-        _dependencyManager.AddLogging(configure);
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="U"></typeparam>
-        public void RegisterType<T, U>(bool isSingle = false) where U :
-        class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="U"></typeparam>
-        public void RegisterType<T>(bool isSingle = false) where T : class =>
-        _dependencyManager.RegisterType<T>(isSingle);
-        /// <summary>
-        /// Получение класса со всеми зависмостями
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public T Resolve<T>() => _dependencyManager.Resolve<T>();
-
-    }
-}

FurnitureAssemblyContracts/DI/IDependencyContainer.cs

@@ -1,34 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace FurnitureAssemblyContracts.DI
-{
-    public interface IDependencyContainer
-    {
-        /// <summary>
-        /// Регистрация логгера
-        /// </summary>
-        /// <param name="configure"></param>
-        void AddLogging(Action<ILoggingBuilder> configure);
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="U"></typeparam>
-        /// <param name="isSingle"></param>
-        void RegisterType<T, U>(bool isSingle) where U : class, T where T :
-        class;
-        /// <summary>
-        /// Добавление зависимости
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="isSingle"></param>
-        void RegisterType<T>(bool isSingle) where T : class;
-        /// <summary>
-        /// Получение класса со всеми зависмостями
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        T Resolve<T>();
-
-    }
-}

FurnitureAssemblyContracts/DI/IImplementationExtension.cs

@@ -1,11 +0,0 @@
-namespace FurnitureAssemblyContracts.DI
-{
-    public interface IImplementationExtension
-    {
-        public int Priority { get; }
-        /// <summary>
-        /// Регистрация сервисов
-        /// </summary>
-        public void RegisterServices();
-    }
-}

FurnitureAssemblyContracts/DI/ServiceDependencyContainer.cs

@@ -1,57 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace FurnitureAssemblyContracts.DI
-{
-    public class ServiceDependencyContainer : IDependencyContainer
-    {
-        private ServiceProvider? _serviceProvider;
-
-        private readonly ServiceCollection _serviceCollection;
-
-        public ServiceDependencyContainer()
-        {
-            _serviceCollection = new ServiceCollection();
-        }
-
-        public void AddLogging(Action<ILoggingBuilder> configure)
-        {
-            _serviceCollection.AddLogging(configure);
-        }
-
-        public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
-        {
-            if (isSingle)
-            {
-                _serviceCollection.AddSingleton<T, U>();
-            }
-            else
-            {
-                _serviceCollection.AddTransient<T, U>();
-            }
-            _serviceProvider = null;
-        }
-
-        public void RegisterType<T>(bool isSingle) where T : class
-        {
-            if (isSingle)
-            {
-                _serviceCollection.AddSingleton<T>();
-            }
-            else
-            {
-                _serviceCollection.AddTransient<T>();
-            }
-            _serviceProvider = null;
-        }
-
-        public T Resolve<T>()
-        {
-            if (_serviceProvider == null)
-            {
-                _serviceProvider = _serviceCollection.BuildServiceProvider();
-            }
-            return _serviceProvider.GetService<T>()!;
-        }
-    }
-}

FurnitureAssemblyContracts/DI/ServiceProviderLoader.cs

@@ -1,52 +0,0 @@
-using System.Reflection;
-
-namespace FurnitureAssemblyContracts.DI
-{
-    public static partial class ServiceProviderLoader
-    {
-        /// <summary>
-        /// Загрузка всех классов-реализаций IImplementationExtension
-        /// </summary>
-        /// <returns></returns>
-        public static IImplementationExtension? GetImplementationExtensions()
-        {
-            IImplementationExtension? source = null;
-            var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll",
-            SearchOption.AllDirectories);
-            foreach (var file in files.Distinct())
-            {
-                Assembly asm = Assembly.LoadFrom(file);
-                foreach (var t in asm.GetExportedTypes())
-                {
-                    if (t.IsClass &&
-                    typeof(IImplementationExtension).IsAssignableFrom(t))
-                    {
-                        if (source == null)
-                        {
-                            source = (IImplementationExtension)Activator.CreateInstance(t)!;
-                        }
-                        else
-                        {
-                            var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
-                            if (newSource.Priority > source.Priority)
-                            {
-                                source = newSource;
-                            }
-                        }
-                    }
-                }
-            }
-            return source;
-        }
-        private static string TryGetImplementationExtensionsFolder()
-        {
-            var directory = new DirectoryInfo(Directory.GetCurrentDirectory());
-            while (directory != null && !directory.GetDirectories("ImplementationExtensions",
-            SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions"))
-            {
-                directory = directory.Parent;
-            }
-            return $"{directory?.FullName}\\ImplementationExtensions";
-        }
-    }
-}

FurnitureAssemblyContracts/DI/UnityDependencyContainer.cs

@@ -1,52 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Unity;
-using Unity.Microsoft.Logging;
-
-namespace FurnitureAssemblyContracts.DI
-{
-    public class UnityDependencyContainer : IDependencyContainer
-    {
-        private readonly IUnityContainer container;
-
-        public UnityDependencyContainer()
-        {
-            container = new UnityContainer();
-        }
-
-        public void AddLogging(Action<ILoggingBuilder> configure)
-        {
-            // регистрируем логгер в контейнере
-            var factory = LoggerFactory.Create(configure);
-            container.AddExtension(new LoggingExtension(factory));
-        }
-
-        public void RegisterType<T>(bool isSingle) where T : class
-        {
-            if (isSingle)
-            {
-                container.RegisterSingleton<T>();
-            }
-            else
-            {
-                container.RegisterType<T>();
-            }
-        }
-
-        public T Resolve<T>()
-        {
-            return container.Resolve<T>();
-        }
-
-        void IDependencyContainer.RegisterType<T, U>(bool isSingle)
-        {
-            if (isSingle)
-            {
-                container.RegisterSingleton<T, U>();
-            }
-            else
-            {
-                container.RegisterType<T, U>();
-            }
-        }
-    }
-}

FurnitureAssemblyContracts/FurnitureAssemblyContracts.csproj

@@ -4,15 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <BaseOutputPath>bin\</BaseOutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AbstractFurnitureAssemblyDataModels\FurnitureAssemblyDataModels.csproj" />
   </ItemGroup>

FurnitureAssemblyContracts/SearchModels/MessageInfoSearchModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureAssemblyContracts.SearchModels
-{
-    public class MessageInfoSearchModel
-    {
-        public int? ClientId { get; set; }
-
-        public string? MessageId { get; set; }
-    }
-}