Готовая лабораторная работа 1 усложнёнка

FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ShopLogic.cs

@@ -0,0 +1,203 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.StoragesContracts;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyBusinessLogic.BussinessLogic
+{
+    // Класс, реализующий логику для магазинов
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+
+        private readonly IShopStorage _shopStorage;
+
+        // Конструктор
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+        }
+
+        // Вывод конкретного магазина
+        public ShopViewModel? ReadElement(ShopSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            _logger.LogInformation("ReadElement. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
+            var element = _shopStorage.GetElement(model);
+
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+
+                return null;
+            }
+
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+
+            return element;
+        }
+
+        // Вывод отфильтрованного списка компонентов
+        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
+
+            // list хранит весь список в случае, если model пришло со значением null на вход метода
+            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 AddFurniture(ShopSearchModel model, IFurnitureModel furniture, int count)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (count <= 0)
+            {
+                throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0", nameof(count));
+            }
+
+            _logger.LogInformation("AddFurniture. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
+            var shop = _shopStorage.GetElement(model);
+
+            if (shop == null)
+            {
+                _logger.LogWarning("Add Furniture operation failed");
+
+                return false;
+            }
+
+            if (!shop.Furnitures.ContainsKey(furniture.Id))
+            {
+                shop.Furnitures[furniture.Id] = (furniture, count);
+            }
+            else
+            {
+                shop.Furnitures[furniture.Id] = (furniture, shop.Furnitures[furniture.Id].Item2 + count);
+            }
+
+            _shopStorage.Update(new ShopBindingModel()
+            {
+                ShopName = shop.ShopName,
+                Address = shop.Address,
+                DateOpen = shop.DateOpen,
+                Furnitures = shop.Furnitures
+            });
+
+            return true;
+        }
+
+        // Создание магазина
+        public bool Create(ShopBindingModel model)
+        {
+            CheckModel(model);
+
+            if (_shopStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+
+                return false;
+            }
+
+            return true;
+        }
+
+        // Обновление магазина
+        public bool Update(ShopBindingModel model)
+        {
+            CheckModel(model);
+
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+
+                return false;
+            }
+
+            return true;
+        }
+
+        // Удаление магазина
+        public bool Delete(ShopBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+
+            if (_shopStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+
+                return false;
+            }
+
+            return true;
+        }
+
+        // Проверка входного аргумента для методов Insert, Update и Delete
+        private void CheckModel(ShopBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            // При удалении передаём как параметр false
+            if (!withParams)
+            {
+                return;
+            }
+
+            // Проверка на наличие названия магазина
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                throw new ArgumentNullException("Отсутствует названия магазина", nameof(model.ShopName));
+            }
+
+            // Проверка на наличие адреса у магазина
+            if (string.IsNullOrEmpty(model.Address))
+            {
+                throw new ArgumentNullException("Отсутствует адреса магазина", nameof(model.Address));
+            }
+
+            _logger.LogInformation("Shop. ShopName:{ShopName}. Address:{Address}. Id: {Id}", model.ShopName, model.Address, model.Id);
+
+            // Проверка на наличие такого же магазина в списке
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                ShopName = model.ShopName
+            });
+
+            // Если элемент найден и его Id не совпадает с Id переданного объекта
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+    }
+}

FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,23 @@
+using FurnitureAssemblyDataModels.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 string ShopName { get; set; } = string.Empty;
+
+        public string Address { get; set; } = string.Empty;
+
+        public DateTime DateOpen { get; set; } = DateTime.Now;
+
+        public Dictionary<int, (IFurnitureModel, int)> Furnitures { get; set; } = new();
+
+        public int Id { get; set; }
+    }
+}

FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,28 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyDataModels.Models;
+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(ShopSearchModel model, IFurnitureModel furniture, int count);
+    }
+}

FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ShopSearchModel.cs

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

FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,27 @@
+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.StoragesContracts
+{
+    // Класс для хранилища магазинов
+    public interface IShopStorage
+    {
+        List<ShopViewModel> GetFullList();
+
+        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
+
+        ShopViewModel? GetElement(ShopSearchModel model);
+
+        ShopViewModel? Insert(ShopBindingModel model);
+
+        ShopViewModel? Update(ShopBindingModel model);
+
+        ShopViewModel? Delete(ShopBindingModel model);
+    }
+}

FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,27 @@
+using FurnitureAssemblyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyContracts.ViewModels
+{
+    // Класс для отображения пользователю информации о магазинах
+    public class ShopViewModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("Название магазина")]
+        public string ShopName { get; set; } = string.Empty;
+
+        [DisplayName("Адрес магазина")]
+        public string Address { get; set; } = string.Empty;
+
+        [DisplayName("Дата открытия")]
+        public DateTime DateOpen { get; set; } = DateTime.Now;
+
+        public Dictionary<int, (IFurnitureModel, int)> Furnitures { get; set; } = new();
+    }
+}

FurnitureAssembly/FurnitureAssemblyDataModels/Models/IShopModel.cs

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

FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs

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

FurnitureAssembly/FurnitureAssemblyListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,137 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.StoragesContracts;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyListImplement.Implements
+{
+    // Класс, реализующий интерфейс хранилища магазинов
+    public class ShopStorage : IShopStorage
+    {
+        // Поле для работы со списком магазинов
+        private readonly DataListSingleton _source;
+
+        // Получение в конструкторе объекта DataListSingleton
+        public ShopStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+
+        // Получение элемента из списка заготовок
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+
+            foreach (var shop in _source.Shops)
+            {
+                if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) || (model.Id.HasValue && shop.Id == model.Id))
+                {
+                    return shop.GetViewModel;
+                }
+            }
+
+            return null;
+        }
+
+        // Получение отфильтрованного списка заказов
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            var result = new List<ShopViewModel>();
+
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return result;
+            }
+
+            foreach (var shop in _source.Shops)
+            {
+                if (shop.ShopName.Contains(model.ShopName))
+                {
+                    result.Add(shop.GetViewModel);
+                }
+            }
+
+            return result;
+        }
+
+        // Получение полного списка заготовок
+        public List<ShopViewModel> GetFullList()
+        {
+            var result = new List<ShopViewModel>();
+
+            foreach (var shop in _source.Shops)
+            {
+                result.Add(shop.GetViewModel);
+            }
+
+            return result;
+        }
+
+        // При создании магазина определяем для него новый id: ищем max id и прибавляем к нему 1
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            model.Id = 1;
+
+            foreach (var shop in _source.Shops)
+            {
+                if (model.Id <= shop.Id)
+                {
+                    model.Id = shop.Id + 1;
+                }
+            }
+
+            var newShop = Shop.Create(model);
+
+            if (newShop == null)
+            {
+                return null;
+            }
+
+            _source.Shops.Add(newShop);
+
+            return newShop.GetViewModel;
+        }
+
+        // Обновление магазина
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+            foreach (var shop in _source.Shops)
+            {
+                if (shop.Id == model.Id)
+                {
+                    shop.Update(model);
+
+                    return shop.GetViewModel;
+                }
+            }
+
+            return null;
+        }
+
+        // Удаление магазина
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+            for (int i = 0; i < _source.Shops.Count; ++i)
+            {
+                if (_source.Shops[i].Id == model.Id)
+                {
+                    var element = _source.Shops[i];
+                    _source.Shops.RemoveAt(i);
+
+                    return element.GetViewModel;
+                }
+            }
+
+            return null;
+        }
+    }
+}

FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs

@@ -28,6 +28,7 @@ namespace FurnitureAssemblyListImplement.Models
 
         public DateTime? DateImplement { get; private set; }
 
+        // Метод для создания объекта от класса-компонента на основе класса-BindingModel
         public static Order? Create(OrderBindingModel? model)
         {
             if(model == null)

FurnitureAssembly/FurnitureAssemblyListImplement/Models/Shop.cs

@@ -0,0 +1,69 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureAssemblyListImplement.Models
+{
+    // Класс, реализующий интерфейс модели магазина
+    public class Shop : IShopModel
+    {
+        // Методы set сделали приватными, чтобы исключить неразрешённые манипуляции
+        public string ShopName { get; private set; } = string.Empty;
+
+        public string Address { get; private set; } = string.Empty;
+
+        public DateTime DateOpen { get; private set; }
+
+        public int Id { get; private set; }
+
+        public Dictionary<int, (IFurnitureModel, int)> Furnitures { get; private set; } =
+            new Dictionary<int, (IFurnitureModel, int)>();
+
+        // Метод для создания объекта от класса-компонента на основе класса-BindingModel
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                DateOpen = model.DateOpen,
+                Furnitures = model.Furnitures
+            };
+        }
+
+        // Метод изменения существующего объекта
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpen = model.DateOpen;
+            Furnitures = model.Furnitures;
+        }
+
+        // Метод для создания объекта класса ViewModel на основе данных объекта класса-компонента
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            DateOpen = DateOpen,
+            Furnitures = Furnitures
+        };
+    }
+}

FurnitureAssembly/FurnitureAssemblyView/FormAddFurniture.Designer.cs

@@ -0,0 +1,151 @@
+namespace FurnitureAssemblyView
+{
+    partial class FormAddFurniture
+    {
+        /// <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.labelCount = new System.Windows.Forms.Label();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.comboBoxFurniture = new System.Windows.Forms.ComboBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.comboBoxShop = new System.Windows.Forms.ComboBox();
+            this.SuspendLayout();
+            // 
+            // labelFurniture
+            // 
+            this.labelFurniture.AutoSize = true;
+            this.labelFurniture.Location = new System.Drawing.Point(28, 58);
+            this.labelFurniture.Name = "labelFurniture";
+            this.labelFurniture.Size = new System.Drawing.Size(56, 15);
+            this.labelFurniture.TabIndex = 0;
+            this.labelFurniture.Text = "Изделие:";
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(28, 91);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(75, 15);
+            this.labelCount.TabIndex = 1;
+            this.labelCount.Text = "Количество:";
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(28, 23);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(57, 15);
+            this.labelShop.TabIndex = 2;
+            this.labelShop.Text = "Магазин:";
+            // 
+            // comboBoxFurniture
+            // 
+            this.comboBoxFurniture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxFurniture.FormattingEnabled = true;
+            this.comboBoxFurniture.Location = new System.Drawing.Point(149, 55);
+            this.comboBoxFurniture.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxFurniture.Name = "comboBoxFurniture";
+            this.comboBoxFurniture.Size = new System.Drawing.Size(230, 23);
+            this.comboBoxFurniture.TabIndex = 3;
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(149, 88);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(230, 23);
+            this.textBoxCount.TabIndex = 4;
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(209, 123);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(82, 22);
+            this.buttonSave.TabIndex = 6;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(297, 123);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(82, 22);
+            this.buttonCancel.TabIndex = 7;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // comboBoxShop
+            // 
+            this.comboBoxShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxShop.FormattingEnabled = true;
+            this.comboBoxShop.Location = new System.Drawing.Point(149, 23);
+            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(230, 23);
+            this.comboBoxShop.TabIndex = 8;
+            // 
+            // FormAddFurniture
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(394, 159);
+            this.Controls.Add(this.comboBoxShop);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.comboBoxFurniture);
+            this.Controls.Add(this.labelShop);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.labelFurniture);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "FormAddFurniture";
+            this.Text = "Пополнение магазина";
+            this.Load += new System.EventHandler(this.FormAddFurniture_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelFurniture;
+        private Label labelCount;
+        private Label labelShop;
+        private ComboBox comboBoxFurniture;
+        private TextBox textBoxCount;
+        private Button buttonSave;
+        private Button buttonCancel;
+        private ComboBox comboBoxShop;
+    }
+}

FurnitureAssembly/FurnitureAssemblyView/FormAddFurniture.cs

@@ -0,0 +1,128 @@
+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 FormAddFurniture : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IFurnitureLogic _logicI;
+        private readonly IShopLogic _logicS;
+
+        public FormAddFurniture(ILogger<FormAddFurniture> logger, IFurnitureLogic logicI, IShopLogic logicS)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicI = logicI;
+            _logicS = logicS;
+        }
+
+        private void FormAddFurniture_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Загрузка списка изделий для пополнения");
+
+            try
+            {
+                var list = _logicI.ReadList(null);
+
+                if (list != null)
+                {
+                    comboBoxFurniture.DisplayMember = "FurnitureName";
+                    comboBoxFurniture.ValueMember = "Id";
+                    comboBoxFurniture.DataSource = list;
+                    comboBoxFurniture.SelectedItem = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка изделий");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+
+            _logger.LogInformation("Загрузка списка магазинов для пополнения");
+            try
+            {
+                var list = _logicS.ReadList(null);
+
+                if (list != null)
+                {
+                    comboBoxShop.DisplayMember = "ShopName";
+                    comboBoxShop.ValueMember = "Id";
+                    comboBoxShop.DataSource = list;
+                    comboBoxShop.SelectedItem = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка магазинов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            if (comboBoxFurniture.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            _logger.LogInformation("Пополнение магазина");
+
+            try
+            {
+                var operationResult = _logicS.AddFurniture(new ShopSearchModel
+                {
+                    Id = Convert.ToInt32(comboBoxShop.SelectedValue)
+                },
+
+                _logicI.ReadElement(new FurnitureSearchModel()
+                {
+                    Id = Convert.ToInt32(comboBoxFurniture.SelectedValue)
+                })!, Convert.ToInt32(textBoxCount.Text));
+
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при пополнении магазина. Дополнительная информация в логах.");
+                }
+
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания заказа");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

FurnitureAssembly/FurnitureAssemblyView/FormAddFurniture.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/FurnitureAssemblyView/FormFurnitureWorkPiece.Designer.cs

@@ -28,82 +28,83 @@
         /// </summary>
         private void InitializeComponent()
         {
-            labelWorkPiece = new Label();
+            this.labelWorkPiece = new System.Windows.Forms.Label();
-            labelCount = new Label();
+            this.labelCount = new System.Windows.Forms.Label();
-            comboBoxWorkPiece = new ComboBox();
+            this.comboBoxWorkPiece = new System.Windows.Forms.ComboBox();
-            textBoxCount = new TextBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
-            buttonSave = new Button();
+            this.buttonSave = new System.Windows.Forms.Button();
-            buttonCancel = new Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
-            SuspendLayout();
+            this.SuspendLayout();
             // 
             // labelWorkPiece
             // 
-            labelWorkPiece.AutoSize = true;
+            this.labelWorkPiece.AutoSize = true;
-            labelWorkPiece.Location = new Point(31, 33);
+            this.labelWorkPiece.Location = new System.Drawing.Point(31, 33);
-            labelWorkPiece.Name = "labelWorkPiece";
+            this.labelWorkPiece.Name = "labelWorkPiece";
-            labelWorkPiece.Size = new Size(81, 20);
+            this.labelWorkPiece.Size = new System.Drawing.Size(81, 20);
-            labelWorkPiece.TabIndex = 0;
+            this.labelWorkPiece.TabIndex = 0;
-            labelWorkPiece.Text = "Заготовка:";
+            this.labelWorkPiece.Text = "Заготовка:";
             // 
             // labelCount
             // 
-            labelCount.AutoSize = true;
+            this.labelCount.AutoSize = true;
-            labelCount.Location = new Point(31, 79);
+            this.labelCount.Location = new System.Drawing.Point(31, 79);
-            labelCount.Name = "labelCount";
+            this.labelCount.Name = "labelCount";
-            labelCount.Size = new Size(93, 20);
+            this.labelCount.Size = new System.Drawing.Size(93, 20);
-            labelCount.TabIndex = 1;
+            this.labelCount.TabIndex = 1;
-            labelCount.Text = "Количество:";
+            this.labelCount.Text = "Количество:";
             // 
             // comboBoxWorkPiece
             // 
-            comboBoxWorkPiece.FormattingEnabled = true;
+            this.comboBoxWorkPiece.FormattingEnabled = true;
-            comboBoxWorkPiece.Location = new Point(156, 30);
+            this.comboBoxWorkPiece.Location = new System.Drawing.Point(156, 30);
-            comboBoxWorkPiece.Name = "comboBoxWorkPiece";
+            this.comboBoxWorkPiece.Name = "comboBoxWorkPiece";
-            comboBoxWorkPiece.Size = new Size(320, 28);
+            this.comboBoxWorkPiece.Size = new System.Drawing.Size(320, 28);
-            comboBoxWorkPiece.TabIndex = 2;
+            this.comboBoxWorkPiece.TabIndex = 2;
             // 
             // textBoxCount
             // 
-            textBoxCount.Location = new Point(156, 76);
+            this.textBoxCount.Location = new System.Drawing.Point(156, 76);
-            textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(320, 27);
+            this.textBoxCount.Size = new System.Drawing.Size(320, 27);
-            textBoxCount.TabIndex = 3;
+            this.textBoxCount.TabIndex = 3;
             // 
             // buttonSave
             // 
-            buttonSave.Location = new Point(236, 118);
+            this.buttonSave.Location = new System.Drawing.Point(235, 118);
-            buttonSave.Name = "buttonSave";
+            this.buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(110, 38);
+            this.buttonSave.Size = new System.Drawing.Size(94, 29);
-            buttonSave.TabIndex = 4;
+            this.buttonSave.TabIndex = 4;
-            buttonSave.Text = "Сохранить";
+            this.buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += ButtonSave_Click;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
             // 
             // buttonCancel
             // 
-            buttonCancel.Location = new Point(363, 118);
+            this.buttonCancel.Location = new System.Drawing.Point(353, 118);
-            buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(113, 38);
+            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
-            buttonCancel.TabIndex = 5;
+            this.buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
+            this.buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
             // 
             // FormFurnitureWorkPiece
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ClientSize = new Size(526, 168);
+            this.ClientSize = new System.Drawing.Size(526, 168);
-            Controls.Add(buttonCancel);
+            this.Controls.Add(this.buttonCancel);
-            Controls.Add(buttonSave);
+            this.Controls.Add(this.buttonSave);
-            Controls.Add(textBoxCount);
+            this.Controls.Add(this.textBoxCount);
-            Controls.Add(comboBoxWorkPiece);
+            this.Controls.Add(this.comboBoxWorkPiece);
-            Controls.Add(labelCount);
+            this.Controls.Add(this.labelCount);
-            Controls.Add(labelWorkPiece);
+            this.Controls.Add(this.labelWorkPiece);
-            Name = "FormFurnitureWorkPiece";
+            this.Name = "FormFurnitureWorkPiece";
-            Text = "Заготовки для изделия";
+            this.Text = "Заготовки для изделия";
-            ResumeLayout(false);
+            this.ResumeLayout(false);
-            PerformLayout();
+            this.PerformLayout();
+
         }
 
         #endregion

FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs

@@ -18,24 +18,21 @@ namespace FurnitureAssemblyView
     {
         private readonly List<WorkPieceViewModel>? _list;
 
-        public int Id
+        public int Id { get { return Convert.ToInt32(comboBoxWorkPiece.SelectedValue); } 
-        {
+            set { comboBoxWorkPiece.SelectedValue = value; } }
-            get { return Convert.ToInt32(comboBoxWorkPiece.SelectedValue); }
-            set { comboBoxWorkPiece.SelectedValue = value; }
-        }
 
         public IWorkPieceModel? WorkPieceModel
         {
             get
             {
-                if (_list == null)
+                if(_list == null)
                 {
                     return null;
                 }
 
-                foreach (var elem in _list)
+                foreach(var elem in _list)
                 {
-                    if (elem.Id == Id)
+                    if(elem.Id == Id)
                     {
                         return elem;
                     }
@@ -45,14 +42,8 @@ namespace FurnitureAssemblyView
             }
         }
 
-        public int Count
+        public int Count { get { return Convert.ToInt32(textBoxCount.Text); } set {
-        {
+                textBoxCount.Text = value.ToString(); } }
-            get { return Convert.ToInt32(textBoxCount.Text); }
-            set
-            {
-                textBoxCount.Text = value.ToString();
-            }
-        }
 
         public FormFurnitureWorkPiece(IWorkPieceLogic logic)
         {
@@ -60,7 +51,7 @@ namespace FurnitureAssemblyView
 
             _list = logic.ReadList(null);
 
-            if (_list != null)
+            if(_list != null)
             {
                 comboBoxWorkPiece.DisplayMember = "WorkPieceName";
                 comboBoxWorkPiece.ValueMember = "Id";

FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.resx

@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<root>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <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">

FurnitureAssembly/FurnitureAssemblyView/FormMain.Designer.cs

@@ -34,29 +34,33 @@
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonRefresh = new Button();
-            menuStrip = new MenuStrip();
+            menuStrip1 = new MenuStrip();
             toolStripMenuItem = new ToolStripMenuItem();
             workPieceToolStripMenuItem = new ToolStripMenuItem();
             furnitureToolStripMenuItem = new ToolStripMenuItem();
+            shopToolStripMenuItem = new ToolStripMenuItem();
+            addFurnitureToolStripMenuItem = new ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            menuStrip.SuspendLayout();
+            menuStrip1.SuspendLayout();
             SuspendLayout();
             // 
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(11, 36);
+            dataGridView.Location = new Point(10, 27);
+            dataGridView.Margin = new Padding(3, 2, 3, 2);
             dataGridView.Name = "dataGridView";
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(937, 403);
+            dataGridView.Size = new Size(820, 302);
             dataGridView.TabIndex = 0;
             // 
             // buttonCreateOrder
             // 
-            buttonCreateOrder.Location = new Point(1014, 67);
+            buttonCreateOrder.Location = new Point(887, 41);
+            buttonCreateOrder.Margin = new Padding(3, 2, 3, 2);
             buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(235, 46);
+            buttonCreateOrder.Size = new Size(216, 41);
             buttonCreateOrder.TabIndex = 1;
             buttonCreateOrder.Text = "Создать заказ";
             buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -64,9 +68,10 @@
             // 
             // buttonTakeOrderInWork
             // 
-            buttonTakeOrderInWork.Location = new Point(1014, 143);
+            buttonTakeOrderInWork.Location = new Point(887, 102);
+            buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2);
             buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(235, 48);
+            buttonTakeOrderInWork.Size = new Size(216, 39);
             buttonTakeOrderInWork.TabIndex = 2;
             buttonTakeOrderInWork.Text = "Отдать на выполнение";
             buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@@ -74,9 +79,10 @@
             // 
             // buttonOrderReady
             // 
-            buttonOrderReady.Location = new Point(1014, 220);
+            buttonOrderReady.Location = new Point(887, 161);
+            buttonOrderReady.Margin = new Padding(3, 2, 3, 2);
             buttonOrderReady.Name = "buttonOrderReady";
-            buttonOrderReady.Size = new Size(235, 41);
+            buttonOrderReady.Size = new Size(216, 37);
             buttonOrderReady.TabIndex = 3;
             buttonOrderReady.Text = "Заказ готов";
             buttonOrderReady.UseVisualStyleBackColor = true;
@@ -84,9 +90,10 @@
             // 
             // buttonIssuedOrder
             // 
-            buttonIssuedOrder.Location = new Point(1014, 289);
+            buttonIssuedOrder.Location = new Point(887, 218);
+            buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2);
             buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonIssuedOrder.Size = new Size(235, 44);
+            buttonIssuedOrder.Size = new Size(216, 37);
             buttonIssuedOrder.TabIndex = 4;
             buttonIssuedOrder.Text = "Заказ выдан";
             buttonIssuedOrder.UseVisualStyleBackColor = true;
@@ -94,65 +101,81 @@
             // 
             // buttonRefresh
             // 
-            buttonRefresh.Location = new Point(1014, 359);
+            buttonRefresh.Location = new Point(887, 277);
+            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(235, 39);
+            buttonRefresh.Size = new Size(216, 34);
             buttonRefresh.TabIndex = 5;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += ButtonRef_Click;
+            buttonRefresh.Click += ButtonRefresh_Click;
             // 
-            // menuStrip
+            // menuStrip1
             // 
-            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem });
+            menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
+            menuStrip1.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
+            menuStrip1.Name = "menuStrip1";
-            menuStrip.Padding = new Padding(6, 3, 0, 3);
+            menuStrip1.Padding = new Padding(5, 2, 0, 2);
-            menuStrip.Size = new Size(1297, 30);
+            menuStrip1.Size = new Size(1135, 24);
-            menuStrip.TabIndex = 6;
+            menuStrip1.TabIndex = 6;
-            menuStrip.Text = "menuStrip";
+            menuStrip1.Text = "menuStrip1";
             // 
             // toolStripMenuItem
             // 
-            toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { workPieceToolStripMenuItem, furnitureToolStripMenuItem });
+            toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { workPieceToolStripMenuItem, furnitureToolStripMenuItem, shopToolStripMenuItem, addFurnitureToolStripMenuItem });
             toolStripMenuItem.Name = "toolStripMenuItem";
-            toolStripMenuItem.Size = new Size(117, 24);
+            toolStripMenuItem.Size = new Size(94, 20);
             toolStripMenuItem.Text = "Справочники";
             // 
             // workPieceToolStripMenuItem
             // 
             workPieceToolStripMenuItem.Name = "workPieceToolStripMenuItem";
-            workPieceToolStripMenuItem.Size = new Size(224, 26);
+            workPieceToolStripMenuItem.Size = new Size(198, 22);
             workPieceToolStripMenuItem.Text = "Заготовки";
             workPieceToolStripMenuItem.Click += WorkPieceToolStripMenuItem_Click;
             // 
             // furnitureToolStripMenuItem
             // 
             furnitureToolStripMenuItem.Name = "furnitureToolStripMenuItem";
-            furnitureToolStripMenuItem.Size = new Size(224, 26);
+            furnitureToolStripMenuItem.Size = new Size(198, 22);
             furnitureToolStripMenuItem.Text = "Изделия";
             furnitureToolStripMenuItem.Click += FurnitureToolStripMenuItem_Click;
             // 
+            // shopToolStripMenuItem
+            // 
+            shopToolStripMenuItem.Name = "shopToolStripMenuItem";
+            shopToolStripMenuItem.Size = new Size(198, 22);
+            shopToolStripMenuItem.Text = "Магазины";
+            shopToolStripMenuItem.Click += ShopToolStripMenuItem_Click;
+            // 
+            // addFurnitureToolStripMenuItem
+            // 
+            addFurnitureToolStripMenuItem.Name = "addFurnitureToolStripMenuItem";
+            addFurnitureToolStripMenuItem.Size = new Size(198, 22);
+            addFurnitureToolStripMenuItem.Text = "Пополнение магазина";
+            addFurnitureToolStripMenuItem.Click += AddFurnitureToolStripMenuItem_Click;
+            // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1297, 451);
+            ClientSize = new Size(1135, 338);
             Controls.Add(buttonRefresh);
             Controls.Add(buttonIssuedOrder);
             Controls.Add(buttonOrderReady);
             Controls.Add(buttonTakeOrderInWork);
             Controls.Add(buttonCreateOrder);
             Controls.Add(dataGridView);
-            Controls.Add(menuStrip);
+            Controls.Add(menuStrip1);
-            MainMenuStrip = menuStrip;
+            MainMenuStrip = menuStrip1;
+            Margin = new Padding(3, 2, 3, 2);
             Name = "FormMain";
             Text = "Сборка мебели";
             Load += FormMain_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            menuStrip.ResumeLayout(false);
+            menuStrip1.ResumeLayout(false);
-            menuStrip.PerformLayout();
+            menuStrip1.PerformLayout();
             ResumeLayout(false);
             PerformLayout();
         }
@@ -165,9 +188,11 @@
         private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonRefresh;
-        private MenuStrip menuStrip;
+        private MenuStrip menuStrip1;
         private ToolStripMenuItem toolStripMenuItem;
         private ToolStripMenuItem workPieceToolStripMenuItem;
         private ToolStripMenuItem furnitureToolStripMenuItem;
+        private ToolStripMenuItem shopToolStripMenuItem;
+        private ToolStripMenuItem addFurnitureToolStripMenuItem;
     }
 }

FurnitureAssembly/FurnitureAssemblyView/FormMain.cs

@@ -177,9 +177,31 @@ namespace FurnitureAssemblyView
             }
         }
 
-        private void ButtonRef_Click(object sender, EventArgs e)
+        private void ButtonRefresh_Click(object sender, EventArgs e)
         {
             LoadData();
         }
+
+        private void ShopToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+
+        private void AddFurnitureToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormAddFurniture));
+
+            if (service is FormAddFurniture form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
+        }
     }
 }

FurnitureAssembly/FurnitureAssemblyView/FormShop.Designer.cs

@@ -0,0 +1,205 @@
+namespace FurnitureAssemblyView
+{
+    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()
+        {
+            labelName = new Label();
+            labelAddress = new Label();
+            textBoxName = new TextBox();
+            textBoxAddress = new TextBox();
+            groupBoxIceCreams = new GroupBox();
+            dataGridView = new DataGridView();
+            ID = new DataGridViewTextBoxColumn();
+            ColumnFurnitureName = new DataGridViewTextBoxColumn();
+            ColumnCount = new DataGridViewTextBoxColumn();
+            buttonSave = new Button();
+            buttonCancel = new Button();
+            labelDate = new Label();
+            dateTimePickerDate = new DateTimePicker();
+            groupBoxIceCreams.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // labelName
+            // 
+            labelName.AutoSize = true;
+            labelName.Location = new Point(18, 10);
+            labelName.Name = "labelName";
+            labelName.Size = new Size(62, 15);
+            labelName.TabIndex = 0;
+            labelName.Text = "Название:";
+            // 
+            // labelAddress
+            // 
+            labelAddress.AutoSize = true;
+            labelAddress.Location = new Point(266, 9);
+            labelAddress.Name = "labelAddress";
+            labelAddress.Size = new Size(43, 15);
+            labelAddress.TabIndex = 1;
+            labelAddress.Text = "Адрес:";
+            // 
+            // textBoxName
+            // 
+            textBoxName.Location = new Point(86, 7);
+            textBoxName.Margin = new Padding(3, 2, 3, 2);
+            textBoxName.Name = "textBoxName";
+            textBoxName.Size = new Size(138, 23);
+            textBoxName.TabIndex = 2;
+            // 
+            // textBoxAddress
+            // 
+            textBoxAddress.Location = new Point(315, 6);
+            textBoxAddress.Margin = new Padding(3, 2, 3, 2);
+            textBoxAddress.Name = "textBoxAddress";
+            textBoxAddress.Size = new Size(138, 23);
+            textBoxAddress.TabIndex = 3;
+            // 
+            // groupBoxIceCreams
+            // 
+            groupBoxIceCreams.Controls.Add(dataGridView);
+            groupBoxIceCreams.Location = new Point(12, 62);
+            groupBoxIceCreams.Margin = new Padding(3, 2, 3, 2);
+            groupBoxIceCreams.Name = "groupBoxIceCreams";
+            groupBoxIceCreams.Padding = new Padding(3, 2, 3, 2);
+            groupBoxIceCreams.Size = new Size(720, 206);
+            groupBoxIceCreams.TabIndex = 4;
+            groupBoxIceCreams.TabStop = false;
+            groupBoxIceCreams.Text = "Изделия";
+            // 
+            // dataGridView
+            // 
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ID, ColumnFurnitureName, ColumnCount });
+            dataGridView.Location = new Point(5, 20);
+            dataGridView.Margin = new Padding(3, 2, 3, 2);
+            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.RowTemplate.Height = 29;
+            dataGridView.Size = new Size(709, 182);
+            dataGridView.TabIndex = 0;
+            // 
+            // ID
+            // 
+            ID.HeaderText = "ID";
+            ID.Name = "ID";
+            ID.Visible = false;
+            // 
+            // ColumnFurnitureName
+            // 
+            ColumnFurnitureName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+            ColumnFurnitureName.HeaderText = "Изделие";
+            ColumnFurnitureName.MinimumWidth = 6;
+            ColumnFurnitureName.Name = "ColumnFurnitureName";
+            ColumnFurnitureName.Resizable = DataGridViewTriState.True;
+            // 
+            // ColumnCount
+            // 
+            ColumnCount.HeaderText = "Количество";
+            ColumnCount.MinimumWidth = 6;
+            ColumnCount.Name = "ColumnCount";
+            ColumnCount.Width = 125;
+            // 
+            // buttonSave
+            // 
+            buttonSave.Location = new Point(389, 272);
+            buttonSave.Margin = new Padding(3, 2, 3, 2);
+            buttonSave.Name = "buttonSave";
+            buttonSave.Size = new Size(153, 36);
+            buttonSave.TabIndex = 5;
+            buttonSave.Text = "Сохранить";
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += ButtonSave_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(571, 272);
+            buttonCancel.Margin = new Padding(3, 2, 3, 2);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(147, 36);
+            buttonCancel.TabIndex = 6;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += ButtonCancel_Click;
+            // 
+            // labelDate
+            // 
+            labelDate.AutoSize = true;
+            labelDate.Location = new Point(492, 9);
+            labelDate.Name = "labelDate";
+            labelDate.Size = new Size(90, 15);
+            labelDate.TabIndex = 7;
+            labelDate.Text = "Дата открытия:";
+            // 
+            // dateTimePickerDate
+            // 
+            dateTimePickerDate.Location = new Point(588, 7);
+            dateTimePickerDate.Name = "dateTimePickerDate";
+            dateTimePickerDate.Size = new Size(127, 23);
+            dateTimePickerDate.TabIndex = 9;
+            // 
+            // FormShop
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(744, 319);
+            Controls.Add(dateTimePickerDate);
+            Controls.Add(labelDate);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonSave);
+            Controls.Add(groupBoxIceCreams);
+            Controls.Add(textBoxAddress);
+            Controls.Add(textBoxName);
+            Controls.Add(labelAddress);
+            Controls.Add(labelName);
+            Margin = new Padding(3, 2, 3, 2);
+            Name = "FormShop";
+            Text = "Магазин";
+            Load += FormShop_Load;
+            groupBoxIceCreams.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Label labelName;
+        private Label labelAddress;
+        private TextBox textBoxName;
+        private TextBox textBoxAddress;
+        private GroupBox groupBoxIceCreams;
+        private DataGridView dataGridView;
+        private Button buttonSave;
+        private Button buttonCancel;
+        private Label labelDate;
+        private DateTimePicker dateTimePickerDate;
+        private DataGridViewTextBoxColumn ID;
+        private DataGridViewTextBoxColumn ColumnFurnitureName;
+        private DataGridViewTextBoxColumn ColumnCount;
+    }
+}

FurnitureAssembly/FurnitureAssemblyView/FormShop.cs

@@ -0,0 +1,133 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyDataModels.Models;
+using FurnitureAssemblyListImplement.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FurnitureAssemblyView
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IShopLogic _logic;
+
+        private int? _id;
+
+        private Dictionary<int, (IFurnitureModel, int)> _shopFurnitures;
+
+        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 FormShop_Load(object sender, EventArgs e)
+        {
+            if (_id.HasValue)
+            {
+                _logger.LogInformation("Загрузка магазина");
+                try
+                {
+                    var view = _logic.ReadElement(new ShopSearchModel
+                    {
+                        Id = _id.Value
+                    });
+                    if (view != null)
+                    {
+                        textBoxName.Text = view.ShopName;
+                        textBoxAddress.Text = view.Address.ToString();
+                        dateTimePickerDate.Value = view.DateOpen;
+                        _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)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var element in _shopFurnitures)
+                    {
+                        dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.FurnitureName, element.Value.Item2 });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки изделий в магазине");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxName.Text))
+            {
+                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxAddress.Text))
+            {
+                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Сохранение магазина");
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    ShopName = textBoxName.Text,
+                    Address = textBoxAddress.Text,
+                    DateOpen = dateTimePickerDate.Value.Date,
+                    Furnitures = _shopFurnitures
+                };
+                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/FurnitureAssemblyView/FormShop.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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/FurnitureAssemblyView/FormShops.Designer.cs

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

FurnitureAssembly/FurnitureAssemblyView/FormShops.cs

@@ -0,0 +1,117 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.BusinessLogicsContracts;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FurnitureAssemblyView
+{
+    public partial class FormShops : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _logic;
+
+        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormShops_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["Furnitures"].Visible = false;
+                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка магазинов");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки магазинов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonAdd_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+            if (service is FormShop form)
+            {
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
+            }
+        }
+
+        private void ButtonUpdate_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+                if (service is FormShop form)
+                {
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
+            }
+        }
+
+        private void ButtonDelete_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    _logger.LogInformation("Удаление магазина");
+                    try
+                    {
+                        if (!_logic.Delete(new ShopBindingModel
+                        {
+                            Id = id
+                        }))
+                        {
+                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+                        }
+                        LoadData();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Ошибка удаления изделия");
+                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+
+        private void ButtonRefresh_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
+}

FurnitureAssembly/FurnitureAssemblyView/FormShops.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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/FurnitureAssemblyView/FormWorkPiece.Designer.cs

@@ -28,83 +28,87 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.labelName = new System.Windows.Forms.Label();
+            labelName = new Label();
-            this.labelPrice = new System.Windows.Forms.Label();
+            labelPrice = new Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
+            textBoxName = new TextBox();
-            this.textBoxCost = new System.Windows.Forms.TextBox();
+            textBoxCost = new TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
+            buttonCancel = new Button();
-            this.buttonSave = new System.Windows.Forms.Button();
+            buttonSave = new Button();
-            this.SuspendLayout();
+            SuspendLayout();
             // 
             // labelName
             // 
-            this.labelName.AutoSize = true;
+            labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(30, 24);
+            labelName.Location = new Point(26, 18);
-            this.labelName.Name = "labelName";
+            labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(80, 20);
+            labelName.Size = new Size(62, 15);
-            this.labelName.TabIndex = 0;
+            labelName.TabIndex = 0;
-            this.labelName.Text = "Название:";
+            labelName.Text = "Название:";
             // 
             // labelPrice
             // 
-            this.labelPrice.AutoSize = true;
+            labelPrice.AutoSize = true;
-            this.labelPrice.Location = new System.Drawing.Point(30, 65);
+            labelPrice.Location = new Point(26, 49);
-            this.labelPrice.Name = "labelPrice";
+            labelPrice.Name = "labelPrice";
-            this.labelPrice.Size = new System.Drawing.Size(48, 20);
+            labelPrice.Size = new Size(38, 15);
-            this.labelPrice.TabIndex = 1;
+            labelPrice.TabIndex = 1;
-            this.labelPrice.Text = "Цена:";
+            labelPrice.Text = "Цена:";
             // 
             // textBoxName
             // 
-            this.textBoxName.Location = new System.Drawing.Point(127, 21);
+            textBoxName.Location = new Point(111, 16);
-            this.textBoxName.Name = "textBoxName";
+            textBoxName.Margin = new Padding(3, 2, 3, 2);
-            this.textBoxName.Size = new System.Drawing.Size(293, 27);
+            textBoxName.Name = "textBoxName";
-            this.textBoxName.TabIndex = 2;
+            textBoxName.Size = new Size(257, 23);
+            textBoxName.TabIndex = 2;
             // 
             // textBoxCost
             // 
-            this.textBoxCost.Location = new System.Drawing.Point(127, 62);
+            textBoxCost.Location = new Point(111, 46);
-            this.textBoxCost.Name = "textBoxCost";
+            textBoxCost.Margin = new Padding(3, 2, 3, 2);
-            this.textBoxCost.Size = new System.Drawing.Size(179, 27);
+            textBoxCost.Name = "textBoxCost";
-            this.textBoxCost.TabIndex = 3;
+            textBoxCost.Size = new Size(157, 23);
+            textBoxCost.TabIndex = 3;
             // 
             // buttonCancel
             // 
-            this.buttonCancel.Location = new System.Drawing.Point(326, 104);
+            buttonCancel.Location = new Point(289, 78);
-            this.buttonCancel.Name = "buttonCancel";
+            buttonCancel.Margin = new Padding(3, 2, 3, 2);
-            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
+            buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.TabIndex = 4;
+            buttonCancel.Size = new Size(105, 26);
-            this.buttonCancel.Text = "Отмена";
+            buttonCancel.TabIndex = 4;
-            this.buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Text = "Отмена";
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += ButtonCancel_Click;
             // 
             // buttonSave
             // 
-            this.buttonSave.Location = new System.Drawing.Point(212, 104);
+            buttonSave.Location = new Point(171, 78);
-            this.buttonSave.Name = "buttonSave";
+            buttonSave.Margin = new Padding(3, 2, 3, 2);
-            this.buttonSave.Size = new System.Drawing.Size(94, 29);
+            buttonSave.Name = "buttonSave";
-            this.buttonSave.TabIndex = 5;
+            buttonSave.Size = new Size(97, 26);
-            this.buttonSave.Text = "Сохранить";
+            buttonSave.TabIndex = 5;
-            this.buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Text = "Сохранить";
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += ButtonSave_Click;
             // 
             // FormWorkPiece
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            AutoScaleMode = AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(464, 153);
+            ClientSize = new Size(406, 115);
-            this.Controls.Add(this.buttonSave);
+            Controls.Add(buttonSave);
-            this.Controls.Add(this.buttonCancel);
+            Controls.Add(buttonCancel);
-            this.Controls.Add(this.textBoxCost);
+            Controls.Add(textBoxCost);
-            this.Controls.Add(this.textBoxName);
+            Controls.Add(textBoxName);
-            this.Controls.Add(this.labelPrice);
+            Controls.Add(labelPrice);
-            this.Controls.Add(this.labelName);
+            Controls.Add(labelName);
-            this.Name = "FormWorkPiece";
+            Margin = new Padding(3, 2, 3, 2);
-            this.Text = "Заготовка";
+            Name = "FormWorkPiece";
-            this.Load += new System.EventHandler(this.FormWorkPiece_Load);
+            Text = "Заготовка";
-            this.ResumeLayout(false);
+            Load += FormWorkPiece_Load;
-            this.PerformLayout();
+            ResumeLayout(false);
-
+            PerformLayout();
         }
 
         #endregion

FurnitureAssembly/FurnitureAssemblyView/FormWorkPiece.resx

@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <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">

FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs

@@ -38,9 +38,10 @@
             // 
             // buttonAdd
             // 
-            buttonAdd.Location = new Point(641, 36);
+            buttonAdd.Location = new Point(561, 27);
+            buttonAdd.Margin = new Padding(3, 2, 3, 2);
             buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(116, 47);
+            buttonAdd.Size = new Size(100, 38);
             buttonAdd.TabIndex = 0;
             buttonAdd.Text = "Добавить";
             buttonAdd.UseVisualStyleBackColor = true;
@@ -48,9 +49,10 @@
             // 
             // buttonUpdate
             // 
-            buttonUpdate.Location = new Point(641, 102);
+            buttonUpdate.Location = new Point(561, 85);
+            buttonUpdate.Margin = new Padding(3, 2, 3, 2);
             buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(116, 47);
+            buttonUpdate.Size = new Size(100, 36);
             buttonUpdate.TabIndex = 1;
             buttonUpdate.Text = "Изменить";
             buttonUpdate.UseVisualStyleBackColor = true;
@@ -58,9 +60,10 @@
             // 
             // buttonDelete
             // 
-            buttonDelete.Location = new Point(641, 168);
+            buttonDelete.Location = new Point(561, 143);
+            buttonDelete.Margin = new Padding(3, 2, 3, 2);
             buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(116, 47);
+            buttonDelete.Size = new Size(100, 34);
             buttonDelete.TabIndex = 2;
             buttonDelete.Text = "Удалить";
             buttonDelete.UseVisualStyleBackColor = true;
@@ -68,9 +71,10 @@
             // 
             // buttonRefresh
             // 
-            buttonRefresh.Location = new Point(641, 239);
+            buttonRefresh.Location = new Point(561, 197);
+            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(116, 47);
+            buttonRefresh.Size = new Size(100, 34);
             buttonRefresh.TabIndex = 3;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
@@ -79,23 +83,25 @@
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 12);
+            dataGridView.Location = new Point(10, 9);
+            dataGridView.Margin = new Padding(3, 2, 3, 2);
             dataGridView.Name = "dataGridView";
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(604, 426);
+            dataGridView.Size = new Size(528, 320);
             dataGridView.TabIndex = 4;
             // 
             // FormWorkPieces
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(781, 450);
+            ClientSize = new Size(683, 338);
             Controls.Add(dataGridView);
             Controls.Add(buttonRefresh);
             Controls.Add(buttonDelete);
             Controls.Add(buttonUpdate);
             Controls.Add(buttonAdd);
+            Margin = new Padding(3, 2, 3, 2);
             Name = "FormWorkPieces";
             Text = "Заготовки";
             Load += FormWorkPiece_Load;

FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs

@@ -40,7 +40,7 @@ namespace FurnitureAssemblyView
                 var list = _logic.ReadList(null);
 
                 // Растягиваем колонку Название на всю ширину, колонку Id скрываем
-                if (list != null)
+                if(list != null)
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["Id"].Visible = false;
@@ -49,7 +49,7 @@ namespace FurnitureAssemblyView
 
                 _logger.LogInformation("Загрузка заготовок");
             }
-            catch (Exception ex)
+            catch(Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки заготовок");
 

FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView - Backup.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FurnitureAssemblyBusinessLogic\FurnitureAssemblyBusinessLogic.csproj" />
+    <ProjectReference Include="..\FurnitureAssemblyContracts\FurnitureAssemblyContracts.csproj" />
+    <ProjectReference Include="..\FurnitureAssemblyListImplement\FurnitureAssemblyListImplement.csproj" />
+  </ItemGroup>
+
+</Project>

FurnitureAssembly/FurnitureAssemblyView/Program.cs

@@ -27,7 +27,6 @@ namespace FurnitureAssemblyView
             _serviceProvider = services.BuildServiceProvider();
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
-
         private static void ConfigureServices(ServiceCollection services)
         {
             services.AddLogging(option =>
@@ -39,10 +38,12 @@ namespace FurnitureAssemblyView
             services.AddTransient<IWorkPieceStorage, WorkPieceStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IFurnitureStorage, FurnitureStorage>();
+            services.AddTransient<IShopStorage, ShopStorage>();
 
             services.AddTransient<IWorkPieceLogic, WorkPieceLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IFurnitureLogic, FurnitureLogic>();
+            services.AddTransient<IShopLogic, ShopLogic>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormWorkPiece>();
@@ -51,6 +52,9 @@ namespace FurnitureAssemblyView
             services.AddTransient<FormFurniture>();
             services.AddTransient<FormFurnitures>();
             services.AddTransient<FormFurnitureWorkPiece>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormAddFurniture>();
         }
     }
 }