MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj

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

MotorPlant/MotorPlantBusinessLogic/OrderLogic.cs

@@ -12,13 +12,13 @@ namespace MotorPlantBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
+
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
         }
+
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
@@ -31,6 +31,7 @@ namespace MotorPlantBusinessLogic.BusinessLogics
             _logger.LogInformation("ReadList. Count:{Count}", list.Count);
             return list;
         }
+
         public bool CreateOrder(OrderBindingModel model)
         {
             CheckModel(model);
@@ -47,34 +48,22 @@ namespace MotorPlantBusinessLogic.BusinessLogics
             }
             return true;
         }
+
         public bool TakeOrderInWork(OrderBindingModel model)
         {
             return ToNextStatus(model, OrderStatus.Выполняется);
         }
+
         public bool FinishOrder(OrderBindingModel model)
         {
             return ToNextStatus(model, OrderStatus.Готов);
         }
+
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            var order = _orderStorage.GetElement(new OrderSearchModel
-            {
-                Id = model.Id,
-            });
-            if (order == null)
-            {
-                throw new ArgumentNullException(nameof(order));
-            }
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                EngineId = order.EngineId,
-                Count = order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
             return ToNextStatus(model, OrderStatus.Выдан);
         }
+
         public bool ToNextStatus(OrderBindingModel model, OrderStatus orderStatus)
         {
             CheckModel(model, false);
@@ -86,22 +75,26 @@ namespace MotorPlantBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException(nameof(element));
             }
+
             model.EngineId = element.EngineId;
             model.DateCreate = element.DateCreate;
             model.DateImplement = element.DateImplement;
             model.Status = element.Status;
             model.Count = element.Count;
             model.Sum = element.Sum;
+
             if (model.Status != orderStatus - 1)
             {
                 _logger.LogWarning("Status update to " + orderStatus + " operation failed");
                 return false;
             }
             model.Status = orderStatus;
+
             if (model.Status == OrderStatus.Выдан)
             {
                 model.DateImplement = DateTime.Now;
             }
+
             if (_orderStorage.Update(model) == null)
             {
                 model.Status--;
@@ -110,6 +103,7 @@ namespace MotorPlantBusinessLogic.BusinessLogics
             }
             return true;
         }
+
         private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
             if (model == null)

MotorPlant/MotorPlantBusinessLogic/ShopLogic.cs

@@ -1,181 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly IEngineStorage _EngineStorage;
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IEngineStorage EngineStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _EngineStorage = EngineStorage;
-        }
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool MakeSupply(SupplyBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopEngines.ContainsKey(model.EngineId))
-            {
-                var oldValue = shop.ShopEngines[model.EngineId];
-                oldValue.Item2 += model.Count;
-                shop.ShopEngines[model.EngineId] = oldValue;
-            }
-            else
-            {
-                var Engine = _EngineStorage.GetElement(new EngineSearchModel
-                {
-                    Id = model.EngineId
-                });
-                if (Engine == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.EngineId} не найденн");
-                }
-                if (shop.ShopEngines.Sum(kv => kv.Value.Item2) + model.Count > shop.EngineMaxCount)
-                {
-                    throw new ArgumentException("Превышена максимальная вместимость магазина");
-                }
-                shop.ShopEngines.Add(model.EngineId, (Engine, model.Count));
-            }
-            _shopStorage.Update(new ShopBindingModel()
-            {
-                Id = shop.Id,
-                ShopName = shop.ShopName,
-                Adress = shop.Adress,
-                OpeningDate = shop.OpeningDate,
-                ShopEngines = shop.ShopEngines,
-                EngineMaxCount = shop.EngineMaxCount,
-            });
-
-            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.EngineId.HasValue || !model.Count.HasValue)
-            {
-                return false;
-            }
-            _logger.LogInformation("Check Engine count in all shops");
-            if (_shopStorage.Sale(model))
-            {
-                _logger.LogInformation("Selling sucsess");
-                return true;
-            }
-            _logger.LogInformation("Selling failed");
-            return false;
-        }
-    }
-}

MotorPlant/MotorPlantContracts/BindingModels/ShopBindingModel.cs

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

MotorPlant/MotorPlantContracts/BindingModels/SupplyBindingModel.cs

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

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool MakeSupply(SupplyBindingModel model);
-        bool Sale(SupplySearchModel model);
-    }
-}

MotorPlant/MotorPlantContracts/MotorPlantContracts.csproj

@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
+  <PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-	</PropertyGroup>
+  </PropertyGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-	</ItemGroup>
+  </ItemGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
+    <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
-	</ItemGroup>
+  </ItemGroup>
 
 </Project>

MotorPlant/MotorPlantContracts/SearchModels/ShopSearchModel.cs

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

MotorPlant/MotorPlantContracts/SearchModels/SupplySearchModel.cs

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

MotorPlant/MotorPlantContracts/StoragesContracts/IShopStorage.cs

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

MotorPlant/MotorPlantContracts/ViewModels/ShopViewModel.cs

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

MotorPlant/MotorPlantDataModels/IShopModel.cs

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

MotorPlant/MotorPlantDataModels/ISupplyModel.cs

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

MotorPlant/MotorPlantDataModels/MotorPlantDataModels.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
+  <PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-	</PropertyGroup>
+  </PropertyGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-	</ItemGroup>
+  </ItemGroup>
 
 </Project>

MotorPlant/MotorPlantFileImplement/DataFileSingleton.cs

@@ -9,11 +9,9 @@ namespace MotorPlantFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string EngineFileName = "Engine.xml";
-        private readonly string ShopFileName = "Shop.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Engine> Engines { get; private set; }
-        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -25,13 +23,11 @@ namespace MotorPlantFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveEngines() => SaveData(Engines, EngineFileName, "Engines", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Engines = LoadData(EngineFileName, "Engine", x => Engine.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)
         {

MotorPlant/MotorPlantFileImplement/MotorPlantFileImplement.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
+  <PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-	</PropertyGroup>
+  </PropertyGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
-		<ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
+    <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
-	</ItemGroup>
+  </ItemGroup>
 
 </Project>

MotorPlant/MotorPlantFileImplement/OrderStorage.cs

@@ -71,8 +71,14 @@ namespace MotorPlantFileImplement.Implements
         private OrderViewModel GetViewModel(Order order)
         {
             var viewModel = order.GetViewModel;
-            var engine = source.Engines.FirstOrDefault(x => x.Id == order.EngineId);
+            foreach (var comp in source.Engines)
-            viewModel.EngineName = engine?.EngineName;
+            {
+                if (comp.Id == order.EngineId)
+                {
+                    viewModel.EngineName = comp.EngineName;
+                    break;
+                }
+            }
             return viewModel;
         }
     }

MotorPlant/MotorPlantFileImplement/Shop.cs

@@ -1,103 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.ViewModels;
-using MotorPlantDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
-namespace MotorPlantFileImplement.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> Engines { get; private set; } = new();
-        private Dictionary<int, (IEngineModel, int)>? _shopEngines = null;
-        public Dictionary<int, (IEngineModel, int)> ShopEngines
-        {
-            get
-            {
-                if (_shopEngines == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopEngines = Engines.ToDictionary(x => x.Key, y => ((source.Engines.FirstOrDefault(z => z.Id == y.Key) as IEngineModel)!, y.Value));
-                }
-                return _shopEngines;
-            }
-        }
-        public int EngineMaxCount { 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,
-                Engines = model.ShopEngines.ToDictionary(x => x.Key, x => x.Value.Item2),
-                EngineMaxCount = model.EngineMaxCount
-            };
-        }
-        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),
-                Engines = element.Element("ShopEngines")!.Elements("ShopEngine")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value)),
-                EngineMaxCount = Convert.ToInt32(element.Element("EngineMaxCount")!.Value)
-            };
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            EngineMaxCount = model.EngineMaxCount;
-            Engines = model.ShopEngines.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _shopEngines = null;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopEngines = ShopEngines,
-            EngineMaxCount = EngineMaxCount
-        };
-        public XElement GetXElement => new("Shop",
-            new XAttribute("Id", Id),
-            new XElement("ShopName", ShopName),
-            new XElement("Adress", Adress),
-            new XElement("OpeningDate", OpeningDate.ToString()),
-            new XElement("ShopEngines", Engines.Select(
-                x => new XElement("ShopEngine", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
-            new XElement("EngineMaxCount", EngineMaxCount.ToString())
-            );
-        public void EnginesUpdate()
-        {
-            _shopEngines = null;
-        }
-    }
-}

MotorPlant/MotorPlantFileImplement/ShopStorage.cs

@@ -1,145 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantFileImplement.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.EngineId.HasValue || !model.Count.HasValue)
-                return false;
-            int remainingSpace = source.Shops.Select(x => x.Engines.ContainsKey(model.EngineId.Value) ? x.Engines[model.EngineId.Value] : 0).Sum();
-            if (remainingSpace < model.Count)
-            {
-                return false;
-            }
-            var shops = source.Shops.Where(x => x.Engines.ContainsKey(model.EngineId.Value)).OrderByDescending(x => x.Engines[model.EngineId.Value]).ToList();
-            foreach (var shop in shops)
-            {
-                int residue = model.Count.Value - shop.Engines[model.EngineId.Value];
-                if (residue > 0)
-                {
-                    shop.Engines.Remove(model.EngineId.Value);
-                    shop.EnginesUpdate();
-                    model.Count = residue;
-                }
-                else
-                {
-                    if (residue == 0)
-                    {
-                        shop.Engines.Remove(model.EngineId.Value);
-                    }
-                    else
-                    {
-                        shop.Engines[model.EngineId.Value] = -residue;
-                    }
-                    shop.EnginesUpdate();
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            source.SaveShops();
-            return false;
-        }
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            if (model == null || source.Shops.Select(x => x.EngineMaxCount - x.ShopEngines.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
-            {
-                return false;
-            }
-            foreach (Shop shop in source.Shops)
-            {
-                int free_places = shop.EngineMaxCount - shop.ShopEngines.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.Engines.ContainsKey(model.EngineId))
-                {
-                    shop.Engines[model.EngineId] += free_places;
-                }
-                else
-                {
-                    shop.Engines.Add(model.EngineId, free_places);
-                }
-                shop.EnginesUpdate();
-                if (model.Count == 0)
-                {
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}

MotorPlant/MotorPlantListImplement/DataListSingleton.cs

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

MotorPlant/MotorPlantListImplement/MotorPlantListImplement.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
+  <PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-	</PropertyGroup>
+  </PropertyGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
-		<ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
+    <ProjectReference Include="..\MotorPlantDataModels\MotorPlantDataModels.csproj" />
-	</ItemGroup>
+  </ItemGroup>
 
 </Project>

MotorPlant/MotorPlantListImplement/Order.cs

@@ -37,7 +37,11 @@ namespace MotorPlantListImplement.Models
             {
                 return;
             }
+            EngineId = model.EngineId;
+            Count = model.Count;
+            Sum = model.Sum;
             Status = model.Status;
+            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
         }
         public OrderViewModel GetViewModel => new()

MotorPlant/MotorPlantListImplement/Shop.cs

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

MotorPlant/MotorPlantListImplement/ShopStorage.cs

@@ -1,114 +0,0 @@
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantContracts.ViewModels;
-using MotorPlantListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return result;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.ShopName.Contains(model.ShopName))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-            return result;
-        }
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) ||
-                    (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-            return newShop.GetViewModel;
-        }
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public bool Sale(SupplySearchModel model)
-        {
-            throw new NotImplementedException();
-        }
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

MotorPlant/MotorPlantView/FormCreateSupply.Designer.cs

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

MotorPlant/MotorPlantView/FormCreateSupply.cs

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

MotorPlant/MotorPlantView/FormCreateSupply.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/FormMain.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
             toolStrip1 = new ToolStrip();
             toolStripDropDownButton1 = new ToolStripDropDownButton();
             КомпонентыToolStripMenuItem = new ToolStripMenuItem();
@@ -39,10 +38,6 @@
             buttonIssuedOrder = new Button();
             buttonRef = new Button();
             dataGridView = new DataGridView();
-            operationToolStripMenuItem = new ToolStripMenuItem();
-            transactionToolStripMenuItem = new ToolStripMenuItem();
-            продажаToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
             toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -50,42 +45,42 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, operationToolStripMenuItem });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
-            toolStrip1.Size = new Size(969, 25);
+            toolStrip1.Size = new Size(1107, 27);
             toolStrip1.TabIndex = 0;
             toolStrip1.Text = "toolStrip1";
             // 
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem, магазиныToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem });
-            toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            toolStripDropDownButton1.Size = new Size(88, 22);
+            toolStripDropDownButton1.Size = new Size(108, 24);
             toolStripDropDownButton1.Text = "Справочник";
             // 
             // КомпонентыToolStripMenuItem
             // 
-            КомпонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            КомпонентыToolStripMenuItem.Size = new Size(180, 22);
+            КомпонентыToolStripMenuItem.Size = new Size(182, 26);
             КомпонентыToolStripMenuItem.Text = "Компоненты";
             КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
             // 
             // ДвигателиToolStripMenuItem
             // 
             ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem";
-            ДвигателиToolStripMenuItem.Size = new Size(180, 22);
+            ДвигателиToolStripMenuItem.Size = new Size(182, 26);
             ДвигателиToolStripMenuItem.Text = "Двигатели";
             ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
             // 
             // buttonCreateOrder
             // 
-            buttonCreateOrder.Location = new Point(800, 56);
+            buttonCreateOrder.Location = new Point(914, 75);
+            buttonCreateOrder.Margin = new Padding(3, 4, 3, 4);
             buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(141, 24);
+            buttonCreateOrder.Size = new Size(161, 32);
             buttonCreateOrder.TabIndex = 1;
             buttonCreateOrder.Text = "Создать заказ";
             buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -93,9 +88,10 @@
             // 
             // buttonTakeOrderInWork
             // 
-            buttonTakeOrderInWork.Location = new Point(800, 100);
+            buttonTakeOrderInWork.Location = new Point(914, 115);
+            buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4);
             buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(141, 24);
+            buttonTakeOrderInWork.Size = new Size(161, 48);
             buttonTakeOrderInWork.TabIndex = 2;
             buttonTakeOrderInWork.Text = "Отдать на выполнение";
             buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@@ -103,9 +99,10 @@
             // 
             // buttonOrderReady
             // 
-            buttonOrderReady.Location = new Point(800, 142);
+            buttonOrderReady.Location = new Point(914, 189);
+            buttonOrderReady.Margin = new Padding(3, 4, 3, 4);
             buttonOrderReady.Name = "buttonOrderReady";
-            buttonOrderReady.Size = new Size(141, 24);
+            buttonOrderReady.Size = new Size(161, 32);
             buttonOrderReady.TabIndex = 3;
             buttonOrderReady.Text = "Заказ готов";
             buttonOrderReady.UseVisualStyleBackColor = true;
@@ -113,9 +110,10 @@
             // 
             // buttonIssuedOrder
             // 
-            buttonIssuedOrder.Location = new Point(800, 181);
+            buttonIssuedOrder.Location = new Point(914, 241);
+            buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4);
             buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonIssuedOrder.Size = new Size(141, 24);
+            buttonIssuedOrder.Size = new Size(161, 32);
             buttonIssuedOrder.TabIndex = 4;
             buttonIssuedOrder.Text = "Заказ выдан";
             buttonIssuedOrder.UseVisualStyleBackColor = true;
@@ -123,9 +121,10 @@
             // 
             // buttonRef
             // 
-            buttonRef.Location = new Point(800, 222);
+            buttonRef.Location = new Point(914, 296);
+            buttonRef.Margin = new Padding(3, 4, 3, 4);
             buttonRef.Name = "buttonRef";
-            buttonRef.Size = new Size(141, 24);
+            buttonRef.Size = new Size(161, 32);
             buttonRef.TabIndex = 5;
             buttonRef.Text = "Обновить список";
             buttonRef.UseVisualStyleBackColor = true;
@@ -134,48 +133,21 @@
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(0, 26);
+            dataGridView.Location = new Point(0, 35);
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
             dataGridView.Name = "dataGridView";
             dataGridView.ReadOnly = true;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 24;
             dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(763, 435);
+            dataGridView.Size = new Size(872, 580);
             dataGridView.TabIndex = 6;
             // 
-            // operationToolStripMenuItem
-            // 
-            operationToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { transactionToolStripMenuItem, продажаToolStripMenuItem });
-            operationToolStripMenuItem.Name = "operationToolStripMenuItem";
-            operationToolStripMenuItem.Size = new Size(75, 25);
-            operationToolStripMenuItem.Text = "Операции";
-            // 
-            // transactionToolStripMenuItem
-            // 
-            transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
-            transactionToolStripMenuItem.Size = new Size(180, 22);
-            transactionToolStripMenuItem.Text = "Поставка";
-            transactionToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
-            // 
-            // продажаToolStripMenuItem
-            // 
-            продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
-            продажаToolStripMenuItem.Size = new Size(180, 22);
-            продажаToolStripMenuItem.Text = "Продажа";
-            продажаToolStripMenuItem.Click += SellToolStripMenuItem_Click;
-            // 
-            // магазиныToolStripMenuItem
-            // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(180, 22);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
-            // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(969, 461);
+            ClientSize = new Size(1107, 615);
             Controls.Add(dataGridView);
             Controls.Add(buttonRef);
             Controls.Add(buttonIssuedOrder);
@@ -183,6 +155,7 @@
             Controls.Add(buttonTakeOrderInWork);
             Controls.Add(buttonCreateOrder);
             Controls.Add(toolStrip1);
+            Margin = new Padding(3, 4, 3, 4);
             Name = "FormMain";
             Text = "Моторный завод";
             Load += FormMain_Load;
@@ -205,9 +178,5 @@
         private ToolStripDropDownButton toolStripDropDownButton1;
         private ToolStripMenuItem КомпонентыToolStripMenuItem;
         private ToolStripMenuItem ДвигателиToolStripMenuItem;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private ToolStripMenuItem operationToolStripMenuItem;
-        private ToolStripMenuItem transactionToolStripMenuItem;
-        private ToolStripMenuItem продажаToolStripMenuItem;
     }
 }

MotorPlant/MotorPlantView/FormMain.cs

@@ -142,29 +142,5 @@ namespace MotorPlantView.Forms
         {
             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(FormSellEngines));
-            if (service is FormSellEngines form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

MotorPlant/MotorPlantView/FormMain.resx

@@ -1,17 +1,17 @@
 <?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 
+    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes 
+    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>
@@ -26,36 +26,36 @@
         <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 
+    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 
+    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
+
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not 
+    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 
+    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can 
+    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 
+    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 
+    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 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

MotorPlant/MotorPlantView/FormSellEngines.Designer.cs

@@ -1,124 +0,0 @@
-namespace MotorPlantView.Forms
-{
-    partial class FormSellEngines
-    {
-        /// <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()
-        {
-            labelEngine = new Label();
-            comboBoxEngine = new ComboBox();
-            labelCount = new Label();
-            textBoxCount = new TextBox();
-            buttonSell = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // labelEngine
-            // 
-            labelEngine.AutoSize = true;
-            labelEngine.Location = new Point(10, 10);
-            labelEngine.Name = "labelEngine";
-            labelEngine.Size = new Size(69, 15);
-            labelEngine.TabIndex = 0;
-            labelEngine.Text = "Двигатель: ";
-            // 
-            // comboBoxEngine
-            // 
-            comboBoxEngine.FormattingEnabled = true;
-            comboBoxEngine.Location = new Point(101, 8);
-            comboBoxEngine.Margin = new Padding(3, 2, 3, 2);
-            comboBoxEngine.Name = "comboBoxEngine";
-            comboBoxEngine.Size = new Size(210, 23);
-            comboBoxEngine.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;
-            // 
-            // FormSellEngines
-            // 
-            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(comboBoxEngine);
-            Controls.Add(labelEngine);
-            Margin = new Padding(3, 2, 3, 2);
-            Name = "FormSellEngines";
-            Text = "Продажа двигателей";
-            Load += FormSellingEngine_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelEngine;
-        private ComboBox comboBoxEngine;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}

MotorPlant/MotorPlantView/FormSellEngines.cs

@@ -1,82 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.SearchModels;
-using MotorPlantContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace MotorPlantView.Forms
-{
-    public partial class FormSellEngines : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IEngineLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<EngineViewModel> _EngineList = new List<EngineViewModel>();
-        public FormSellEngines(ILogger<FormSellEngines> logger, IEngineLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-        private void FormSellingEngine_Load(object sender, EventArgs e)
-        {
-            _EngineList = _logicP.ReadList(null);
-            if (_EngineList != null)
-            {
-                comboBoxEngine.DisplayMember = "EngineName";
-                comboBoxEngine.ValueMember = "Id";
-                comboBoxEngine.DataSource = _EngineList;
-                comboBoxEngine.SelectedItem = null;
-                _logger.LogInformation("Загрузка двигателей для продажи");
-            }
-        }
-        private void ButtonSell_Click(object sender, EventArgs e)
-        {
-            if (comboBoxEngine.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание покупки");
-            try
-            {
-                bool resout = _logicS.Sale(new SupplySearchModel
-                {
-                    EngineId = Convert.ToInt32(comboBoxEngine.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();
-        }
-    }
-}

MotorPlant/MotorPlantView/FormSellEngines.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/FormShop.Designer.cs

@@ -1,222 +0,0 @@
-namespace MotorPlantView.Forms
-{
-    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.EngineName = 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.numericUpEngineMaxCount = new System.Windows.Forms.NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpEngineMaxCount)).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.EngineName,
-            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;
-            // 
-            // EngineName
-            // 
-            this.EngineName.HeaderText = "Двигатель";
-            this.EngineName.MinimumWidth = 6;
-            this.EngineName.Name = "EngineName";
-            this.EngineName.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 = "Вместимость";
-            // 
-            // numericUpEngineMaxCount
-            // 
-            this.numericUpEngineMaxCount.Location = new System.Drawing.Point(128, 146);
-            this.numericUpEngineMaxCount.Maximum = new decimal(new int[] {
-            10000,
-            0,
-            0,
-            0});
-            this.numericUpEngineMaxCount.Name = "numericUpEngineMaxCount";
-            this.numericUpEngineMaxCount.Size = new System.Drawing.Size(401, 27);
-            this.numericUpEngineMaxCount.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.numericUpEngineMaxCount);
-            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.numericUpEngineMaxCount)).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 EngineName;
-        private DataGridViewTextBoxColumn Count;
-        private Label label1;
-        private DateTimePicker dateTimeOpen;
-        private Label label2;
-        private NumericUpDown numericUpEngineMaxCount;
-    }
-}

MotorPlant/MotorPlantView/FormShop.cs

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

MotorPlant/MotorPlantView/FormShop.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/FormShops.Designer.cs

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

MotorPlant/MotorPlantView/FormShops.cs

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

MotorPlant/MotorPlantView/FormShops.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

MotorPlant/MotorPlantView/MotorPlantView.csproj

@@ -1,27 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
+  <PropertyGroup>
-		<OutputType>WinExe</OutputType>
+    <OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
-		<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-		<UseWindowsForms>true</UseWindowsForms>
+    <UseWindowsForms>true</UseWindowsForms>
-		<ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
+  </PropertyGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-	</ItemGroup>
+  </ItemGroup>
 
-	<ItemGroup>
+  <ItemGroup>
-		<ProjectReference Include="..\MotorPlantBusinessLogic\MotorPlantBusinessLogic.csproj" />
+    <ProjectReference Include="..\MotorPlantBusinessLogic\MotorPlantBusinessLogic.csproj" />
-		<ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
+    <ProjectReference Include="..\MotorPlantContracts\MotorPlantContracts.csproj" />
-		<ProjectReference Include="..\MotorPlantFileImplement\MotorPlantFileImplement.csproj" />
+    <ProjectReference Include="..\MotorPlantFileImplement\MotorPlantFileImplement.csproj" />
-		<ProjectReference Include="..\MotorPlantListImplement\MotorPlantListImplement.csproj" />
+    <ProjectReference Include="..\MotorPlantListImplement\MotorPlantListImplement.csproj" />
-	</ItemGroup>
+  </ItemGroup>
 
 </Project>

MotorPlant/MotorPlantView/Program.cs

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