Merge branch 'LabWork01_Hard' into LabWork02_Hard

MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj

@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+	<ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
   </ItemGroup>
 
 </Project>

MotorPlant/MotorPlantBusinessLogic/ShopLogic.cs

@@ -0,0 +1,152 @@
+using Microsoft.Extensions.Logging;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantBusinessLogic.BusinessLogics
+{
+	public class ShopLogic : IShopLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IShopStorage _shopStorage;
+		private readonly IEngineStorage _EngineStorage;
+		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IEngineStorage EngineStorage)
+		{
+			_logger = logger;
+			_shopStorage = shopStorage;
+			_EngineStorage = EngineStorage;
+		}
+		public List<ShopViewModel>? ReadList(ShopSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
+			var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+		public 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 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;
+		}
+		public bool MakeSupply(SupplyBindingModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (model.Count <= 0)
+			{
+				throw new ArgumentException("Количество изделий должно быть больше 0");
+			}
+			var shop = _shopStorage.GetElement(new ShopSearchModel
+			{
+				Id = model.ShopId
+			});
+			if (shop == null)
+			{
+				throw new ArgumentException("Магазина не существует");
+			}
+			if (shop.ShopEngines.ContainsKey(model.EngineId))
+			{
+				var oldValue = shop.ShopEngines[model.EngineId];
+				oldValue.Item2 += model.Count;
+				shop.ShopEngines[model.EngineId] = oldValue;
+			}
+			else
+			{
+				var Engine = _EngineStorage.GetElement(new EngineSearchModel
+				{
+					Id = model.EngineId
+				});
+				if (Engine == null)
+				{
+					throw new ArgumentException($"Поставка: Товар с id:{model.EngineId} не найденн");
+				}
+				shop.ShopEngines.Add(model.EngineId, (Engine, model.Count));
+			}
+			return true;
+		}
+		private void CheckModel(ShopBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (string.IsNullOrEmpty(model.Adress))
+			{
+				throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
+			}
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
+			}
+			_logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
+			var element = _shopStorage.GetElement(new ShopSearchModel
+			{
+				ShopName = model.ShopName
+			});
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Магазин с таким названием уже есть");
+			}
+		}
+	}
+}

MotorPlant/MotorPlantContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,18 @@
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.BindingModels
+{
+	public class ShopBindingModel : IShopModel
+	{
+		public int Id { get; set; }
+		public string ShopName { get; set; } = string.Empty;
+		public string Adress { get; set; } = string.Empty;
+		public DateTime OpeningDate { get; set; } = DateTime.Now;
+		public Dictionary<int, (IEngineModel, int)> ShopEngines { get; set; } = new();
+	}
+}

MotorPlant/MotorPlantContracts/BindingModels/SupplyBindingModel.cs

@@ -0,0 +1,16 @@
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.BindingModels
+{
+	public class SupplyBindingModel : ISupplyModel
+	{
+		public int ShopId { get; set; }
+		public int EngineId { get; set; }
+		public int Count { get; set; }
+	}
+}

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,21 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.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 MakeSupply(SupplyBindingModel model);
+	}
+}

MotorPlant/MotorPlantContracts/SearchModels/ShopSearchModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.SearchModels
+{
+	public class ShopSearchModel
+	{
+		public int? Id { get; set; }
+		public string? ShopName { get; set; }
+	}
+}

MotorPlant/MotorPlantContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,21 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.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);
+	}
+}

MotorPlant/MotorPlantContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,22 @@
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.ViewModels
+{
+	public class ShopViewModel : IShopModel
+	{
+		public int Id { get; set; }
+		[DisplayName("Название")]
+		public string ShopName { get; set; } = string.Empty;
+		[DisplayName("Адрес")]
+		public string Adress { get; set; } = string.Empty;
+		[DisplayName("Дата открытия")]
+		public DateTime OpeningDate { get; set; }
+		public Dictionary<int, (IEngineModel, int)> ShopEngines { get; set; } = new();
+	}
+}

MotorPlant/MotorPlantDataModels/IShopModel.cs

@@ -0,0 +1,18 @@
+using MotorPlantDataModels;
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantDataModels.Models
+{
+	public interface IShopModel : IId
+	{
+		string ShopName { get; }
+		string Adress { get; }
+		DateTime OpeningDate { get; }
+		Dictionary<int, (IEngineModel, int)> ShopEngines { get; }
+	}
+}

MotorPlant/MotorPlantDataModels/ISupplyModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantDataModels.Models
+{
+	public interface ISupplyModel
+	{
+		int ShopId { get; }
+		int EngineId { get; }
+		int Count { get; }
+	}
+}

MotorPlant/MotorPlantListImplement/DataListSingleton.cs

@@ -8,12 +8,14 @@ namespace MotorPlantListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Engine> Engines { get; set; }
-        private DataListSingleton()
+		public List<Shop> Shops { get; set; }
+		private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Engines = new List<Engine>();
-        }
+			Shops = new List<Shop>();
+		}
         public static DataListSingleton GetInstance()
         {
             if (_instance == null)

MotorPlant/MotorPlantListImplement/Shop.cs

@@ -0,0 +1,52 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.ViewModels;
+using MotorPlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantListImplement.Models
+{
+	public class Shop : IShopModel
+	{
+		public int Id { get; private set; }
+		public string ShopName { get; private set; } = string.Empty;
+		public string Adress { get; private set; } = string.Empty;
+		public DateTime OpeningDate { get; private set; }
+		public Dictionary<int, (IEngineModel, int)> ShopEngines { get; private set; } = new();
+		public static Shop? Create(ShopBindingModel? model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new Shop()
+			{
+				Id = model.Id,
+				ShopName = model.ShopName,
+				Adress = model.Adress,
+				OpeningDate = model.OpeningDate
+			};
+		}
+		public void Update(ShopBindingModel? model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			ShopName = model.ShopName;
+			Adress = model.Adress;
+			OpeningDate = model.OpeningDate;
+		}
+		public ShopViewModel GetViewModel => new()
+		{
+			Id = Id,
+			ShopName = ShopName,
+			Adress = Adress,
+			OpeningDate = OpeningDate,
+			ShopEngines = ShopEngines
+		};
+	}
+}

MotorPlant/MotorPlantListImplement/ShopStorage.cs

@@ -0,0 +1,106 @@
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.SearchModels;
+using MotorPlantContracts.StoragesContracts;
+using MotorPlantContracts.ViewModels;
+using MotorPlantListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantListImplement.Implements
+{
+	public class ShopStorage : IShopStorage
+	{
+		private readonly DataListSingleton _source;
+		public ShopStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+		public List<ShopViewModel> GetFullList()
+		{
+			var result = new List<ShopViewModel>();
+			foreach (var shop in _source.Shops)
+			{
+				result.Add(shop.GetViewModel);
+			}
+			return result;
+		}
+		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 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 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;
+		}
+	}
+}

MotorPlant/MotorPlantView/FormCreateSupply.Designer.cs

@@ -0,0 +1,143 @@
+namespace MotorPlantView
+{
+	partial class FormCreateSupply
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.comboBoxShop = new System.Windows.Forms.ComboBox();
+			this.labelShop = new System.Windows.Forms.Label();
+			this.labelEngine = new System.Windows.Forms.Label();
+			this.comboBoxEngine = new System.Windows.Forms.ComboBox();
+			this.labelCount = new System.Windows.Forms.Label();
+			this.textBoxCount = new System.Windows.Forms.TextBox();
+			this.buttonCancel = new System.Windows.Forms.Button();
+			this.buttonSave = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// comboBoxShop
+			// 
+			this.comboBoxShop.FormattingEnabled = true;
+			this.comboBoxShop.Location = new System.Drawing.Point(115, 12);
+			this.comboBoxShop.Name = "comboBoxShop";
+			this.comboBoxShop.Size = new System.Drawing.Size(344, 28);
+			this.comboBoxShop.TabIndex = 0;
+			// 
+			// labelShop
+			// 
+			this.labelShop.AutoSize = true;
+			this.labelShop.Location = new System.Drawing.Point(12, 15);
+			this.labelShop.Name = "labelShop";
+			this.labelShop.Size = new System.Drawing.Size(76, 20);
+			this.labelShop.TabIndex = 1;
+			this.labelShop.Text = "Магазин: ";
+			// 
+			// labelEngine
+			// 
+			this.labelEngine.AutoSize = true;
+			this.labelEngine.Location = new System.Drawing.Point(12, 49);
+			this.labelEngine.Name = "labelEngine";
+			this.labelEngine.Size = new System.Drawing.Size(75, 20);
+			this.labelEngine.TabIndex = 2;
+			this.labelEngine.Text = "Изделие: ";
+			// 
+			// comboBoxEngine
+			// 
+			this.comboBoxEngine.FormattingEnabled = true;
+			this.comboBoxEngine.Location = new System.Drawing.Point(115, 46);
+			this.comboBoxEngine.Name = "comboBoxEngine";
+			this.comboBoxEngine.Size = new System.Drawing.Size(344, 28);
+			this.comboBoxEngine.TabIndex = 3;
+			// 
+			// labelCount
+			// 
+			this.labelCount.AutoSize = true;
+			this.labelCount.Location = new System.Drawing.Point(12, 83);
+			this.labelCount.Name = "labelCount";
+			this.labelCount.Size = new System.Drawing.Size(97, 20);
+			this.labelCount.TabIndex = 4;
+			this.labelCount.Text = "Количество: ";
+			// 
+			// textBoxCount
+			// 
+			this.textBoxCount.Location = new System.Drawing.Point(115, 80);
+			this.textBoxCount.Name = "textBoxCount";
+			this.textBoxCount.Size = new System.Drawing.Size(344, 27);
+			this.textBoxCount.TabIndex = 5;
+			// 
+			// buttonCancel
+			// 
+			this.buttonCancel.Location = new System.Drawing.Point(300, 113);
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.Size = new System.Drawing.Size(116, 39);
+			this.buttonCancel.TabIndex = 6;
+			this.buttonCancel.Text = "Отмена";
+			this.buttonCancel.UseVisualStyleBackColor = true;
+			this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+			// 
+			// buttonSave
+			// 
+			this.buttonSave.Location = new System.Drawing.Point(168, 113);
+			this.buttonSave.Name = "buttonSave";
+			this.buttonSave.Size = new System.Drawing.Size(116, 39);
+			this.buttonSave.TabIndex = 7;
+			this.buttonSave.Text = "Сохранить";
+			this.buttonSave.UseVisualStyleBackColor = true;
+			this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+			// 
+			// FormCreateSupply
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(471, 164);
+			this.Controls.Add(this.buttonSave);
+			this.Controls.Add(this.buttonCancel);
+			this.Controls.Add(this.textBoxCount);
+			this.Controls.Add(this.labelCount);
+			this.Controls.Add(this.comboBoxEngine);
+			this.Controls.Add(this.labelEngine);
+			this.Controls.Add(this.labelShop);
+			this.Controls.Add(this.comboBoxShop);
+			this.Name = "FormCreateSupply";
+			this.Text = "Создание поставки";
+			this.Load += new System.EventHandler(this.FormCreateSupply_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private ComboBox comboBoxShop;
+		private Label labelShop;
+		private Label labelEngine;
+		private ComboBox comboBoxEngine;
+		private Label labelCount;
+		private TextBox textBoxCount;
+		private Button buttonCancel;
+		private Button buttonSave;
+	}
+}

MotorPlant/MotorPlantView/FormCreateSupply.cs

@@ -0,0 +1,93 @@
+using Microsoft.Extensions.Logging;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using MotorPlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorPlantView
+{
+	public partial class FormCreateSupply : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IEngineLogic _logicP;
+		private readonly IShopLogic _logicS;
+		private List<ShopViewModel> _shopList = new List<ShopViewModel>();
+		private List<EngineViewModel> _EngineList = new List<EngineViewModel>();
+		public FormCreateSupply(ILogger<FormCreateSupply> logger, IEngineLogic logicP, IShopLogic logicS)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logicP = logicP;
+			_logicS = logicS;
+		}
+		private void FormCreateSupply_Load(object sender, EventArgs e)
+		{
+			_shopList = _logicS.ReadList(null);
+			_EngineList = _logicP.ReadList(null);
+			if (_shopList != null)
+			{
+				comboBoxShop.DisplayMember = "ShopName";
+				comboBoxShop.ValueMember = "Id";
+				comboBoxShop.DataSource = _shopList;
+				comboBoxShop.SelectedItem = null;
+				_logger.LogInformation("Загрузка магазинов для поставок");
+			}
+			if (_EngineList != null)
+			{
+				comboBoxEngine.DisplayMember = "EngineName";
+				comboBoxEngine.ValueMember = "Id";
+				comboBoxEngine.DataSource = _EngineList;
+				comboBoxEngine.SelectedItem = null;
+				_logger.LogInformation("Загрузка пиццы для поставок");
+			}
+		}
+		private void ButtonSave_Click(object sender, EventArgs e)
+		{
+			if (comboBoxShop.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (comboBoxEngine.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			_logger.LogInformation("Создание поставки");
+			try
+			{
+				var operationResult = _logicS.MakeSupply(new SupplyBindingModel
+				{
+					ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
+					EngineId = Convert.ToInt32(comboBoxEngine.SelectedValue),
+					Count = Convert.ToInt32(textBoxCount.Text)
+				});
+				if (!operationResult)
+				{
+					throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
+				}
+				MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				DialogResult = DialogResult.OK;
+				Close();
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка создания поставки");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+		private void ButtonCancel_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+	}
+}

MotorPlant/MotorPlantView/FormCreateSupply.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>

MotorPlant/MotorPlantView/FormMain.Designer.cs

@@ -1,182 +1,204 @@
 namespace MotorPlantView.Forms
 {
-    partial class FormMain
+	partial class FormMain
-    {
+	{
-        /// <summary>
+		/// <summary>
-        /// Required designer variable.
+		/// Required designer variable.
-        /// </summary>
+		/// </summary>
-        private System.ComponentModel.IContainer components = null;
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
+		/// <summary>
-        /// Clean up any resources being used.
+		/// Clean up any resources being used.
-        /// </summary>
+		/// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+		protected override void Dispose(bool disposing)
-        {
+		{
-            if (disposing && (components != null))
+			if (disposing && (components != null))
-            {
+			{
-                components.Dispose();
+				components.Dispose();
-            }
+			}
-            base.Dispose(disposing);
+			base.Dispose(disposing);
-        }
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
+		/// <summary>
-        /// Required method for Designer support - do not modify
+		/// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+		/// the contents of this method with the code editor.
-        /// </summary>
+		/// </summary>
-        private void InitializeComponent()
+		private void InitializeComponent()
-        {
+		{
-            toolStrip1 = new ToolStrip();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
-            toolStripDropDownButton1 = new ToolStripDropDownButton();
+			toolStrip1 = new ToolStrip();
-            КомпонентыToolStripMenuItem = new ToolStripMenuItem();
+			toolStripDropDownButton1 = new ToolStripDropDownButton();
-            ДвигателиToolStripMenuItem = new ToolStripMenuItem();
+			КомпонентыToolStripMenuItem = new ToolStripMenuItem();
-            buttonCreateOrder = new Button();
+			ДвигателиToolStripMenuItem = new ToolStripMenuItem();
-            buttonTakeOrderInWork = new Button();
+			магазиныToolStripMenuItem = new ToolStripMenuItem();
-            buttonOrderReady = new Button();
+			buttonCreateOrder = new Button();
-            buttonIssuedOrder = new Button();
+			buttonTakeOrderInWork = new Button();
-            buttonRef = new Button();
+			buttonOrderReady = new Button();
-            dataGridView = new DataGridView();
+			buttonIssuedOrder = new Button();
-            toolStrip1.SuspendLayout();
+			buttonRef = new Button();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			dataGridView = new DataGridView();
-            SuspendLayout();
+			operationToolStripMenuItem = new ToolStripMenuItem();
-            // 
+			transactionToolStripMenuItem = new ToolStripMenuItem();
-            // toolStrip1
+			toolStrip1.SuspendLayout();
-            // 
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            toolStrip1.ImageScalingSize = new Size(20, 20);
+			SuspendLayout();
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
+			// 
-            toolStrip1.Location = new Point(0, 0);
+			// toolStrip1
-            toolStrip1.Name = "toolStrip1";
+			// 
-            toolStrip1.Size = new Size(1107, 27);
+			toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.TabIndex = 0;
+			toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, operationToolStripMenuItem });
-            toolStrip1.Text = "toolStrip1";
+			toolStrip1.Location = new Point(0, 0);
-            // 
+			toolStrip1.Name = "toolStrip1";
-            // toolStripDropDownButton1
+			toolStrip1.Size = new Size(969, 25);
-            // 
+			toolStrip1.TabIndex = 0;
-            toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
+			toolStrip1.Text = "toolStrip1";
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem });
+			// 
-            toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
+			// toolStripDropDownButton1
-            toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+			// 
-            toolStripDropDownButton1.Size = new Size(108, 24);
+			toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.Text = "Справочник";
+			toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem, магазиныToolStripMenuItem });
-            // 
+			toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
-            // КомпонентыToolStripMenuItem
+			toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
-            // 
+			toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
+			toolStripDropDownButton1.Size = new Size(88, 22);
-            КомпонентыToolStripMenuItem.Size = new Size(182, 26);
+			toolStripDropDownButton1.Text = "Справочник";
-            КомпонентыToolStripMenuItem.Text = "Компоненты";
+			// 
-            КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
+			// КомпонентыToolStripMenuItem
-            // 
+			// 
-            // ДвигателиToolStripMenuItem
+			КомпонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            // 
+			КомпонентыToolStripMenuItem.Size = new Size(174, 22);
-            ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem";
+			КомпонентыToolStripMenuItem.Text = "Компоненты";
-            ДвигателиToolStripMenuItem.Size = new Size(182, 26);
+			КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
-            ДвигателиToolStripMenuItem.Text = "Двигатели";
+			// 
-            ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
+			// ДвигателиToolStripMenuItem
-            // 
+			// 
-            // buttonCreateOrder
+			ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem";
-            // 
+			ДвигателиToolStripMenuItem.Size = new Size(174, 22);
-            buttonCreateOrder.Location = new Point(914, 75);
+			ДвигателиToolStripMenuItem.Text = "Двигатели";
-            buttonCreateOrder.Margin = new Padding(3, 4, 3, 4);
+			ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
-            buttonCreateOrder.Name = "buttonCreateOrder";
+			// 
-            buttonCreateOrder.Size = new Size(161, 32);
+			// магазиныToolStripMenuItem
-            buttonCreateOrder.TabIndex = 1;
+			// 
-            buttonCreateOrder.Text = "Создать заказ";
+			магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            buttonCreateOrder.UseVisualStyleBackColor = true;
+			магазиныToolStripMenuItem.Size = new Size(180, 22);
-            buttonCreateOrder.Click += buttonCreateOrder_Click;
+			магазиныToolStripMenuItem.Text = "Магазины";
-            // 
+			магазиныToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
-            // buttonTakeOrderInWork
+			// 
-            // 
+			// buttonCreateOrder
-            buttonTakeOrderInWork.Location = new Point(914, 115);
+			// 
-            buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4);
+			buttonCreateOrder.Location = new Point(800, 56);
-            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+			buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonTakeOrderInWork.Size = new Size(161, 48);
+			buttonCreateOrder.Size = new Size(141, 24);
-            buttonTakeOrderInWork.TabIndex = 2;
+			buttonCreateOrder.TabIndex = 1;
-            buttonTakeOrderInWork.Text = "Отдать на выполнение";
+			buttonCreateOrder.Text = "Создать заказ";
-            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+			buttonCreateOrder.UseVisualStyleBackColor = true;
-            buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click;
+			buttonCreateOrder.Click += buttonCreateOrder_Click;
-            // 
+			// 
-            // buttonOrderReady
+			// buttonTakeOrderInWork
-            // 
+			// 
-            buttonOrderReady.Location = new Point(914, 189);
+			buttonTakeOrderInWork.Location = new Point(800, 100);
-            buttonOrderReady.Margin = new Padding(3, 4, 3, 4);
+			buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonOrderReady.Name = "buttonOrderReady";
+			buttonTakeOrderInWork.Size = new Size(141, 24);
-            buttonOrderReady.Size = new Size(161, 32);
+			buttonTakeOrderInWork.TabIndex = 2;
-            buttonOrderReady.TabIndex = 3;
+			buttonTakeOrderInWork.Text = "Отдать на выполнение";
-            buttonOrderReady.Text = "Заказ готов";
+			buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-            buttonOrderReady.UseVisualStyleBackColor = true;
+			buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click;
-            buttonOrderReady.Click += buttonOrderReady_Click;
+			// 
-            // 
+			// buttonOrderReady
-            // buttonIssuedOrder
+			// 
-            // 
+			buttonOrderReady.Location = new Point(800, 142);
-            buttonIssuedOrder.Location = new Point(914, 241);
+			buttonOrderReady.Name = "buttonOrderReady";
-            buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4);
+			buttonOrderReady.Size = new Size(141, 24);
-            buttonIssuedOrder.Name = "buttonIssuedOrder";
+			buttonOrderReady.TabIndex = 3;
-            buttonIssuedOrder.Size = new Size(161, 32);
+			buttonOrderReady.Text = "Заказ готов";
-            buttonIssuedOrder.TabIndex = 4;
+			buttonOrderReady.UseVisualStyleBackColor = true;
-            buttonIssuedOrder.Text = "Заказ выдан";
+			buttonOrderReady.Click += buttonOrderReady_Click;
-            buttonIssuedOrder.UseVisualStyleBackColor = true;
+			// 
-            buttonIssuedOrder.Click += buttonIssuedOrder_Click;
+			// buttonIssuedOrder
-            // 
+			// 
-            // buttonRef
+			buttonIssuedOrder.Location = new Point(800, 181);
-            // 
+			buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonRef.Location = new Point(914, 296);
+			buttonIssuedOrder.Size = new Size(141, 24);
-            buttonRef.Margin = new Padding(3, 4, 3, 4);
+			buttonIssuedOrder.TabIndex = 4;
-            buttonRef.Name = "buttonRef";
+			buttonIssuedOrder.Text = "Заказ выдан";
-            buttonRef.Size = new Size(161, 32);
+			buttonIssuedOrder.UseVisualStyleBackColor = true;
-            buttonRef.TabIndex = 5;
+			buttonIssuedOrder.Click += buttonIssuedOrder_Click;
-            buttonRef.Text = "Обновить список";
+			// 
-            buttonRef.UseVisualStyleBackColor = true;
+			// buttonRef
-            buttonRef.Click += buttonRef_Click;
+			// 
-            // 
+			buttonRef.Location = new Point(800, 222);
-            // dataGridView
+			buttonRef.Name = "buttonRef";
-            // 
+			buttonRef.Size = new Size(141, 24);
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			buttonRef.TabIndex = 5;
-            dataGridView.Location = new Point(0, 35);
+			buttonRef.Text = "Обновить список";
-            dataGridView.Margin = new Padding(3, 4, 3, 4);
+			buttonRef.UseVisualStyleBackColor = true;
-            dataGridView.Name = "dataGridView";
+			buttonRef.Click += buttonRef_Click;
-            dataGridView.ReadOnly = true;
+			// 
-            dataGridView.RowHeadersWidth = 51;
+			// dataGridView
-            dataGridView.RowTemplate.Height = 24;
+			// 
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Size = new Size(872, 580);
+			dataGridView.Location = new Point(0, 26);
-            dataGridView.TabIndex = 6;
+			dataGridView.Name = "dataGridView";
-            // 
+			dataGridView.ReadOnly = true;
-            // FormMain
+			dataGridView.RowHeadersWidth = 51;
-            // 
+			dataGridView.RowTemplate.Height = 24;
-            AutoScaleDimensions = new SizeF(8F, 20F);
+			dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            AutoScaleMode = AutoScaleMode.Font;
+			dataGridView.Size = new Size(763, 435);
-            ClientSize = new Size(1107, 615);
+			dataGridView.TabIndex = 6;
-            Controls.Add(dataGridView);
+			// 
-            Controls.Add(buttonRef);
+			// operationToolStripMenuItem
-            Controls.Add(buttonIssuedOrder);
+			// 
-            Controls.Add(buttonOrderReady);
+			operationToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { transactionToolStripMenuItem });
-            Controls.Add(buttonTakeOrderInWork);
+			operationToolStripMenuItem.Name = "operationToolStripMenuItem";
-            Controls.Add(buttonCreateOrder);
+			operationToolStripMenuItem.Size = new Size(75, 25);
-            Controls.Add(toolStrip1);
+			operationToolStripMenuItem.Text = "Операции";
-            Margin = new Padding(3, 4, 3, 4);
+			// 
-            Name = "FormMain";
+			// transactionToolStripMenuItem
-            Text = "Моторный завод";
+			// 
-            Load += FormMain_Load;
+			transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
-            toolStrip1.ResumeLayout(false);
+			transactionToolStripMenuItem.Size = new Size(180, 22);
-            toolStrip1.PerformLayout();
+			transactionToolStripMenuItem.Text = "Поставка";
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			transactionToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
-            ResumeLayout(false);
+			// 
-            PerformLayout();
+			// FormMain
-        }
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(969, 461);
+			Controls.Add(dataGridView);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonIssuedOrder);
+			Controls.Add(buttonOrderReady);
+			Controls.Add(buttonTakeOrderInWork);
+			Controls.Add(buttonCreateOrder);
+			Controls.Add(toolStrip1);
+			Name = "FormMain";
+			Text = "Моторный завод";
+			Load += FormMain_Load;
+			toolStrip1.ResumeLayout(false);
+			toolStrip1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
 
-        #endregion
+		#endregion
 
-        private ToolStrip toolStrip1;
+		private ToolStrip toolStrip1;
-        private Button buttonCreateOrder;
+		private Button buttonCreateOrder;
-        private Button buttonTakeOrderInWork;
+		private Button buttonTakeOrderInWork;
-        private Button buttonOrderReady;
+		private Button buttonOrderReady;
-        private Button buttonIssuedOrder;
+		private Button buttonIssuedOrder;
-        private Button buttonRef;
+		private Button buttonRef;
-        private DataGridView dataGridView;
+		private DataGridView dataGridView;
-        private ToolStripDropDownButton toolStripDropDownButton1;
+		private ToolStripDropDownButton toolStripDropDownButton1;
-        private ToolStripMenuItem КомпонентыToolStripMenuItem;
+		private ToolStripMenuItem КомпонентыToolStripMenuItem;
-        private ToolStripMenuItem ДвигателиToolStripMenuItem;
+		private ToolStripMenuItem ДвигателиToolStripMenuItem;
-    }
+		private ToolStripMenuItem магазиныToolStripMenuItem;
+		private ToolStripMenuItem operationToolStripMenuItem;
+		private ToolStripMenuItem transactionToolStripMenuItem;
+	}
 }

MotorPlant/MotorPlantView/FormMain.cs

@@ -4,143 +4,159 @@ using MotorPlantContracts.BusinessLogicsContracts;
 
 namespace MotorPlantView.Forms
 {
-    public partial class FormMain : Form
+	public partial class FormMain : Form
-    {
+	{
-        private readonly ILogger _logger;
+		private readonly ILogger _logger;
-        private readonly IOrderLogic _orderLogic;
+		private readonly IOrderLogic _orderLogic;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
-        {
+		{
-            InitializeComponent();
+			InitializeComponent();
-            _logger = logger;
+			_logger = logger;
-            _orderLogic = orderLogic;
+			_orderLogic = orderLogic;
-        }
+		}
-        private void FormMain_Load(object sender, EventArgs e)
+		private void FormMain_Load(object sender, EventArgs e)
-        {
+		{
-            LoadData();
+			LoadData();
-        }
+		}
-        private void LoadData()
+		private void LoadData()
-        {
+		{
-            _logger.LogInformation("Загрузка заказов");
+			_logger.LogInformation("Загрузка заказов");
-            try
+			try
-            {
+			{
-                var list = _orderLogic.ReadList(null);
+				var list = _orderLogic.ReadList(null);
 
-                if (list != null)
+				if (list != null)
-                {
+				{
-                    dataGridView.DataSource = list;
+					dataGridView.DataSource = list;
-                    dataGridView.Columns["EngineId"].Visible = false;
+					dataGridView.Columns["EngineId"].Visible = false;
-                    dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
+				}
 
-                _logger.LogInformation("Загрузка заказов");
+				_logger.LogInformation("Загрузка заказов");
-            }
+			}
-            catch (Exception ex)
+			catch (Exception ex)
-            {
+			{
-                _logger.LogError(ex, "Ошибка загрузки заказов");
+				_logger.LogError(ex, "Ошибка загрузки заказов");
-            }
+			}
-        }
+		}
-        private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
+		private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
-        {
+		{
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-            if (service is FormComponents form)
+			if (service is FormComponents form)
-            {
+			{
-                form.ShowDialog();
+				form.ShowDialog();
-            }
+			}
-        }
+		}
-        private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
+		private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
-        {
+		{
-            var service = Program.ServiceProvider?.GetService(typeof(FormEngines));
+			var service = Program.ServiceProvider?.GetService(typeof(FormEngines));
 
-            if (service is FormEngines form)
+			if (service is FormEngines form)
-            {
+			{
-                form.ShowDialog();
+				form.ShowDialog();
-            }
+			}
-        }
+		}
-        private void buttonCreateOrder_Click(object sender, EventArgs e)
+		private void buttonCreateOrder_Click(object sender, EventArgs e)
-        {
+		{
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-            if (service is FormCreateOrder form)
+			if (service is FormCreateOrder form)
-            {
+			{
-                form.ShowDialog();
+				form.ShowDialog();
-                LoadData();
+				LoadData();
-            }
+			}
-        }
+		}
-        private void buttonTakeOrderInWork_Click(object sender, EventArgs e)
+		private void buttonTakeOrderInWork_Click(object sender, EventArgs e)
-        {
+		{
-            if (dataGridView.SelectedRows.Count == 1)
+			if (dataGridView.SelectedRows.Count == 1)
-            {
+			{
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
-                try
+				try
-                {
+				{
-                    var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
+					var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
-                    {
+					{
-                        Id = id,
+						Id = id,
-                    });
+					});
-                    if (!operationResult)
+					if (!operationResult)
-                    {
+					{
-                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                    }
+					}
-                    LoadData();
+					LoadData();
-                }
+				}
-                catch (Exception ex)
+				catch (Exception ex)
-                {
+				{
-                    _logger.LogError(ex, "Ошибка передачи заказа в работу");
+					_logger.LogError(ex, "Ошибка передачи заказа в работу");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
+				}
-            }
+			}
-        }
+		}
-        private void buttonOrderReady_Click(object sender, EventArgs e)
+		private void buttonOrderReady_Click(object sender, EventArgs e)
-        {
+		{
-            if (dataGridView.SelectedRows.Count == 1)
+			if (dataGridView.SelectedRows.Count == 1)
-            {
+			{
-                int id =
+				int id =
-               Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+			   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
-                try
+				try
-                {
+				{
-                    var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id });
+					var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id });
-                    if (!operationResult)
+					if (!operationResult)
-                    {
+					{
-                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                    }
+					}
-                    LoadData();
+					LoadData();
-                }
+				}
-                catch (Exception ex)
+				catch (Exception ex)
-                {
+				{
-                    _logger.LogError(ex, "Ошибка отметки о готовности заказа");
+					_logger.LogError(ex, "Ошибка отметки о готовности заказа");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
+				}
-            }
+			}
-        }
+		}
-        private void buttonIssuedOrder_Click(object sender, EventArgs e)
+		private void buttonIssuedOrder_Click(object sender, EventArgs e)
-        {
+		{
-            if (dataGridView.SelectedRows.Count == 1)
+			if (dataGridView.SelectedRows.Count == 1)
-            {
+			{
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id);
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id);
-                try
+				try
-                {
+				{
-                    var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
+					var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
-                    {
+					{
-                        Id = id
+						Id = id
-                    });
+					});
-                    if (!operationResult)
+					if (!operationResult)
-                    {
+					{
-                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                    }
+					}
-                    _logger.LogInformation("Заказ №{id} выдан", id);
+					_logger.LogInformation("Заказ №{id} выдан", id);
-                    LoadData();
+					LoadData();
-                }
+				}
-                catch (Exception ex)
+				catch (Exception ex)
-                {
+				{
-                    _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					_logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
+				}
-            }
+			}
-        }
+		}
-        private void buttonRef_Click(object sender, EventArgs e)
+		private void buttonRef_Click(object sender, EventArgs e)
-        {
+		{
-            LoadData();
+			LoadData();
-        }
+		}
-    }
+		private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+			if (service is FormShops form)
+			{
+				form.ShowDialog();
+			}
+		}
+		private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
+			if (service is FormCreateSupply form)
+			{
+				form.ShowDialog();
+			}
+		}
+	}
 }

MotorPlant/MotorPlantView/FormShop.Designer.cs

@@ -0,0 +1,196 @@
+namespace MotorPlantView
+{
+	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();
+			textBoxName = new TextBox();
+			textBoxAdress = new TextBox();
+			labelAdress = new Label();
+			buttonCancel = new Button();
+			buttonSave = new Button();
+			dataGridView = new DataGridView();
+			label1 = new Label();
+			dateTimeOpen = new DateTimePicker();
+			id = new DataGridViewTextBoxColumn();
+			EngineName = new DataGridViewTextBoxColumn();
+			Count = new DataGridViewTextBoxColumn();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// labelName
+			// 
+			labelName.AutoSize = true;
+			labelName.Location = new Point(10, 11);
+			labelName.Name = "labelName";
+			labelName.Size = new Size(65, 15);
+			labelName.TabIndex = 0;
+			labelName.Text = "Название: ";
+			// 
+			// textBoxName
+			// 
+			textBoxName.Location = new Point(89, 9);
+			textBoxName.Margin = new Padding(3, 2, 3, 2);
+			textBoxName.Name = "textBoxName";
+			textBoxName.Size = new Size(242, 23);
+			textBoxName.TabIndex = 1;
+			// 
+			// textBoxAdress
+			// 
+			textBoxAdress.Location = new Point(89, 44);
+			textBoxAdress.Margin = new Padding(3, 2, 3, 2);
+			textBoxAdress.Name = "textBoxAdress";
+			textBoxAdress.Size = new Size(374, 23);
+			textBoxAdress.TabIndex = 3;
+			// 
+			// labelAdress
+			// 
+			labelAdress.AutoSize = true;
+			labelAdress.Location = new Point(10, 46);
+			labelAdress.Name = "labelAdress";
+			labelAdress.Size = new Size(46, 15);
+			labelAdress.TabIndex = 2;
+			labelAdress.Text = "Адрес: ";
+			// 
+			// buttonCancel
+			// 
+			buttonCancel.Location = new Point(395, 343);
+			buttonCancel.Margin = new Padding(3, 2, 3, 2);
+			buttonCancel.Name = "buttonCancel";
+			buttonCancel.Size = new Size(114, 33);
+			buttonCancel.TabIndex = 5;
+			buttonCancel.Text = "Отмена";
+			buttonCancel.UseVisualStyleBackColor = true;
+			buttonCancel.Click += buttonCancel_Click;
+			// 
+			// buttonSave
+			// 
+			buttonSave.Location = new Point(276, 343);
+			buttonSave.Margin = new Padding(3, 2, 3, 2);
+			buttonSave.Name = "buttonSave";
+			buttonSave.Size = new Size(114, 33);
+			buttonSave.TabIndex = 6;
+			buttonSave.Text = "Сохранить";
+			buttonSave.UseVisualStyleBackColor = true;
+			buttonSave.Click += buttonSave_Click;
+			// 
+			// dataGridView
+			// 
+			dataGridView.AllowUserToAddRows = false;
+			dataGridView.AllowUserToDeleteRows = false;
+			dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Columns.AddRange(new DataGridViewColumn[] { id, EngineName, Count });
+			dataGridView.Location = new Point(10, 108);
+			dataGridView.Margin = new Padding(3, 2, 3, 2);
+			dataGridView.Name = "dataGridView";
+			dataGridView.ReadOnly = true;
+			dataGridView.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.None;
+			dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
+			dataGridView.RowTemplate.Height = 29;
+			dataGridView.Size = new Size(498, 230);
+			dataGridView.TabIndex = 7;
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new Point(10, 77);
+			label1.Name = "label1";
+			label1.Size = new Size(87, 15);
+			label1.TabIndex = 8;
+			label1.Text = "Дата открытия";
+			// 
+			// dateTimeOpen
+			// 
+			dateTimeOpen.Location = new Point(112, 77);
+			dateTimeOpen.Margin = new Padding(3, 2, 3, 2);
+			dateTimeOpen.Name = "dateTimeOpen";
+			dateTimeOpen.Size = new Size(351, 23);
+			dateTimeOpen.TabIndex = 9;
+			// 
+			// id
+			// 
+			id.HeaderText = "id";
+			id.MinimumWidth = 6;
+			id.Name = "id";
+			id.ReadOnly = true;
+			id.Visible = false;
+			// 
+			// EngineName
+			// 
+			EngineName.HeaderText = "Двигатель";
+			EngineName.MinimumWidth = 6;
+			EngineName.Name = "EngineName";
+			EngineName.ReadOnly = true;
+			// 
+			// Count
+			// 
+			Count.HeaderText = "Количество";
+			Count.MinimumWidth = 6;
+			Count.Name = "Count";
+			Count.ReadOnly = true;
+			// 
+			// FormShop
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(519, 385);
+			Controls.Add(dateTimeOpen);
+			Controls.Add(label1);
+			Controls.Add(dataGridView);
+			Controls.Add(buttonSave);
+			Controls.Add(buttonCancel);
+			Controls.Add(textBoxAdress);
+			Controls.Add(labelAdress);
+			Controls.Add(textBoxName);
+			Controls.Add(labelName);
+			Margin = new Padding(3, 2, 3, 2);
+			Name = "FormShop";
+			Text = "Магазин";
+			Load += FormShop_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
+
+		#endregion
+
+		private Label labelName;
+		private TextBox textBoxName;
+		private TextBox textBoxAdress;
+		private Label labelAdress;
+		private Button buttonCancel;
+		private Button buttonSave;
+		private DataGridView dataGridView;
+		private Label label1;
+		private DateTimePicker dateTimeOpen;
+		private DataGridViewTextBoxColumn id;
+		private DataGridViewTextBoxColumn EngineName;
+		private DataGridViewTextBoxColumn Count;
+	}
+}

MotorPlant/MotorPlantView/FormShop.cs

@@ -0,0 +1,123 @@
+using MotorPlantDataModels.Models;
+using Microsoft.Extensions.Logging;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using MotorPlantContracts.SearchModels;
+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 MotorPlantView
+{
+	public partial class FormShop : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IShopLogic _logic;
+		private int? _id;
+		public int Id { set { _id = value; } }
+		private Dictionary<int, (IEngineModel, int)> _ShopEngines;
+		private DateTime? _openingDate = null;
+		public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logic = logic;
+			_ShopEngines = new Dictionary<int, (IEngineModel, 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;
+						textBoxAdress.Text = view.Adress;
+						dateTimeOpen.Value = view.OpeningDate;
+						_ShopEngines = view.ShopEngines ?? new Dictionary<int, (IEngineModel, int)>();
+						LoadData();
+					}
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка загрузки магазина");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
+		private void LoadData()
+		{
+			_logger.LogInformation("Загрузка изделий в магазине");
+			try
+			{
+				if (_ShopEngines != null)
+				{
+					dataGridView.Rows.Clear();
+					foreach (var sr in _ShopEngines)
+					{
+						dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.EngineName, sr.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(textBoxAdress.Text))
+			{
+				MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			_logger.LogInformation("Сохранение магазина");
+			try
+			{
+				var model = new ShopBindingModel
+				{
+					Id = _id ?? 0,
+					ShopName = textBoxName.Text,
+					Adress = textBoxAdress.Text,
+					OpeningDate = dateTimeOpen.Value
+				};
+				var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+				if (!operationResult)
+				{
+					throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+				}
+				MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				DialogResult = DialogResult.OK;
+				Close();
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка сохранения магазина");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+		private void buttonCancel_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+	}
+}

MotorPlant/MotorPlantView/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>

MotorPlant/MotorPlantView/FormShops.Designer.cs

@@ -0,0 +1,130 @@
+namespace MotorPlantView
+{
+	partial class FormShops
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.ToolsPanel = new System.Windows.Forms.Panel();
+			this.buttonRef = new System.Windows.Forms.Button();
+			this.buttonDel = new System.Windows.Forms.Button();
+			this.buttonUpd = new System.Windows.Forms.Button();
+			this.buttonAdd = new System.Windows.Forms.Button();
+			this.dataGridView = new System.Windows.Forms.DataGridView();
+			this.ToolsPanel.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// ToolsPanel
+			// 
+			this.ToolsPanel.Controls.Add(this.buttonRef);
+			this.ToolsPanel.Controls.Add(this.buttonDel);
+			this.ToolsPanel.Controls.Add(this.buttonUpd);
+			this.ToolsPanel.Controls.Add(this.buttonAdd);
+			this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
+			this.ToolsPanel.Name = "ToolsPanel";
+			this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
+			this.ToolsPanel.TabIndex = 3;
+			// 
+			// buttonRef
+			// 
+			this.buttonRef.Location = new System.Drawing.Point(31, 206);
+			this.buttonRef.Name = "buttonRef";
+			this.buttonRef.Size = new System.Drawing.Size(126, 36);
+			this.buttonRef.TabIndex = 3;
+			this.buttonRef.Text = "Обновить";
+			this.buttonRef.UseVisualStyleBackColor = true;
+			this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
+			// 
+			// buttonDel
+			// 
+			this.buttonDel.Location = new System.Drawing.Point(31, 142);
+			this.buttonDel.Name = "buttonDel";
+			this.buttonDel.Size = new System.Drawing.Size(126, 36);
+			this.buttonDel.TabIndex = 2;
+			this.buttonDel.Text = "Удалить";
+			this.buttonDel.UseVisualStyleBackColor = true;
+			this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
+			// 
+			// buttonUpd
+			// 
+			this.buttonUpd.Location = new System.Drawing.Point(31, 76);
+			this.buttonUpd.Name = "buttonUpd";
+			this.buttonUpd.Size = new System.Drawing.Size(126, 36);
+			this.buttonUpd.TabIndex = 1;
+			this.buttonUpd.Text = "Изменить";
+			this.buttonUpd.UseVisualStyleBackColor = true;
+			this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
+			// 
+			// buttonAdd
+			// 
+			this.buttonAdd.Location = new System.Drawing.Point(31, 16);
+			this.buttonAdd.Name = "buttonAdd";
+			this.buttonAdd.Size = new System.Drawing.Size(126, 36);
+			this.buttonAdd.TabIndex = 0;
+			this.buttonAdd.Text = "Добавить";
+			this.buttonAdd.UseVisualStyleBackColor = true;
+			this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+			// 
+			// dataGridView
+			// 
+			this.dataGridView.AllowUserToAddRows = false;
+			this.dataGridView.AllowUserToDeleteRows = false;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.Location = new System.Drawing.Point(12, 12);
+			this.dataGridView.Name = "dataGridView";
+			this.dataGridView.ReadOnly = true;
+			this.dataGridView.RowHeadersWidth = 51;
+			this.dataGridView.RowTemplate.Height = 29;
+			this.dataGridView.Size = new System.Drawing.Size(590, 426);
+			this.dataGridView.TabIndex = 2;
+			// 
+			// FormShops
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(800, 450);
+			this.Controls.Add(this.ToolsPanel);
+			this.Controls.Add(this.dataGridView);
+			this.Name = "FormShops";
+			this.Text = "Магазины";
+			this.Load += new System.EventHandler(this.FormShops_Load);
+			this.ToolsPanel.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private Panel ToolsPanel;
+		private Button buttonRef;
+		private Button buttonDel;
+		private Button buttonUpd;
+		private Button buttonAdd;
+		private DataGridView dataGridView;
+	}
+}

MotorPlant/MotorPlantView/FormShops.cs

@@ -0,0 +1,109 @@
+using Microsoft.Extensions.Logging;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+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 MotorPlantView
+{
+	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["ShopEngines"].Visible = false;
+					dataGridView.Columns["ShopName"].AutoSizeMode =
+					DataGridViewAutoSizeColumnMode.Fill;
+				}
+				_logger.LogInformation("Загрузка магазинов");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки магазинов");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+		private void ButtonAdd_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+			if (service is FormShop form)
+			{
+				if (form.ShowDialog() == DialogResult.OK)
+				{
+					LoadData();
+				}
+			}
+		}
+		private void ButtonUpd_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+				if (service is FormShop form)
+				{
+					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					if (form.ShowDialog() == DialogResult.OK)
+					{
+						LoadData();
+					}
+				}
+			}
+		}
+		private void ButtonDel_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+				{
+					int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					_logger.LogInformation("Удаление магазина");
+					try
+					{
+						if (!_logic.Delete(new ShopBindingModel
+						{
+							Id = id
+						}))
+						{
+							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+						}
+						LoadData();
+					}
+					catch (Exception ex)
+					{
+						_logger.LogError(ex, "Ошибка удаления магазина");
+						MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					}
+				}
+			}
+		}
+		private void ButtonRef_Click(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+	}
+}

MotorPlant/MotorPlantView/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>

MotorPlant/MotorPlantView/Program.cs

@@ -49,6 +49,11 @@ namespace MotorPlantView.Forms
             services.AddTransient<FormEngine>();
             services.AddTransient<FormEngineComponent>();
             services.AddTransient<FormEngines>();
-        }
+			services.AddTransient<IShopStorage, ShopStorage>();
+			services.AddTransient<IShopLogic, ShopLogic>();
+			services.AddTransient<FormShop>();
+			services.AddTransient<FormShops>();
+			services.AddTransient<FormCreateSupply>();
+		}
     }
 }