Лаб1 усложнённая- внедрение магазина

FoodOrders/AbstractFoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,159 @@
+using AbstractFoodOrdersContracts.BindingModels;
+using AbstractFoodOrdersContracts.BusinessLogicsContracts;
+using AbstractFoodOrdersContracts.SearchModels;
+using AbstractFoodOrdersContracts.StoragesContracts;
+using AbstractFoodOrdersContracts.ViewModels;
+using AbstractFoodOrdersDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractFoodOrdersBusinessLogic.BusinessLogics
+{
+	public class ShopLogic : IShopLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IShopStorage _shopStorage;
+
+		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
+		{
+			_logger = logger;
+			_shopStorage = shopStorage;
+		}
+
+		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;
+		}
+
+		private void CheckModel(ShopBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				throw new ArgumentNullException("Нет названия иагазина", nameof(model.ShopName));
+			}
+			if (string.IsNullOrEmpty(model.ShopAdress))
+			{
+				throw new ArgumentNullException("Нет адресса магазина", nameof(model.ShopAdress));
+			}
+			_logger.LogInformation("Shop. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
+			var element = _shopStorage.GetElement(new ShopSearchModel
+			{
+				ShopName = model.ShopName
+			});
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Магазин с таким названием уже есть");
+			}
+		}
+
+		public bool DeliverDishToShop(ShopBindingModel shopModel, IDishModel dishModel, int count)
+		{
+			CheckModel(shopModel, false);
+			if (dishModel == null)
+			{
+				throw new ArgumentNullException(nameof(dishModel));
+			}
+			if (count <= 0)
+			{
+				throw new ArgumentNullException("Количество изделий в поставке должно быть больше нуля!");
+			}
+			var element = _shopStorage.GetElement(new ShopSearchModel
+			{
+				Id = shopModel.Id
+			});
+			if (element == null)
+			{
+				_logger.LogWarning("Read operation failed");
+				return false;
+			}
+			_logger.LogInformation("Delivery. ShopName:{ShopName}. Id:{Id}. DishName:{DishName}. Count:{count}", element.ShopName, element.Id, dishModel.DishName, count);
+			if (element.ShopDishes.TryGetValue(dishModel.Id, out var shopDish))
+			{
+				element.ShopDishes[dishModel.Id] = (dishModel, shopDish.Item2 + count);
+			}
+			else
+			{
+				element.ShopDishes.Add(dishModel.Id, (dishModel, count));
+			}
+			_shopStorage.Update(new ShopBindingModel
+			{
+				Id = element.Id,
+				ShopName = element.ShopName,
+				ShopAdress = element.ShopAdress,
+				OpeningDate = element.OpeningDate,
+				ShopDishes = element.ShopDishes
+			});
+			return true;
+		}
+	}
+}

FoodOrders/AbstractFoodOrdersContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,22 @@
+using AbstractFoodOrdersDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractFoodOrdersContracts.BindingModels
+{
+	public class ShopBindingModel : IShopModel
+	{
+		public int Id { get; set; }
+		public string ShopName { get; set; } = string.Empty;
+		public string ShopAdress { get; set; } = string.Empty;
+		public DateTime OpeningDate { get; set; }
+		public Dictionary<int, (IDishModel, int)> ShopDishes
+		{
+			get;
+			set;
+		} = new();
+	}
+}

FoodOrders/AbstractFoodOrdersContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,22 @@
+using AbstractFoodOrdersContracts.BindingModels;
+using AbstractFoodOrdersContracts.SearchModels;
+using AbstractFoodOrdersContracts.ViewModels;
+using AbstractFoodOrdersDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractFoodOrdersContracts.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 DeliverDishToShop(ShopBindingModel shopModel, IDishModel dishModel, int count);
+	}
+}

FoodOrders/AbstractFoodOrdersContracts/SearchModels/ShopSearchModel.cs

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

FoodOrders/AbstractFoodOrdersContracts/StoragesContracts/IShopStorage.cs

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

FoodOrders/AbstractFoodOrdersContracts/ViewModels/ShopViewModel.cs

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

FoodOrders/AbstractFoodOrdersDataModels/Models/IShopModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractFoodOrdersDataModels.Models
+{
+	public interface IShopModel : IId
+	{
+		string ShopName { get; }
+		string ShopAdress { get; }
+		DateTime OpeningDate { get; }
+		Dictionary<int, (IDishModel, int)> ShopDishes { get; }
+	}
+}

FoodOrders/AbstractFoodOrdersListImplement/DataListSingleton.cs

@@ -13,11 +13,13 @@ namespace AbstractFoodOrdersListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Dish> Dishes { get; set; }
-        private DataListSingleton()
+		public List<Shop> Shops { get; set; }
+		private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Dishes = new List<Dish>();
+            Shops = new List<Shop>();
         }
         public static DataListSingleton GetInstance()
         {

FoodOrders/FoodOrders/FormDelivery.Designer.cs

@@ -0,0 +1,143 @@
+namespace FoodOrders
+{
+	partial class FormDelivery
+	{
+		/// <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.buttonCancel = new System.Windows.Forms.Button();
+			this.buttonCreate = new System.Windows.Forms.Button();
+			this.textBoxSum = new System.Windows.Forms.TextBox();
+			this.comboBoxShop = new System.Windows.Forms.ComboBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.comboBoxDish = new System.Windows.Forms.ComboBox();
+			this.SuspendLayout();
+			// 
+			// buttonCancel
+			// 
+			this.buttonCancel.Location = new System.Drawing.Point(254, 130);
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.Size = new System.Drawing.Size(94, 29);
+			this.buttonCancel.TabIndex = 15;
+			this.buttonCancel.Text = "Отмена";
+			this.buttonCancel.UseVisualStyleBackColor = true;
+			this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+			// 
+			// buttonCreate
+			// 
+			this.buttonCreate.Location = new System.Drawing.Point(142, 130);
+			this.buttonCreate.Name = "buttonCreate";
+			this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+			this.buttonCreate.TabIndex = 14;
+			this.buttonCreate.Text = "Создать";
+			this.buttonCreate.UseVisualStyleBackColor = true;
+			this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+			// 
+			// textBoxSum
+			// 
+			this.textBoxSum.Location = new System.Drawing.Point(129, 84);
+			this.textBoxSum.Name = "textBoxSum";
+			this.textBoxSum.Size = new System.Drawing.Size(219, 27);
+			this.textBoxSum.TabIndex = 13;
+			// 
+			// comboBoxShop
+			// 
+			this.comboBoxShop.FormattingEnabled = true;
+			this.comboBoxShop.Location = new System.Drawing.Point(129, 6);
+			this.comboBoxShop.Name = "comboBoxShop";
+			this.comboBoxShop.Size = new System.Drawing.Size(219, 28);
+			this.comboBoxShop.TabIndex = 11;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 87);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(93, 20);
+			this.label3.TabIndex = 10;
+			this.label3.Text = "Количество:";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 47);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(71, 20);
+			this.label2.TabIndex = 9;
+			this.label2.Text = "Изделие:";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 9);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(72, 20);
+			this.label1.TabIndex = 8;
+			this.label1.Text = "Магазин:";
+			// 
+			// comboBoxDish
+			// 
+			this.comboBoxDish.FormattingEnabled = true;
+			this.comboBoxDish.Location = new System.Drawing.Point(129, 44);
+			this.comboBoxDish.Name = "comboBoxDish";
+			this.comboBoxDish.Size = new System.Drawing.Size(219, 28);
+			this.comboBoxDish.TabIndex = 16;
+			// 
+			// FormDelivery
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(359, 173);
+			this.Controls.Add(this.comboBoxDish);
+			this.Controls.Add(this.buttonCancel);
+			this.Controls.Add(this.buttonCreate);
+			this.Controls.Add(this.textBoxSum);
+			this.Controls.Add(this.comboBoxShop);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Name = "FormDelivery";
+			this.Text = "FormDelivery";
+			this.Load += new System.EventHandler(this.FormDelivery_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private Button buttonCancel;
+		private Button buttonCreate;
+		private TextBox textBoxSum;
+		private ComboBox comboBoxShop;
+		private Label label3;
+		private Label label2;
+		private Label label1;
+		private ComboBox comboBoxDish;
+	}
+}

FoodOrders/FoodOrders/FormDelivery.cs

@@ -0,0 +1,106 @@
+using AbstractFoodOrdersContracts.BindingModels;
+using AbstractFoodOrdersContracts.BusinessLogicsContracts;
+using AbstractFoodOrdersContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FoodOrders
+{
+	public partial class FormDelivery : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IDishLogic _logicD;
+		private readonly IShopLogic _logicS;
+		private List<DishViewModel>? _listDish;
+		private List<ShopViewModel>? _listShop;
+		public FormDelivery(ILogger<FormDelivery> logger, IDishLogic logicD, IShopLogic logicS)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logicD = logicD;
+			_logicS = logicS;
+		}
+
+		private void FormDelivery_Load(object sender, EventArgs e)
+		{
+			_logger.LogInformation("Загрузка магазинов для поставки");
+			_listShop = _logicS.ReadList(null);
+			if (_listShop != null)
+			{
+				comboBoxShop.DisplayMember = "ShopName";
+				comboBoxShop.ValueMember = "Id";
+				comboBoxShop.DataSource = _listShop;
+				comboBoxShop.SelectedItem = null;
+			}
+			_logger.LogInformation("Загрузка изделий для поставки");
+			_listDish = _logicD.ReadList(null);
+			if (_listDish != null)
+			{
+				comboBoxDish.DisplayMember = "DishName";
+				comboBoxDish.ValueMember = "Id";
+				comboBoxDish.DataSource = _listDish;
+				comboBoxDish.SelectedItem = null;
+			}
+		}
+
+		private void buttonCancel_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void buttonCreate_Click(object sender, EventArgs e)
+		{
+			if (comboBoxShop.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (comboBoxDish.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (String.IsNullOrEmpty(textBoxSum.Text))
+			{
+				MessageBox.Show("Заполните поле количество!", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			try
+			{
+				ShopBindingModel shop = new ShopBindingModel
+				{
+					Id = Convert.ToInt32(comboBoxShop.SelectedValue)
+				};
+				DishBindingModel dish = new DishBindingModel
+				{
+					Id = Convert.ToInt32(comboBoxDish.SelectedValue),
+					DishName = comboBoxDish.Text
+				};
+				int count = Convert.ToInt32(textBoxSum.Text);
+				bool operationResult = _logicS.DeliverDishToShop(shop, dish, count);
+				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);
+			}
+		}
+	}
+}

FoodOrders/FoodOrders/FormDelivery.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>

FoodOrders/FoodOrders/FormMain.Designer.cs

@@ -1,177 +1,191 @@
 namespace FoodOrders
 {
-    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()
-        {
+		{
-            this.menuStrip = new System.Windows.Forms.MenuStrip();
+			menuStrip = new MenuStrip();
-            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			справочникиToolStripMenuItem = new ToolStripMenuItem();
-            this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			КомпонентыToolStripMenuItem = new ToolStripMenuItem();
-            this.БлюдаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			БлюдаToolStripMenuItem = new ToolStripMenuItem();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
+			dataGridView = new DataGridView();
-            this.ButtonCreateOrder = new System.Windows.Forms.Button();
+			ButtonCreateOrder = new Button();
-            this.ButtonTakeOrderInWork = new System.Windows.Forms.Button();
+			ButtonTakeOrderInWork = new Button();
-            this.ButtonOrderReady = new System.Windows.Forms.Button();
+			ButtonOrderReady = new Button();
-            this.ButtonIssuedOrder = new System.Windows.Forms.Button();
+			ButtonIssuedOrder = new Button();
-            this.ButtonRef = new System.Windows.Forms.Button();
+			ButtonRef = new Button();
-            this.menuStrip.SuspendLayout();
+			магазиныToolStripMenuItem = new ToolStripMenuItem();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem();
-            this.SuspendLayout();
+			menuStrip.SuspendLayout();
-            // 
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            // menuStrip
+			SuspendLayout();
-            // 
+			// 
-            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
+			// menuStrip
-            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			// 
-            this.справочникиToolStripMenuItem});
+			menuStrip.ImageScalingSize = new Size(20, 20);
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem });
-            this.menuStrip.Name = "menuStrip";
+			menuStrip.Location = new Point(0, 0);
-            this.menuStrip.Size = new System.Drawing.Size(1104, 28);
+			menuStrip.Name = "menuStrip";
-            this.menuStrip.TabIndex = 0;
+			menuStrip.Size = new Size(1104, 28);
-            this.menuStrip.Text = "menuStrip1";
+			menuStrip.TabIndex = 0;
-            // 
+			menuStrip.Text = "menuStrip1";
-            // справочникиToolStripMenuItem
+			// 
-            // 
+			// справочникиToolStripMenuItem
-            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			// 
-            this.КомпонентыToolStripMenuItem,
+			справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, БлюдаToolStripMenuItem, магазиныToolStripMenuItem });
-            this.БлюдаToolStripMenuItem});
+			справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+			справочникиToolStripMenuItem.Size = new Size(117, 24);
-            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
+			справочникиToolStripMenuItem.Text = "Справочники";
-            this.справочникиToolStripMenuItem.Text = "Справочники";
+			// 
-            // 
+			// КомпонентыToolStripMenuItem
-            // КомпонентыToolStripMenuItem
+			// 
-            // 
+			КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
+			КомпонентыToolStripMenuItem.Size = new Size(224, 26);
-            this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+			КомпонентыToolStripMenuItem.Text = "Компоненты";
-            this.КомпонентыToolStripMenuItem.Text = "Компоненты";
+			КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
-            this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
+			// 
-            // 
+			// БлюдаToolStripMenuItem
-            // БлюдаToolStripMenuItem
+			// 
-            // 
+			БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
-            this.БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
+			БлюдаToolStripMenuItem.Size = new Size(224, 26);
-            this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+			БлюдаToolStripMenuItem.Text = "Блюда";
-            this.БлюдаToolStripMenuItem.Text = "Блюда";
+			БлюдаToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
-            this.БлюдаToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click);
+			// 
-            // 
+			// dataGridView
-            // dataGridView
+			// 
-            // 
+			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(0, 40);
-            this.dataGridView.Location = new System.Drawing.Point(0, 40);
+			dataGridView.Name = "dataGridView";
-            this.dataGridView.Name = "dataGridView";
+			dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowHeadersWidth = 51;
+			dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.RowTemplate.Height = 29;
+			dataGridView.Size = new Size(798, 408);
-            this.dataGridView.Size = new System.Drawing.Size(798, 408);
+			dataGridView.TabIndex = 1;
-            this.dataGridView.TabIndex = 1;
+			// 
-            // 
+			// ButtonCreateOrder
-            // ButtonCreateOrder
+			// 
-            // 
+			ButtonCreateOrder.Location = new Point(831, 82);
-            this.ButtonCreateOrder.Location = new System.Drawing.Point(831, 82);
+			ButtonCreateOrder.Name = "ButtonCreateOrder";
-            this.ButtonCreateOrder.Name = "ButtonCreateOrder";
+			ButtonCreateOrder.Size = new Size(241, 29);
-            this.ButtonCreateOrder.Size = new System.Drawing.Size(241, 29);
+			ButtonCreateOrder.TabIndex = 2;
-            this.ButtonCreateOrder.TabIndex = 2;
+			ButtonCreateOrder.Text = "Создать заказ";
-            this.ButtonCreateOrder.Text = "Создать заказ";
+			ButtonCreateOrder.UseVisualStyleBackColor = true;
-            this.ButtonCreateOrder.UseVisualStyleBackColor = true;
+			ButtonCreateOrder.Click += ButtonCreateOrder_Click;
-            this.ButtonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click);
+			// 
-            // 
+			// ButtonTakeOrderInWork
-            // ButtonTakeOrderInWork
+			// 
-            // 
+			ButtonTakeOrderInWork.Location = new Point(831, 141);
-            this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(831, 141);
+			ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
-            this.ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
+			ButtonTakeOrderInWork.Size = new Size(241, 29);
-            this.ButtonTakeOrderInWork.Size = new System.Drawing.Size(241, 29);
+			ButtonTakeOrderInWork.TabIndex = 3;
-            this.ButtonTakeOrderInWork.TabIndex = 3;
+			ButtonTakeOrderInWork.Text = "Отдать заказ на выполнение";
-            this.ButtonTakeOrderInWork.Text = "Отдать заказ на выполнение";
+			ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
-            this.ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
+			ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
-            this.ButtonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click);
+			// 
-            // 
+			// ButtonOrderReady
-            // ButtonOrderReady
+			// 
-            // 
+			ButtonOrderReady.Location = new Point(831, 202);
-            this.ButtonOrderReady.Location = new System.Drawing.Point(831, 202);
+			ButtonOrderReady.Name = "ButtonOrderReady";
-            this.ButtonOrderReady.Name = "ButtonOrderReady";
+			ButtonOrderReady.Size = new Size(241, 29);
-            this.ButtonOrderReady.Size = new System.Drawing.Size(241, 29);
+			ButtonOrderReady.TabIndex = 4;
-            this.ButtonOrderReady.TabIndex = 4;
+			ButtonOrderReady.Text = "Заказ готов";
-            this.ButtonOrderReady.Text = "Заказ готов";
+			ButtonOrderReady.UseVisualStyleBackColor = true;
-            this.ButtonOrderReady.UseVisualStyleBackColor = true;
+			ButtonOrderReady.Click += ButtonOrderReady_Click;
-            this.ButtonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click);
+			// 
-            // 
+			// ButtonIssuedOrder
-            // ButtonIssuedOrder
+			// 
-            // 
+			ButtonIssuedOrder.Location = new Point(831, 264);
-            this.ButtonIssuedOrder.Location = new System.Drawing.Point(831, 264);
+			ButtonIssuedOrder.Name = "ButtonIssuedOrder";
-            this.ButtonIssuedOrder.Name = "ButtonIssuedOrder";
+			ButtonIssuedOrder.Size = new Size(241, 29);
-            this.ButtonIssuedOrder.Size = new System.Drawing.Size(241, 29);
+			ButtonIssuedOrder.TabIndex = 5;
-            this.ButtonIssuedOrder.TabIndex = 5;
+			ButtonIssuedOrder.Text = "Заказ выдан";
-            this.ButtonIssuedOrder.Text = "Заказ выдан";
+			ButtonIssuedOrder.UseVisualStyleBackColor = true;
-            this.ButtonIssuedOrder.UseVisualStyleBackColor = true;
+			ButtonIssuedOrder.Click += ButtonIssuedOrder_Click;
-            this.ButtonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click);
+			// 
-            // 
+			// ButtonRef
-            // ButtonRef
+			// 
-            // 
+			ButtonRef.Location = new Point(831, 331);
-            this.ButtonRef.Location = new System.Drawing.Point(831, 331);
+			ButtonRef.Name = "ButtonRef";
-            this.ButtonRef.Name = "ButtonRef";
+			ButtonRef.Size = new Size(241, 29);
-            this.ButtonRef.Size = new System.Drawing.Size(241, 29);
+			ButtonRef.TabIndex = 6;
-            this.ButtonRef.TabIndex = 6;
+			ButtonRef.Text = "Обновить список";
-            this.ButtonRef.Text = "Обновить список";
+			ButtonRef.UseVisualStyleBackColor = true;
-            this.ButtonRef.UseVisualStyleBackColor = true;
+			ButtonRef.Click += ButtonRef_Click;
-            this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click);
+			// 
-            // 
+			// магазиныToolStripMenuItem
-            // FormMain
+			// 
-            // 
+			магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+			магазиныToolStripMenuItem.Size = new Size(224, 26);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			магазиныToolStripMenuItem.Text = "Магазины";
-            this.ClientSize = new System.Drawing.Size(1104, 470);
+			магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
-            this.Controls.Add(this.ButtonRef);
+			// 
-            this.Controls.Add(this.ButtonIssuedOrder);
+			// пополнениеМагазинаToolStripMenuItem
-            this.Controls.Add(this.ButtonOrderReady);
+			// 
-            this.Controls.Add(this.ButtonTakeOrderInWork);
+			пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
-            this.Controls.Add(this.ButtonCreateOrder);
+			пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24);
-            this.Controls.Add(this.dataGridView);
+			пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
-            this.Controls.Add(this.menuStrip);
+			пополнениеМагазинаToolStripMenuItem.Click += пополнениеМагазинаToolStripMenuItem_Click;
-            this.MainMenuStrip = this.menuStrip;
+			// 
-            this.Name = "FormMain";
+			// FormMain
-            this.Text = "Доставка еды";
+			// 
-            this.Load += new System.EventHandler(this.FormMain_Load);
+			AutoScaleDimensions = new SizeF(8F, 20F);
-            this.menuStrip.ResumeLayout(false);
+			AutoScaleMode = AutoScaleMode.Font;
-            this.menuStrip.PerformLayout();
+			ClientSize = new Size(1104, 470);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			Controls.Add(ButtonRef);
-            this.ResumeLayout(false);
+			Controls.Add(ButtonIssuedOrder);
-            this.PerformLayout();
+			Controls.Add(ButtonOrderReady);
+			Controls.Add(ButtonTakeOrderInWork);
+			Controls.Add(ButtonCreateOrder);
+			Controls.Add(dataGridView);
+			Controls.Add(menuStrip);
+			MainMenuStrip = menuStrip;
+			Name = "FormMain";
+			Text = "Доставка еды";
+			Load += FormMain_Load;
+			menuStrip.ResumeLayout(false);
+			menuStrip.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
 
-        }
+		#endregion
 
-        #endregion
+		private MenuStrip menuStrip;
-
+		private ToolStripMenuItem справочникиToolStripMenuItem;
-        private MenuStrip menuStrip;
+		private ToolStripMenuItem КомпонентыToolStripMenuItem;
-        private ToolStripMenuItem справочникиToolStripMenuItem;
+		private ToolStripMenuItem БлюдаToolStripMenuItem;
-        private ToolStripMenuItem КомпонентыToolStripMenuItem;
+		private DataGridView dataGridView;
-        private ToolStripMenuItem БлюдаToolStripMenuItem;
+		private Button ButtonCreateOrder;
-        private DataGridView dataGridView;
+		private Button ButtonTakeOrderInWork;
-        private Button ButtonCreateOrder;
+		private Button ButtonOrderReady;
-        private Button ButtonTakeOrderInWork;
+		private Button ButtonIssuedOrder;
-        private Button ButtonOrderReady;
+		private Button ButtonRef;
-        private Button ButtonIssuedOrder;
+		private ToolStripMenuItem магазиныToolStripMenuItem;
-        private Button ButtonRef;
+		private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
-    }
+	}
 }

FoodOrders/FoodOrders/FormMain.cs

@@ -13,149 +13,167 @@ using System.Windows.Forms;
 
 namespace FoodOrders
 {
-    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()
-        {
+		{
-            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["DishId"].Visible = false;
+					dataGridView.Columns["DishId"].Visible = false;
-                }
+				}
-                _logger.LogInformation("Загрузка заказов");
+				_logger.LogInformation("Загрузка заказов");
-            }
+			}
-            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 КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
+		private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
-        {
+		{
-            var service =
+			var service =
-           Program.ServiceProvider?.GetService(typeof(FormComponents));
+		   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 =
+			var service =
-           Program.ServiceProvider?.GetService(typeof(FormDishes));
+		   Program.ServiceProvider?.GetService(typeof(FormDishes));
-            if (service is FormDishes form)
+			if (service is FormDishes form)
-            {
+			{
-                form.ShowDialog();
+				form.ShowDialog();
-            }
+			}
-        }
+		}
-        private void ButtonCreateOrder_Click(object sender, EventArgs e)
+		private void ButtonCreateOrder_Click(object sender, EventArgs e)
-        {
+		{
-            var service =
+			var service =
-           Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+		   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 =
+				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.TakeOrderInWork(new
+					var operationResult = _orderLogic.TakeOrderInWork(new
-                   OrderBindingModel
+				   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,
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
+					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}. Меняется статус на 'Готов'",
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'",
-               id);
+			   id);
-                try
+				try
-                {
+				{
-                    var operationResult = _orderLogic.FinishOrder(new
+					var operationResult = _orderLogic.FinishOrder(new
-                   OrderBindingModel
+				   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 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 =
+				int id =
-               Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+			   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'",
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'",
-               id);
+			   id);
-                try
+				try
-                {
+				{
-                    var operationResult = _orderLogic.DeliveryOrder(new
+					var operationResult = _orderLogic.DeliveryOrder(new
-                   OrderBindingModel
+				   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, "Ошибка отметки о выдачи заказа");
+					_logger.LogError(ex, "Ошибка отметки о выдачи заказа");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                   MessageBoxIcon.Error);
+				   MessageBoxIcon.Error);
-                }
+				}
-            }
+			}
-        }
+		}
-        private void ButtonRef_Click(object sender, EventArgs e)
+		private void ButtonRef_Click(object sender, EventArgs e)
-        {
+		{
-            LoadData();
+			LoadData();
-        }
+		}
-    }
+
+		private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+			if (service is FormShops form)
+			{
+				form.ShowDialog();
+			}
+		}
+
+		private void пополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormDelivery));
+			if (service is FormDelivery form)
+			{
+				form.ShowDialog();
+			}
+		}
+	}
 }

FoodOrders/FoodOrders/FormShop.Designer.cs

@@ -0,0 +1,196 @@
+namespace FoodOrders
+{
+	partial class FormShop
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.textBoxAdress = new System.Windows.Forms.TextBox();
+			this.textBoxName = new System.Windows.Forms.TextBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.labelName = new System.Windows.Forms.Label();
+			this.buttonCancel = new System.Windows.Forms.Button();
+			this.buttonSave = new System.Windows.Forms.Button();
+			this.openingDateTimePicker = new System.Windows.Forms.DateTimePicker();
+			this.label2 = new System.Windows.Forms.Label();
+			this.dataGridView = new System.Windows.Forms.DataGridView();
+			this.DishId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DishName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// textBoxAdress
+			// 
+			this.textBoxAdress.Location = new System.Drawing.Point(120, 38);
+			this.textBoxAdress.Name = "textBoxAdress";
+			this.textBoxAdress.Size = new System.Drawing.Size(350, 27);
+			this.textBoxAdress.TabIndex = 11;
+			// 
+			// textBoxName
+			// 
+			this.textBoxName.Location = new System.Drawing.Point(120, 6);
+			this.textBoxName.Name = "textBoxName";
+			this.textBoxName.Size = new System.Drawing.Size(350, 27);
+			this.textBoxName.TabIndex = 10;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(60, 41);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(54, 20);
+			this.label1.TabIndex = 9;
+			this.label1.Text = "Адрес:";
+			// 
+			// labelName
+			// 
+			this.labelName.AutoSize = true;
+			this.labelName.Location = new System.Drawing.Point(34, 9);
+			this.labelName.Name = "labelName";
+			this.labelName.Size = new System.Drawing.Size(80, 20);
+			this.labelName.TabIndex = 8;
+			this.labelName.Text = "Название:";
+			// 
+			// buttonCancel
+			// 
+			this.buttonCancel.Location = new System.Drawing.Point(376, 276);
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.Size = new System.Drawing.Size(94, 29);
+			this.buttonCancel.TabIndex = 7;
+			this.buttonCancel.Text = "Отмена";
+			this.buttonCancel.UseVisualStyleBackColor = true;
+			this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+			// 
+			// buttonSave
+			// 
+			this.buttonSave.Location = new System.Drawing.Point(276, 276);
+			this.buttonSave.Name = "buttonSave";
+			this.buttonSave.Size = new System.Drawing.Size(94, 29);
+			this.buttonSave.TabIndex = 6;
+			this.buttonSave.Text = "Сохранить";
+			this.buttonSave.UseVisualStyleBackColor = true;
+			this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+			// 
+			// openingDateTimePicker
+			// 
+			this.openingDateTimePicker.Location = new System.Drawing.Point(120, 72);
+			this.openingDateTimePicker.Name = "openingDateTimePicker";
+			this.openingDateTimePicker.Size = new System.Drawing.Size(350, 27);
+			this.openingDateTimePicker.TabIndex = 12;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(1, 72);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(113, 20);
+			this.label2.TabIndex = 13;
+			this.label2.Text = "Дата открытия:";
+			// 
+			// dataGridView
+			// 
+			this.dataGridView.AllowUserToAddRows = false;
+			this.dataGridView.BackgroundColor = System.Drawing.Color.White;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.DishId,
+			this.DishName,
+			this.Count});
+			this.dataGridView.Location = new System.Drawing.Point(120, 105);
+			this.dataGridView.MultiSelect = false;
+			this.dataGridView.Name = "dataGridView";
+			this.dataGridView.RowHeadersVisible = false;
+			this.dataGridView.RowHeadersWidth = 51;
+			this.dataGridView.RowTemplate.Height = 29;
+			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dataGridView.Size = new System.Drawing.Size(350, 165);
+			this.dataGridView.TabIndex = 14;
+			// 
+			// DishId
+			// 
+			this.DishId.HeaderText = "Id";
+			this.DishId.MinimumWidth = 6;
+			this.DishId.Name = "DishId";
+			this.DishId.ReadOnly = true;
+			this.DishId.Visible = false;
+			this.DishId.Width = 125;
+			// 
+			// DishName
+			// 
+			this.DishName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+			this.DishName.HeaderText = "Название изделия";
+			this.DishName.MinimumWidth = 6;
+			this.DishName.Name = "DishName";
+			this.DishName.ReadOnly = true;
+			// 
+			// Count
+			// 
+			this.Count.HeaderText = "Количество";
+			this.Count.MinimumWidth = 6;
+			this.Count.Name = "Count";
+			this.Count.ReadOnly = true;
+			this.Count.Width = 125;
+			// 
+			// FormShop
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(478, 317);
+			this.Controls.Add(this.dataGridView);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.openingDateTimePicker);
+			this.Controls.Add(this.textBoxAdress);
+			this.Controls.Add(this.textBoxName);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.labelName);
+			this.Controls.Add(this.buttonCancel);
+			this.Controls.Add(this.buttonSave);
+			this.Name = "FormShop";
+			this.Text = "Магазин";
+			this.Load += new System.EventHandler(this.FormShop_Load);
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private TextBox textBoxAdress;
+		private TextBox textBoxName;
+		private Label label1;
+		private Label labelName;
+		private Button buttonCancel;
+		private Button buttonSave;
+		private DateTimePicker openingDateTimePicker;
+		private Label label2;
+		private DataGridView dataGridView;
+		private DataGridViewTextBoxColumn DishId;
+		private DataGridViewTextBoxColumn DishName;
+		private DataGridViewTextBoxColumn Count;
+	}
+}

FoodOrders/FoodOrders/FormShop.cs

@@ -0,0 +1,108 @@
+using AbstractFoodOrdersContracts.BindingModels;
+using AbstractFoodOrdersContracts.BusinessLogicsContracts;
+using AbstractFoodOrdersContracts.SearchModels;
+using AbstractFoodOrdersDataModels.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 FoodOrders
+{
+	public partial class FormShop : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IShopLogic _logic;
+		private Dictionary<int, (IDishModel, int)> _shopDishes = new Dictionary<int, (IDishModel, int)>();
+
+		private int? _id;
+		public int Id { set { _id = value; } }
+		public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+		{
+			InitializeComponent();
+			_logic = logic;
+			_logger = logger;
+		}
+
+		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,
+					ShopAdress = textBoxAdress.Text,
+					OpeningDate = openingDateTimePicker.Value.Date,
+					ShopDishes = _shopDishes
+				};
+				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 FormShop_Load(object sender, EventArgs e)
+		{
+			if (_id.HasValue)
+			{
+				try
+				{
+					_logger.LogInformation("Получение магазина");
+					var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value });
+					if (view != null)
+					{
+						textBoxName.Text = view.ShopName;
+						textBoxAdress.Text = view.ShopAdress;
+						openingDateTimePicker.Value = view.OpeningDate;
+						_shopDishes = view.ShopDishes;
+						foreach (var pc in view.ShopDishes)
+						{
+							dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.DishName, pc.Value.Item2 });
+						}
+					}
+
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка получения компонента");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+				_logger.LogInformation("Загрузка заказов");
+			}
+		}
+
+		private void buttonCancel_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+	}
+}

FoodOrders/FoodOrders/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>

FoodOrders/FoodOrders/FormShops.Designer.cs

@@ -0,0 +1,119 @@
+namespace FoodOrders
+{
+	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.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();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// buttonRef
+			// 
+			this.buttonRef.Location = new System.Drawing.Point(524, 185);
+			this.buttonRef.Name = "buttonRef";
+			this.buttonRef.Size = new System.Drawing.Size(94, 29);
+			this.buttonRef.TabIndex = 9;
+			this.buttonRef.Text = "Обновить";
+			this.buttonRef.UseVisualStyleBackColor = true;
+			this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
+			// 
+			// buttonDel
+			// 
+			this.buttonDel.Location = new System.Drawing.Point(524, 127);
+			this.buttonDel.Name = "buttonDel";
+			this.buttonDel.Size = new System.Drawing.Size(94, 29);
+			this.buttonDel.TabIndex = 8;
+			this.buttonDel.Text = "Удалить";
+			this.buttonDel.UseVisualStyleBackColor = true;
+			this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click);
+			// 
+			// buttonUpd
+			// 
+			this.buttonUpd.Location = new System.Drawing.Point(524, 70);
+			this.buttonUpd.Name = "buttonUpd";
+			this.buttonUpd.Size = new System.Drawing.Size(94, 29);
+			this.buttonUpd.TabIndex = 7;
+			this.buttonUpd.Text = "Изменить";
+			this.buttonUpd.UseVisualStyleBackColor = true;
+			this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click);
+			// 
+			// buttonAdd
+			// 
+			this.buttonAdd.Location = new System.Drawing.Point(524, 13);
+			this.buttonAdd.Name = "buttonAdd";
+			this.buttonAdd.Size = new System.Drawing.Size(94, 29);
+			this.buttonAdd.TabIndex = 6;
+			this.buttonAdd.Text = "Добавить";
+			this.buttonAdd.UseVisualStyleBackColor = true;
+			this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
+			// 
+			// dataGridView
+			// 
+			this.dataGridView.BackgroundColor = System.Drawing.Color.White;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.Location = new System.Drawing.Point(2, 1);
+			this.dataGridView.MultiSelect = false;
+			this.dataGridView.Name = "dataGridView";
+			this.dataGridView.RowHeadersVisible = false;
+			this.dataGridView.RowHeadersWidth = 51;
+			this.dataGridView.RowTemplate.Height = 29;
+			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dataGridView.Size = new System.Drawing.Size(489, 449);
+			this.dataGridView.TabIndex = 5;
+			// 
+			// FormShops
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(626, 450);
+			this.Controls.Add(this.buttonRef);
+			this.Controls.Add(this.buttonDel);
+			this.Controls.Add(this.buttonUpd);
+			this.Controls.Add(this.buttonAdd);
+			this.Controls.Add(this.dataGridView);
+			this.Name = "FormShops";
+			this.Text = "Магазины";
+			this.Load += new System.EventHandler(this.FormShops_Load);
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private Button buttonRef;
+		private Button buttonDel;
+		private Button buttonUpd;
+		private Button buttonAdd;
+		private DataGridView dataGridView;
+	}
+}

FoodOrders/FoodOrders/FormShops.cs

@@ -0,0 +1,111 @@
+using AbstractFoodOrdersContracts.BindingModels;
+using AbstractFoodOrdersContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FoodOrders
+{
+	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["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ShopDishes"].Visible = false;
+				}
+				_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();
+		}
+	}
+}

FoodOrders/FoodOrders/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>

FoodOrders/FoodOrders/Program.cs

@@ -37,17 +37,23 @@ namespace FoodOrders
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IDishStorage, DishStorage>();
-            services.AddTransient<IComponentLogic, ComponentLogic>();
+			services.AddTransient<IShopStorage, ShopStorage>();
+
+			services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IDishLogic, DishLogic>();
-            services.AddTransient<FormMain>();
+			services.AddTransient<IShopLogic, ShopLogic>();
+
+			services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormDish>();
             services.AddTransient<FormDishComponent>();
             services.AddTransient<FormDishes>();
-
+			services.AddTransient<FormShop>();
-        }
+			services.AddTransient<FormShops>();
+			services.AddTransient<FormDelivery>();
+		}
     }
 }