FishFactory/FishFactoryBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -17,11 +17,14 @@ namespace FishFactoryBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
+        private readonly IShopStorage _shopStorage;
+
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-        }
+			_shopStorage = shopStorage;
+		}
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("ReadList. Id: {Id}", model?.Id);
@@ -83,22 +86,28 @@ namespace FishFactoryBusinessLogic.BusinessLogics
         }
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            CheckModel(model, false);
+
-            var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
+			var order = _orderStorage.GetElement(new OrderSearchModel
-            if (order?.Status != OrderStatus.Готов)
+			{
-            {
+				Id = model.Id,
-                _logger.LogWarning("Invalid order status");
+			});
-                return false;
+
-            }
+			if (order == null)
+			{
+				throw new ArgumentNullException(nameof(order));
+			}
+			if (!_shopStorage.RestockingShops(new SupplyBindingModel
+			{
+				CannedId = order.CannedId,
+				Count = order.Count
+			}))
+			{
+				throw new ArgumentException("Недостаточно места");
+			}
             model.Status = OrderStatus.Выдан;
-            model.DateImplement = order.DateImplement;
-            if (_orderStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-            }
             return true;
-        }
+		}
-        private void CheckModel(OrderBindingModel model, bool withParams = true)
+		private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
             if (model == null)
             {

FishFactory/FishFactoryBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,180 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PizzeriaBusinessLogic.BusinessLogics
+{
+	public class ShopLogic : IShopLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IShopStorage _shopStorage;
+		private readonly ICannedStorage _cannedStorage;
+
+		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ICannedStorage cannedStorage)
+		{
+			_logger = logger;
+			_shopStorage = shopStorage;
+			_cannedStorage = cannedStorage;
+		}
+
+		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.ShopCanneds.ContainsKey(model.CannedId))
+			{
+				var oldValue = shop.ShopCanneds[model.CannedId];
+				if (oldValue.Item2 + model.Count > shop.CannedMaxCount)
+				{
+					throw new ArgumentException("Недостаточно места");
+				}
+				oldValue.Item2 += model.Count;
+				shop.ShopCanneds[model.CannedId] = oldValue;
+			}
+			else
+			{
+				var canned = _cannedStorage.GetElement(new CannedSearchModel
+				{
+					Id = model.CannedId
+				});
+				if (canned == null)
+				{
+					throw new ArgumentException($"Поставка: Товар с id:{model.CannedId} не найденн");
+				}
+				shop.ShopCanneds.Add(model.CannedId, (canned, 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("Магазин с таким названием уже есть");
+			}
+		}
+
+		public bool Sale(SupplySearchModel model)
+		{
+			if (!model.CannedId.HasValue || !model.Count.HasValue)
+			{
+				return false;
+			}
+			_logger.LogInformation("Check canned count in all shops");
+			if (_shopStorage.Sale(model))
+			{
+				_logger.LogInformation("Selling sucsess");
+				return true;
+			}
+			_logger.LogInformation("Selling failed");
+			return false;
+		}
+	}
+}

FishFactory/FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,19 @@
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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, (ICannedModel, int)> ShopCanneds { get; set; } = new();
+		public int CannedMaxCount { get; set; }
+	}
+}

FishFactory/FishFactoryContracts/BindingModels/SupplyBindingModel.cs

@@ -0,0 +1,17 @@
+using FishFactoryDataModels.Models;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.BindingModels
+{
+	public class SupplyBindingModel : ISupplyModel
+	{
+		public int ShopId { get; set; }
+		public int CannedId { get; set; }
+		public int Count { get; set; }
+	}
+}

FishFactory/FishFactoryContracts/BisinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,22 @@
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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);
+		bool Sale(SupplySearchModel model);
+	}
+}

FishFactory/FishFactoryContracts/SearchModels/ShopSearchModel.cs

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

FishFactory/FishFactoryContracts/SearchModels/SupplySearchModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.SearchModels
+{
+	public class SupplySearchModel
+	{
+		public int? CannedId { get; set; }
+		public int? Count { get; set; }
+	}
+}

FishFactory/FishFactoryContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,24 @@
+using FishFactoryContracts.ViewModels;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.StoragesContracts
+{
+	public interface IShopStorage
+	{
+		List<ShopViewModel> GetFullList();
+		List<ShopViewModel> GetFilteredList(ShopSearchModel model);
+		ShopViewModel? GetElement(ShopSearchModel model);
+		ShopViewModel? Insert(ShopBindingModel model);
+		ShopViewModel? Update(ShopBindingModel model);
+		ShopViewModel? Delete(ShopBindingModel model);
+		bool Sale(SupplySearchModel model);
+		bool RestockingShops(SupplyBindingModel model);
+	}
+}

FishFactory/FishFactoryContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,24 @@
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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, (ICannedModel, int)> ShopCanneds { get; set; } = new();
+		[DisplayName("Вместимость")]
+		public int CannedMaxCount { get; set; }
+	}
+}

FishFactory/FishFactoryDataModels/Models/IShopModel.cs

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

FishFactory/FishFactoryDataModels/Models/ISupplyModel.cs

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

FishFactory/FishFactoryFileImplement/DataFileSingleton.cs

@@ -8,10 +8,12 @@ namespace FishFactoryFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string CannedFileName = "Canned.xml";
-        public List<Component> Components { get; private set; }
+		private readonly string ShopFileName = "Shop.xml";
+		public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Canned> Canneds { get; private set; }
-        public static DataFileSingleton GetInstance()
+		public List<Shop> Shops { get; private set; }
+		public static DataFileSingleton GetInstance()
         {
             if (instance == null)
             {
@@ -24,7 +26,8 @@ namespace FishFactoryFileImplement
         public void SaveCanneds() => SaveData(Canneds, CannedFileName,
        "Canneds", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        private DataFileSingleton()
+		public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
+		private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x =>
            Component.Create(x)!)!;
@@ -32,7 +35,8 @@ namespace FishFactoryFileImplement
            Canned.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => 
            Order.Create(x)!)!;
-        }
+			Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
+		}
         private static List<T>? LoadData<T>(string filename, string xmlNodeName,
        Func<XElement, T> selectFunction)
         {

FishFactory/FishFactoryFileImplement/Implements/ShopStorage.cs

@@ -0,0 +1,155 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryFileImplement;
+using FishFactoryFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryFileImplement.Implements
+{
+	public class ShopStorage : IShopStorage
+	{
+		private readonly DataFileSingleton source;
+
+		public ShopStorage()
+		{
+			source = DataFileSingleton.GetInstance();
+		}
+
+		public List<ShopViewModel> GetFullList()
+		{
+			return source.Shops.Select(x => x.GetViewModel).ToList();
+		}
+
+		public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				return new();
+			}
+			return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
+		}
+
+		public ShopViewModel? GetElement(ShopSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+			{
+				return null;
+			}
+			return source.Shops.FirstOrDefault(x =>
+			(!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
+			(model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+		}
+
+		public ShopViewModel? Insert(ShopBindingModel model)
+		{
+			model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
+			var newShop = Shop.Create(model);
+			if (newShop == null)
+			{
+				return null;
+			}
+			source.Shops.Add(newShop);
+			source.SaveShops();
+			return newShop.GetViewModel;
+		}
+
+		public ShopViewModel? Update(ShopBindingModel model)
+		{
+			var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+			if (shop == null)
+			{
+				return null;
+			}
+			shop.Update(model);
+			source.SaveShops();
+			return shop.GetViewModel;
+		}
+
+		public ShopViewModel? Delete(ShopBindingModel model)
+		{
+			var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+			if (shop != null)
+			{
+				source.Shops.Remove(shop);
+				source.SaveShops();
+				return shop.GetViewModel;
+			}
+			return null;
+		}
+
+		public bool Sale(SupplySearchModel model)
+		{
+			if (model == null || !model.CannedId.HasValue || !model.Count.HasValue)
+				return false;
+			int remainingSpace = source.Shops.Select(x => x.Canneds.ContainsKey(model.CannedId.Value) ? x.Canneds[model.CannedId.Value] : 0).Sum();
+			if (remainingSpace < model.Count)
+			{
+				return false;
+			}
+			var shops = source.Shops.Where(x => x.Canneds.ContainsKey(model.CannedId.Value)).OrderByDescending(x => x.Canneds[model.CannedId.Value]).ToList();
+			foreach (var shop in shops)
+			{
+				int residue = model.Count.Value - shop.Canneds[model.CannedId.Value];
+				if (residue > 0)
+				{
+					shop.Canneds.Remove(model.CannedId.Value);
+					shop.CannedsUpdate();
+					model.Count = residue;
+				}
+				else
+				{
+					if (residue == 0)
+					{
+						shop.Canneds.Remove(model.CannedId.Value);
+					}
+					else
+					{
+						shop.Canneds[model.CannedId.Value] = -residue;
+					}
+					shop.CannedsUpdate();
+					source.SaveShops();
+					return true;
+				}
+			}
+			source.SaveShops();
+			return false;
+		}
+
+		public bool RestockingShops(SupplyBindingModel model)
+		{
+			if (model == null || source.Shops.Select(x => x.CannedMaxCount - x.ShopCanneds.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
+			{
+				return false;
+			}
+			foreach (Shop shop in source.Shops)
+			{
+				int free_places = shop.CannedMaxCount - shop.ShopCanneds.Select(x => x.Value.Item2).Sum();
+				if (free_places <= 0)
+					continue;
+				free_places = Math.Min(free_places, model.Count);
+				model.Count -= free_places;
+				if (shop.Canneds.ContainsKey(model.CannedId))
+				{
+					shop.Canneds[model.CannedId] += free_places;
+				}
+				else
+				{
+					shop.Canneds.Add(model.CannedId, free_places);
+				}
+				shop.CannedsUpdate();
+				if (model.Count == 0)
+				{
+					source.SaveShops();
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+}

FishFactory/FishFactoryFileImplement/Models/Shop.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using FishFactoryFileImplement;
+
+namespace FishFactoryFileImplement.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, int> Canneds { get; private set; } = new();
+		private Dictionary<int, (ICannedModel, int)>? _shopCanneds = null;
+
+		public Dictionary<int, (ICannedModel, int)> ShopCanneds
+		{
+			get
+			{
+				if (_shopCanneds == null)
+				{
+					var source = DataFileSingleton.GetInstance();
+					_shopCanneds = Canneds.ToDictionary(x => x.Key, y => ((source.Canneds.FirstOrDefault(z => z.Id == y.Key) as ICannedModel)!, y.Value));
+				}
+				return _shopCanneds;
+			}
+		}
+
+		public int CannedMaxCount { get; private set; }
+
+		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,
+				Canneds = model.ShopCanneds.ToDictionary(x => x.Key, x => x.Value.Item2),
+				CannedMaxCount = model.CannedMaxCount
+			};
+		}
+
+		public static Shop? Create(XElement element)
+		{
+			if (element == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+				ShopName = element.Element("ShopName")!.Value,
+				Adress = element.Element("Adress")!.Value,
+				OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
+				Canneds = element.Element("ShopCanneds")!.Elements("ShopCanned")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
+				x => Convert.ToInt32(x.Element("Value")?.Value)),
+				CannedMaxCount = Convert.ToInt32(element.Element("CannedMaxCount")!.Value)
+			};
+		}
+
+		public void Update(ShopBindingModel? model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			ShopName = model.ShopName;
+			Adress = model.Adress;
+			OpeningDate = model.OpeningDate;
+			CannedMaxCount = model.CannedMaxCount;
+			Canneds = model.ShopCanneds.ToDictionary(x => x.Key, x => x.Value.Item2);
+			_shopCanneds = null;
+		}
+
+		public ShopViewModel GetViewModel => new()
+		{
+			Id = Id,
+			ShopName = ShopName,
+			Adress = Adress,
+			OpeningDate = OpeningDate,
+			ShopCanneds = ShopCanneds,
+			CannedMaxCount = CannedMaxCount
+		};
+
+		public XElement GetXElement => new("Shop",
+			new XAttribute("Id", Id),
+			new XElement("ShopName", ShopName),
+			new XElement("Adress", Adress),
+			new XElement("OpeningDate", OpeningDate.ToString()),
+			new XElement("ShopCanneds", Canneds.Select(
+				x => new XElement("ShopCanned", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
+			new XElement("CannedMaxCount", CannedMaxCount.ToString())
+			);
+
+		public void CannedsUpdate()
+		{
+			_shopCanneds = null;
+		}
+	}
+}

FishFactory/FishFactoryListImplement/DataListSingleton.cs

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

FishFactory/FishFactoryListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,124 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryListImplement;
+using FishFactoryListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryListImplement.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;
+		}
+
+		public bool Sale(SupplySearchModel model)
+		{
+			throw new NotImplementedException();
+		}
+
+		public bool RestockingShops(SupplyBindingModel model)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

FishFactory/FishFactoryListImplement/Models/Shop.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+
+namespace FishFactoryListImplement.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, (ICannedModel, int)> ShopCanneds { get; private set; } = new();
+		public int CannedMaxCount { get; private set; }
+
+		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,
+				CannedMaxCount = model.CannedMaxCount,
+			};
+		}
+
+		public void Update(ShopBindingModel? model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			ShopName = model.ShopName;
+			Adress = model.Adress;
+			OpeningDate = model.OpeningDate;
+			CannedMaxCount = model.CannedMaxCount;
+		}
+
+		public ShopViewModel GetViewModel => new()
+		{
+			Id = Id,
+			ShopName = ShopName,
+			Adress = Adress,
+			OpeningDate = OpeningDate,
+			ShopCanneds = ShopCanneds,
+			CannedMaxCount = CannedMaxCount,
+		};
+	}
+}

FishFactory/FishFactoryView/FormCreateSupply.Designer.cs

@@ -0,0 +1,143 @@
+namespace FishFactoryView
+{
+    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.labelCanned = new System.Windows.Forms.Label();
+            this.comboBoxCanned = 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 = "Магазин: ";
+			// 
+			// labelCanned
+			// 
+			this.labelCanned.AutoSize = true;
+            this.labelCanned.Location = new System.Drawing.Point(12, 49);
+            this.labelCanned.Name = "labelCanned";
+            this.labelCanned.Size = new System.Drawing.Size(75, 20);
+            this.labelCanned.TabIndex = 2;
+            this.labelCanned.Text = "Изделие: ";
+			// 
+			// comboBoxCanned
+			// 
+			this.comboBoxCanned.FormattingEnabled = true;
+            this.comboBoxCanned.Location = new System.Drawing.Point(115, 46);
+            this.comboBoxCanned.Name = "comboBoxCanned";
+            this.comboBoxCanned.Size = new System.Drawing.Size(344, 28);
+            this.comboBoxCanned.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.comboBoxCanned);
+            this.Controls.Add(this.labelCanned);
+            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 labelCanned;
+        private ComboBox comboBoxCanned;
+        private Label labelCount;
+        private TextBox textBoxCount;
+        private Button buttonCancel;
+        private Button buttonSave;
+    }
+}

FishFactory/FishFactoryView/FormCreateSupply.cs

@@ -0,0 +1,99 @@
+using Microsoft.Extensions.Logging;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.ViewModels;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace FishFactoryView
+{
+    public partial class FormCreateSupply : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ICannedLogic _logicP;
+        private readonly IShopLogic _logicS;
+        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
+        private List<CannedViewModel> _pizzaList = new List<CannedViewModel>();
+
+        public FormCreateSupply(ILogger<FormCreateSupply> logger, ICannedLogic logicP, IShopLogic logicS)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicP = logicP;
+            _logicS = logicS;
+        }
+
+        private void FormCreateSupply_Load(object sender, EventArgs e)
+        {
+            _shopList = _logicS.ReadList(null);
+            _pizzaList = _logicP.ReadList(null);
+            if (_shopList != null)
+            {
+                comboBoxShop.DisplayMember = "ShopName";
+                comboBoxShop.ValueMember = "Id";
+                comboBoxShop.DataSource = _shopList;
+                comboBoxShop.SelectedItem = null;
+                _logger.LogInformation("Загрузка магазинов для поставок");
+            }
+            if (_pizzaList != null)
+            {
+                comboBoxCanned.DisplayMember = "CannedName";
+                comboBoxCanned.ValueMember = "Id";
+                comboBoxCanned.DataSource = _pizzaList;
+                comboBoxCanned.SelectedItem = null;
+                _logger.LogInformation("Загрузка консерв для поставок");
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxCanned.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Создание поставки");
+            try
+            {
+                var operationResult = _logicS.MakeSupply(new SupplyBindingModel
+                {
+                    ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
+                    CannedId = Convert.ToInt32(comboBoxCanned.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();
+        }
+    }
+}

FishFactory/FishFactoryView/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>

FishFactory/FishFactoryView/FormMain.Designer.cs

@@ -1,184 +1,220 @@
 namespace FishFactoryView
 {
-    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()
-        {
+		{
-            menuStrip1 = new MenuStrip();
+			menuStrip1 = new MenuStrip();
-            справочникToolStripMenuItem = new ToolStripMenuItem();
+			справочникToolStripMenuItem = new ToolStripMenuItem();
-            компонентыToolStripMenuItem = new ToolStripMenuItem();
+			компонентыToolStripMenuItem = new ToolStripMenuItem();
-            изделияToolStripMenuItem = new ToolStripMenuItem();
+			изделияToolStripMenuItem = new ToolStripMenuItem();
-            dataGridView = new DataGridView();
+			shopsToolStripMenuItem = new ToolStripMenuItem();
-            buttonCreateOrder = new Button();
+			операцииToolStripMenuItem = new ToolStripMenuItem();
-            buttonTakeOrderInWork = new Button();
+			transactionToolStripMenuItem = new ToolStripMenuItem();
-            buttonOrderReady = new Button();
+			sellToolStripMenuItem = new ToolStripMenuItem();
-            buttonIssuedOrder = new Button();
+			dataGridView = new DataGridView();
-            buttonRef = new Button();
+			buttonCreateOrder = new Button();
-            menuStrip1.SuspendLayout();
+			buttonTakeOrderInWork = new Button();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			buttonOrderReady = new Button();
-            SuspendLayout();
+			buttonIssuedOrder = new Button();
-            // 
+			buttonRef = new Button();
-            // menuStrip1
+			menuStrip1.SuspendLayout();
-            // 
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            menuStrip1.ImageScalingSize = new Size(20, 20);
+			SuspendLayout();
-            menuStrip1.Items.AddRange(new ToolStripItem[] { справочникToolStripMenuItem });
+			// 
-            menuStrip1.Location = new Point(0, 0);
+			// menuStrip1
-            menuStrip1.Name = "menuStrip1";
+			// 
-            menuStrip1.Padding = new Padding(5, 2, 0, 2);
+			menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip1.Size = new Size(1099, 24);
+			menuStrip1.Items.AddRange(new ToolStripItem[] { справочникToolStripMenuItem, операцииToolStripMenuItem });
-            menuStrip1.TabIndex = 0;
+			menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Text = "menuStrip1";
+			menuStrip1.Name = "menuStrip1";
-            // 
+			menuStrip1.Padding = new Padding(5, 2, 0, 2);
-            // справочникToolStripMenuItem
+			menuStrip1.Size = new Size(1099, 24);
-            // 
+			menuStrip1.TabIndex = 0;
-            справочникToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem });
+			menuStrip1.Text = "menuStrip1";
-            справочникToolStripMenuItem.Name = "справочникToolStripMenuItem";
+			// 
-            справочникToolStripMenuItem.Size = new Size(94, 20);
+			// справочникToolStripMenuItem
-            справочникToolStripMenuItem.Text = "Справочники";
+			// 
-            // 
+			справочникToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, shopsToolStripMenuItem });
-            // компонентыToolStripMenuItem
+			справочникToolStripMenuItem.Name = "справочникToolStripMenuItem";
-            // 
+			справочникToolStripMenuItem.Size = new Size(94, 20);
-            компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+			справочникToolStripMenuItem.Text = "Справочники";
-            компонентыToolStripMenuItem.Size = new Size(145, 22);
+			// 
-            компонентыToolStripMenuItem.Text = "Компоненты";
+			// компонентыToolStripMenuItem
-            компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
+			// 
-            // 
+			компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            // изделияToolStripMenuItem
+			компонентыToolStripMenuItem.Size = new Size(145, 22);
-            // 
+			компонентыToolStripMenuItem.Text = "Компоненты";
-            изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
+			компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
-            изделияToolStripMenuItem.Size = new Size(145, 22);
+			// 
-            изделияToolStripMenuItem.Text = "Изделия";
+			// изделияToolStripMenuItem
-            изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
+			// 
-            // 
+			изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
-            // dataGridView
+			изделияToolStripMenuItem.Size = new Size(145, 22);
-            // 
+			изделияToolStripMenuItem.Text = "Изделия";
-            dataGridView.AllowUserToAddRows = false;
+			изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
-            dataGridView.AllowUserToDeleteRows = false;
+			// 
-            dataGridView.BackgroundColor = Color.White;
+			// shopsToolStripMenuItem
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			// 
-            dataGridView.Location = new Point(0, 23);
+			shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
-            dataGridView.Margin = new Padding(3, 2, 3, 2);
+			shopsToolStripMenuItem.Size = new Size(145, 22);
-            dataGridView.Name = "dataGridView";
+			shopsToolStripMenuItem.Text = "Магазины";
-            dataGridView.ReadOnly = true;
+			shopsToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
-            dataGridView.RowHeadersWidth = 51;
+			// 
-            dataGridView.RowTemplate.Height = 29;
+			// операцииToolStripMenuItem
-            dataGridView.Size = new Size(861, 297);
+			// 
-            dataGridView.TabIndex = 1;
+			операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { transactionToolStripMenuItem, sellToolStripMenuItem });
-            // 
+			операцииToolStripMenuItem.Name = "операцииToolStripMenuItem";
-            // buttonCreateOrder
+			операцииToolStripMenuItem.Size = new Size(75, 20);
-            // 
+			операцииToolStripMenuItem.Text = "Операции";
-            buttonCreateOrder.Location = new Point(867, 40);
+			// 
-            buttonCreateOrder.Margin = new Padding(3, 2, 3, 2);
+			// transactionToolStripMenuItem
-            buttonCreateOrder.Name = "buttonCreateOrder";
+			// 
-            buttonCreateOrder.Size = new Size(216, 22);
+			transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
-            buttonCreateOrder.TabIndex = 2;
+			transactionToolStripMenuItem.Size = new Size(180, 22);
-            buttonCreateOrder.Text = "Создать заказ";
+			transactionToolStripMenuItem.Text = "Поставка";
-            buttonCreateOrder.UseVisualStyleBackColor = true;
+			transactionToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
-            buttonCreateOrder.Click += ButtonCreateOrder_Click;
+			// 
-            // 
+			// sellToolStripMenuItem
-            // buttonTakeOrderInWork
+			// 
-            // 
+			sellToolStripMenuItem.Name = "sellToolStripMenuItem";
-            buttonTakeOrderInWork.Location = new Point(867, 91);
+			sellToolStripMenuItem.Size = new Size(180, 22);
-            buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2);
+			sellToolStripMenuItem.Text = "Продажа";
-            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+			sellToolStripMenuItem.Click += sellToolStripMenuItem_Click;
-            buttonTakeOrderInWork.Size = new Size(216, 22);
+			// 
-            buttonTakeOrderInWork.TabIndex = 3;
+			// dataGridView
-            buttonTakeOrderInWork.Text = "Отдать на выполнение";
+			// 
-            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+			dataGridView.AllowUserToAddRows = false;
-            buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
+			dataGridView.AllowUserToDeleteRows = false;
-            // 
+			dataGridView.BackgroundColor = Color.White;
-            // buttonOrderReady
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            // 
+			dataGridView.Location = new Point(0, 23);
-            buttonOrderReady.Location = new Point(867, 143);
+			dataGridView.Margin = new Padding(3, 2, 3, 2);
-            buttonOrderReady.Margin = new Padding(3, 2, 3, 2);
+			dataGridView.Name = "dataGridView";
-            buttonOrderReady.Name = "buttonOrderReady";
+			dataGridView.ReadOnly = true;
-            buttonOrderReady.Size = new Size(216, 22);
+			dataGridView.RowHeadersWidth = 51;
-            buttonOrderReady.TabIndex = 4;
+			dataGridView.RowTemplate.Height = 29;
-            buttonOrderReady.Text = "Заказ готов";
+			dataGridView.Size = new Size(861, 297);
-            buttonOrderReady.UseVisualStyleBackColor = true;
+			dataGridView.TabIndex = 1;
-            buttonOrderReady.Click += ButtonOrderReady_Click;
+			// 
-            // 
+			// buttonCreateOrder
-            // buttonIssuedOrder
+			// 
-            // 
+			buttonCreateOrder.Location = new Point(867, 40);
-            buttonIssuedOrder.Location = new Point(867, 191);
+			buttonCreateOrder.Margin = new Padding(3, 2, 3, 2);
-            buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2);
+			buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonIssuedOrder.Name = "buttonIssuedOrder";
+			buttonCreateOrder.Size = new Size(216, 22);
-            buttonIssuedOrder.Size = new Size(216, 22);
+			buttonCreateOrder.TabIndex = 2;
-            buttonIssuedOrder.TabIndex = 5;
+			buttonCreateOrder.Text = "Создать заказ";
-            buttonIssuedOrder.Text = "Заказ выдан";
+			buttonCreateOrder.UseVisualStyleBackColor = true;
-            buttonIssuedOrder.UseVisualStyleBackColor = true;
+			buttonCreateOrder.Click += ButtonCreateOrder_Click;
-            buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
+			// 
-            // 
+			// buttonTakeOrderInWork
-            // buttonRef
+			// 
-            // 
+			buttonTakeOrderInWork.Location = new Point(867, 91);
-            buttonRef.Location = new Point(867, 232);
+			buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2);
-            buttonRef.Margin = new Padding(3, 2, 3, 2);
+			buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonRef.Name = "buttonRef";
+			buttonTakeOrderInWork.Size = new Size(216, 22);
-            buttonRef.Size = new Size(216, 22);
+			buttonTakeOrderInWork.TabIndex = 3;
-            buttonRef.TabIndex = 6;
+			buttonTakeOrderInWork.Text = "Отдать на выполнение";
-            buttonRef.Text = "Обновить список";
+			buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-            buttonRef.UseVisualStyleBackColor = true;
+			buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
-            buttonRef.Click += ButtonRef_Click;
+			// 
-            // 
+			// buttonOrderReady
-            // FormMain
+			// 
-            // 
+			buttonOrderReady.Location = new Point(867, 143);
-            AutoScaleDimensions = new SizeF(7F, 15F);
+			buttonOrderReady.Margin = new Padding(3, 2, 3, 2);
-            AutoScaleMode = AutoScaleMode.Font;
+			buttonOrderReady.Name = "buttonOrderReady";
-            ClientSize = new Size(1099, 320);
+			buttonOrderReady.Size = new Size(216, 22);
-            Controls.Add(buttonRef);
+			buttonOrderReady.TabIndex = 4;
-            Controls.Add(buttonIssuedOrder);
+			buttonOrderReady.Text = "Заказ готов";
-            Controls.Add(buttonOrderReady);
+			buttonOrderReady.UseVisualStyleBackColor = true;
-            Controls.Add(buttonTakeOrderInWork);
+			buttonOrderReady.Click += ButtonOrderReady_Click;
-            Controls.Add(buttonCreateOrder);
+			// 
-            Controls.Add(dataGridView);
+			// buttonIssuedOrder
-            Controls.Add(menuStrip1);
+			// 
-            MainMenuStrip = menuStrip1;
+			buttonIssuedOrder.Location = new Point(867, 191);
-            Margin = new Padding(3, 2, 3, 2);
+			buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2);
-            Name = "FormMain";
+			buttonIssuedOrder.Name = "buttonIssuedOrder";
-            Text = "Рыбный завод";
+			buttonIssuedOrder.Size = new Size(216, 22);
-            Load += FormMain_Load;
+			buttonIssuedOrder.TabIndex = 5;
-            menuStrip1.ResumeLayout(false);
+			buttonIssuedOrder.Text = "Заказ выдан";
-            menuStrip1.PerformLayout();
+			buttonIssuedOrder.UseVisualStyleBackColor = true;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
-            ResumeLayout(false);
+			// 
-            PerformLayout();
+			// buttonRef
-        }
+			// 
+			buttonRef.Location = new Point(867, 232);
+			buttonRef.Margin = new Padding(3, 2, 3, 2);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(216, 22);
+			buttonRef.TabIndex = 6;
+			buttonRef.Text = "Обновить список";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += ButtonRef_Click;
+			// 
+			// FormMain
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(1099, 320);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonIssuedOrder);
+			Controls.Add(buttonOrderReady);
+			Controls.Add(buttonTakeOrderInWork);
+			Controls.Add(buttonCreateOrder);
+			Controls.Add(dataGridView);
+			Controls.Add(menuStrip1);
+			MainMenuStrip = menuStrip1;
+			Margin = new Padding(3, 2, 3, 2);
+			Name = "FormMain";
+			Text = "Рыбный завод";
+			Load += FormMain_Load;
+			menuStrip1.ResumeLayout(false);
+			menuStrip1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
 
-        #endregion
+		#endregion
 
-        private MenuStrip menuStrip1;
+		private MenuStrip menuStrip1;
-        private ToolStripMenuItem справочникToolStripMenuItem;
+		private ToolStripMenuItem справочникToolStripMenuItem;
-        private ToolStripMenuItem компонентыToolStripMenuItem;
+		private ToolStripMenuItem компонентыToolStripMenuItem;
-        private ToolStripMenuItem изделияToolStripMenuItem;
+		private ToolStripMenuItem изделияToolStripMenuItem;
-        private DataGridView dataGridView;
+		private DataGridView dataGridView;
-        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 ToolStripMenuItem shopsToolStripMenuItem;
+		private ToolStripMenuItem операцииToolStripMenuItem;
+		private ToolStripMenuItem transactionToolStripMenuItem;
+		private ToolStripMenuItem sellToolStripMenuItem;
+	}
 }

FishFactory/FishFactoryView/FormMain.cs

@@ -13,144 +13,171 @@ using System.Windows.Forms;
 
 namespace FishFactoryView
 {
-    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["CannedId"].Visible = false;
+					dataGridView.Columns["CannedId"].Visible = false;
-                    dataGridView.Columns["CannedName"].AutoSizeMode =
+					dataGridView.Columns["CannedName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
+					DataGridViewAutoSizeColumnMode.Fill;
-                }
+				}
-                _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 = 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(FormCanneds));
+			var service = Program.ServiceProvider?.GetService(typeof(FormCanneds));
-            if (service is FormCanneds form)
+			if (service is FormCanneds 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("Заказ No{id}. Меняется статус на 'В работе'", id);
+				_logger.LogInformation("Заказ No{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 = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ No{id}. Меняется статус на 'Готов'", id);
+				_logger.LogInformation("Заказ No{id}. Меняется статус на 'Готов'", id);
-                try
+				try
-                {
+				{
-                    var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
+					var operationResult = _orderLogic.FinishOrder(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 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("Заказ No{id}. Меняется статус на 'Выдан'", id);
+				_logger.LogInformation("Заказ No{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("Заказ No{id} выдан", id);
+					_logger.LogInformation("Заказ No{id} выдан", id);
-                    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 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();
+			}
+		}
+
+		private void sellToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormSellCanned));
+			if (service is FormSellCanned form)
+			{
+				form.ShowDialog();
+			}
+		}
+	}
 }

FishFactory/FishFactoryView/FormSellCanned.Designer.cs

@@ -0,0 +1,124 @@
+namespace FishFactoryView
+{
+	partial class FormSellCanned
+	{
+		/// <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()
+		{
+			labelCanned = new Label();
+			comboBoxCanned = new ComboBox();
+			labelCount = new Label();
+			textBoxCount = new TextBox();
+			buttonSell = new Button();
+			buttonCancel = new Button();
+			SuspendLayout();
+			// 
+			// labelCanned
+			// 
+			labelCanned.AutoSize = true;
+			labelCanned.Location = new Point(10, 10);
+			labelCanned.Name = "labelCanned";
+			labelCanned.Size = new Size(65, 15);
+			labelCanned.TabIndex = 0;
+			labelCanned.Text = "Консерва: ";
+			// 
+			// comboBoxCanned
+			// 
+			comboBoxCanned.FormattingEnabled = true;
+			comboBoxCanned.Location = new Point(101, 8);
+			comboBoxCanned.Margin = new Padding(3, 2, 3, 2);
+			comboBoxCanned.Name = "comboBoxCanned";
+			comboBoxCanned.Size = new Size(210, 23);
+			comboBoxCanned.TabIndex = 1;
+			// 
+			// labelCount
+			// 
+			labelCount.AutoSize = true;
+			labelCount.Location = new Point(10, 41);
+			labelCount.Name = "labelCount";
+			labelCount.Size = new Size(78, 15);
+			labelCount.TabIndex = 2;
+			labelCount.Text = "Количество: ";
+			// 
+			// textBoxCount
+			// 
+			textBoxCount.Location = new Point(101, 39);
+			textBoxCount.Margin = new Padding(3, 2, 3, 2);
+			textBoxCount.Name = "textBoxCount";
+			textBoxCount.Size = new Size(210, 23);
+			textBoxCount.TabIndex = 3;
+			// 
+			// buttonSell
+			// 
+			buttonSell.Location = new Point(112, 74);
+			buttonSell.Margin = new Padding(3, 2, 3, 2);
+			buttonSell.Name = "buttonSell";
+			buttonSell.Size = new Size(82, 22);
+			buttonSell.TabIndex = 4;
+			buttonSell.Text = "Продать";
+			buttonSell.UseVisualStyleBackColor = true;
+			buttonSell.Click += ButtonSell_Click;
+			// 
+			// buttonCancel
+			// 
+			buttonCancel.Location = new Point(212, 74);
+			buttonCancel.Margin = new Padding(3, 2, 3, 2);
+			buttonCancel.Name = "buttonCancel";
+			buttonCancel.Size = new Size(82, 22);
+			buttonCancel.TabIndex = 5;
+			buttonCancel.Text = "Отмена";
+			buttonCancel.UseVisualStyleBackColor = true;
+			buttonCancel.Click += ButtonCancel_Click;
+			// 
+			// FormSellCanned
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(320, 105);
+			Controls.Add(buttonCancel);
+			Controls.Add(buttonSell);
+			Controls.Add(textBoxCount);
+			Controls.Add(labelCount);
+			Controls.Add(comboBoxCanned);
+			Controls.Add(labelCanned);
+			Margin = new Padding(3, 2, 3, 2);
+			Name = "FormSellCanned";
+			Text = "Продажа консерв";
+			Load += FormSellingCanned_Load;
+			ResumeLayout(false);
+			PerformLayout();
+		}
+
+		#endregion
+
+		private Label labelCanned;
+		private ComboBox comboBoxCanned;
+		private Label labelCount;
+		private TextBox textBoxCount;
+		private Button buttonSell;
+		private Button buttonCancel;
+	}
+}

FishFactory/FishFactoryView/FormSellCanned.cs

@@ -0,0 +1,88 @@
+using Microsoft.Extensions.Logging;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.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 FishFactoryView
+{
+	public partial class FormSellCanned : Form
+	{
+		private readonly ILogger _logger;
+		private readonly ICannedLogic _logicP;
+		private readonly IShopLogic _logicS;
+		private List<CannedViewModel> _cannedList = new List<CannedViewModel>();
+
+		public FormSellCanned(ILogger<FormSellCanned> logger, ICannedLogic logicP, IShopLogic logicS)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logicP = logicP;
+			_logicS = logicS;
+		}
+
+		private void FormSellingCanned_Load(object sender, EventArgs e)
+		{
+			_cannedList = _logicP.ReadList(null);
+			if (_cannedList != null)
+			{
+				comboBoxCanned.DisplayMember = "CannedName";
+				comboBoxCanned.ValueMember = "Id";
+				comboBoxCanned.DataSource = _cannedList;
+				comboBoxCanned.SelectedItem = null;
+				_logger.LogInformation("Загрузка консерв для продажи");
+			}
+		}
+
+		private void ButtonSell_Click(object sender, EventArgs e)
+		{
+			if (comboBoxCanned.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			_logger.LogInformation("Создание покупки");
+			try
+			{
+				bool resout = _logicS.Sale(new SupplySearchModel
+				{
+					CannedId = Convert.ToInt32(comboBoxCanned.SelectedValue),
+					Count = Convert.ToInt32(textBoxCount.Text)
+				});
+				if (resout)
+				{
+					_logger.LogInformation("Проверка пройдена, продажа  проведена");
+					MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					DialogResult = DialogResult.OK;
+					Close();
+				}
+				else
+				{
+					_logger.LogInformation("Проверка не пройдена");
+					MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				}
+			}
+			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();
+		}
+	}
+}

FishFactory/FishFactoryView/FormSellCanned.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>

FishFactory/FishFactoryView/FormShop.Designer.cs

@@ -0,0 +1,222 @@
+namespace FishFactoryView
+{
+    partial class FormShop
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.labelName = new System.Windows.Forms.Label();
+            this.textBoxName = new System.Windows.Forms.TextBox();
+            this.textBoxAdress = new System.Windows.Forms.TextBox();
+            this.labelAdress = new System.Windows.Forms.Label();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CannedName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label1 = new System.Windows.Forms.Label();
+            this.dateTimeOpen = new System.Windows.Forms.DateTimePicker();
+            this.label2 = new System.Windows.Forms.Label();
+            this.numericUpCannedMaxCount = new System.Windows.Forms.NumericUpDown();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpCannedMaxCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // labelName
+            // 
+            this.labelName.AutoSize = true;
+            this.labelName.Location = new System.Drawing.Point(11, 15);
+            this.labelName.Name = "labelName";
+            this.labelName.Size = new System.Drawing.Size(84, 20);
+            this.labelName.TabIndex = 0;
+            this.labelName.Text = "Название: ";
+            // 
+            // textBoxName
+            // 
+            this.textBoxName.Location = new System.Drawing.Point(102, 12);
+            this.textBoxName.Name = "textBoxName";
+            this.textBoxName.Size = new System.Drawing.Size(276, 27);
+            this.textBoxName.TabIndex = 1;
+            // 
+            // textBoxAdress
+            // 
+            this.textBoxAdress.Location = new System.Drawing.Point(102, 59);
+            this.textBoxAdress.Name = "textBoxAdress";
+            this.textBoxAdress.Size = new System.Drawing.Size(427, 27);
+            this.textBoxAdress.TabIndex = 3;
+            // 
+            // labelAdress
+            // 
+            this.labelAdress.AutoSize = true;
+            this.labelAdress.Location = new System.Drawing.Point(11, 61);
+            this.labelAdress.Name = "labelAdress";
+            this.labelAdress.Size = new System.Drawing.Size(58, 20);
+            this.labelAdress.TabIndex = 2;
+            this.labelAdress.Text = "Адрес: ";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(451, 457);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(130, 44);
+            this.buttonCancel.TabIndex = 5;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(315, 457);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(130, 44);
+            this.buttonSave.TabIndex = 6;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.AllowUserToAddRows = false;
+            this.dataGridView.AllowUserToDeleteRows = false;
+            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.id,
+            this.CannedName,
+            this.Count});
+            this.dataGridView.Location = new System.Drawing.Point(12, 185);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+            this.dataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(569, 266);
+            this.dataGridView.TabIndex = 7;
+            // 
+            // id
+            // 
+            this.id.HeaderText = "id";
+            this.id.MinimumWidth = 6;
+            this.id.Name = "id";
+            this.id.ReadOnly = true;
+            this.id.Visible = false;
+			// 
+			// CannedName
+			// 
+			this.CannedName.HeaderText = "Консерва";
+            this.CannedName.MinimumWidth = 6;
+            this.CannedName.Name = "CannedName";
+            this.CannedName.ReadOnly = true;
+            // 
+            // Count
+            // 
+            this.Count.HeaderText = "Количество";
+            this.Count.MinimumWidth = 6;
+            this.Count.Name = "Count";
+            this.Count.ReadOnly = true;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 103);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(110, 20);
+            this.label1.TabIndex = 8;
+            this.label1.Text = "Дата открытия";
+            // 
+            // dateTimeOpen
+            // 
+            this.dateTimeOpen.Location = new System.Drawing.Point(128, 103);
+            this.dateTimeOpen.Name = "dateTimeOpen";
+            this.dateTimeOpen.Size = new System.Drawing.Size(401, 27);
+            this.dateTimeOpen.TabIndex = 9;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 148);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(100, 20);
+            this.label2.TabIndex = 10;
+            this.label2.Text = "Вместимость";
+			// 
+			// numericUpCannedMaxCount
+			// 
+			this.numericUpCannedMaxCount.Location = new System.Drawing.Point(128, 146);
+            this.numericUpCannedMaxCount.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.numericUpCannedMaxCount.Name = "numericUpCannedMaxCount";
+            this.numericUpCannedMaxCount.Size = new System.Drawing.Size(401, 27);
+            this.numericUpCannedMaxCount.TabIndex = 11;
+            // 
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(593, 513);
+            this.Controls.Add(this.numericUpCannedMaxCount);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.dateTimeOpen);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.textBoxAdress);
+            this.Controls.Add(this.labelAdress);
+            this.Controls.Add(this.textBoxName);
+            this.Controls.Add(this.labelName);
+            this.Name = "FormShop";
+            this.Text = "Магазин";
+            this.Load += new System.EventHandler(this.FormShop_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpCannedMaxCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelName;
+        private TextBox textBoxName;
+        private TextBox textBoxAdress;
+        private Label labelAdress;
+        private Button buttonCancel;
+        private Button buttonSave;
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn id;
+        private DataGridViewTextBoxColumn CannedName;
+        private DataGridViewTextBoxColumn Count;
+        private Label label1;
+        private DateTimePicker dateTimeOpen;
+        private Label label2;
+        private NumericUpDown numericUpCannedMaxCount;
+    }
+}

FishFactory/FishFactoryView/FormShop.cs

@@ -0,0 +1,127 @@
+using FishFactoryDataModels.Models;
+using Microsoft.Extensions.Logging;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.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 FishFactoryView
+{
+    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, (ICannedModel, int)> _ShopCanneds;
+        private DateTime? _openingDate = null;
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _ShopCanneds = new Dictionary<int, (ICannedModel, 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;
+                        numericUpCannedMaxCount.Value = view.CannedMaxCount;
+                        _ShopCanneds = view.ShopCanneds ?? new Dictionary<int, (ICannedModel, int)>();
+                        LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка загрузки магазина");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Загрузка изделий в магазине");
+            try
+            {
+                if (_ShopCanneds != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var sr in _ShopCanneds)
+                    {
+                        dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.CannedName, 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,
+                    CannedMaxCount = (int)numericUpCannedMaxCount.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();
+        }
+    }
+}

FishFactory/FishFactoryView/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>

FishFactory/FishFactoryView/FormShops.Designer.cs

@@ -0,0 +1,130 @@
+namespace FishFactoryView
+{
+    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;
+    }
+}

FishFactory/FishFactoryView/FormShops.cs

@@ -0,0 +1,116 @@
+using Microsoft.Extensions.Logging;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.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 FishFactoryView
+{
+    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["ShopCanneds"].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();
+        }
+    }
+}

FishFactory/FishFactoryView/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>

FishFactory/FishFactoryView/Program.cs

@@ -6,6 +6,7 @@ using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryFileImplement.Implements;
 using System;
+using PizzeriaBusinessLogic.BusinessLogics;
 
 namespace FishFactoryView
 {
@@ -50,6 +51,12 @@ namespace FishFactoryView
             services.AddTransient<FormCanned>();
             services.AddTransient<FormCannedComponent>();
             services.AddTransient<FormCanneds>();
-        }
+			services.AddTransient<IShopStorage, ShopStorage>();
+			services.AddTransient<IShopLogic, ShopLogic>();
+			services.AddTransient<FormShop>();
+			services.AddTransient<FormShops>();
+			services.AddTransient<FormCreateSupply>();
+			services.AddTransient<FormSellCanned>();
+		}
     }
 }