first commit

MotorPlant/MotorPlantBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -14,15 +14,12 @@ namespace MotorPlantBusinessLogic.BusinessLogics
 		private readonly ILogger _logger;
 		private readonly IOrderStorage _orderStorage;
 		private readonly IShopStorage _shopStorage;
-		private readonly IShopLogic _shopLogic;
+
-		private readonly IEngineStorage _engineStorage;
+		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
-		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage, IShopLogic shopLogic, IEngineStorage engineStorage)
 		{
 			_logger = logger;
 			_orderStorage = orderStorage;
 			_shopStorage = shopStorage;
-			_shopLogic = shopLogic;
-			_engineStorage = engineStorage;
 		}
 
 		public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@@ -38,21 +35,30 @@ namespace MotorPlantBusinessLogic.BusinessLogics
 			return list;
 		}
 
-		private void CheckModel(OrderBindingModel model)
+		private void CheckModel(OrderBindingModel model, bool WithParams = true)
 		{
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
+            if (!WithParams)
+            {
+                return;
+            }
             if (model.Count <= 0)
             {
-				throw new ArgumentNullException("Количество заказов должно быть больше нуля");
+                throw new ArgumentException("Количество движков в заказе не может быть меньше 1", nameof(model.Count));
             }
             if (model.Sum <= 0)
             {
-				throw new ArgumentNullException("Цена заказа должна быть больше нуля");
+                throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
             }
-			_logger.LogInformation("Order. OrderId:{Id}. Sum:{Sum}", model.Id, model.Sum);
+            if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
+            {
+                throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
+            }
+            _logger.LogInformation("Pizza. PizzaId:{PizzaId}.Count:{Count}.Sum:{Sum}Id:{Id}",
+                model.EngineId, model.Count, model.Sum, model.Id);
         }
 
 		public bool CreateOrder(OrderBindingModel model)
@@ -72,38 +78,38 @@ namespace MotorPlantBusinessLogic.BusinessLogics
 
 		}
 
-		private bool ChangeStatus(OrderBindingModel model, OrderStatus status)
+		private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
 		{
-			var element = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
+            CheckModel(model, false);
+            var element = _orderStorage.GetElement(new OrderSearchModel()
+            {
+                Id = model.Id
+            });
             if (element == null)
             {
-				_logger.LogWarning("Find order failed");
+                throw new ArgumentNullException(nameof(element));
+            }
+            model.DateCreate = element.DateCreate;
+            model.EngineId = element.EngineId;
+            model.DateImplement = element.DateImplement;
+            model.Status = element.Status;
+            model.Count = element.Count;
+            model.Sum = element.Sum;
+            if (requiredStatus - model.Status == 1)
+            {
+                model.Status = requiredStatus;
+                if (model.Status == OrderStatus.Выдан)
+                    model.DateImplement = DateTime.Now;
+                if (_orderStorage.Update(model) == null)
+                {
+                    _logger.LogWarning("Update operation failed");
                     return false;
                 }
-			if (element.Status != status - 1)
-			{
-				_logger.LogWarning("Status change failed");
-				throw new InvalidOperationException("Невозможно перевести состояние заказа");
-			}
-			if (status == OrderStatus.Готов)
-			{
-				var engine = _engineStorage.GetElement(new EngineSearchModel() { Id = model.EngineId });
-				if (engine == null)
-				{
-					_logger.LogWarning("Status change error. Engine not found");
-					return false;
-				}
-				if (!CheckSupply(engine, model.Count))
-				{
-					_logger.LogWarning("Status change error. Shop doesnt have engines");
-					return false;
-				}
-			}
-			model.Status = status;
-			if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now;
-			_orderStorage.Update(model);
                 return true;
             }
+            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
+            throw new ArgumentException($"Невозможно присвоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+        }
 
 		public bool TakeOrderInWork(OrderBindingModel model)
 		{
@@ -117,67 +123,24 @@ namespace MotorPlantBusinessLogic.BusinessLogics
 
 		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 ChangeStatus(model, OrderStatus.Выдан);
         }
-
-		public bool CheckSupply(IEngineModel engine, int count)
-		{
-			if (count <= 0)
-			{
-				_logger.LogWarning("Check supply operation error. Engine count < 0");
-				return false;
-			}
-			int sumCapacity = _shopStorage.GetFullList().Select(x => x.MaxCount).Sum();
-			int sumCount = _shopStorage.GetFullList().Select(x => x.ShopEngines.Select(y => y.Value.Item2).Sum()).Sum();
-			int free = sumCapacity - sumCount;
-
-			if (free < count)
-			{
-				_logger.LogWarning("Check supply error. No place for new Engines");
-				return false;
-			}
-			foreach (var shop in _shopStorage.GetFullList())
-			{
-				free = shop.MaxCount;
-				foreach (var doc in shop.ShopEngines)
-				{
-					free -= doc.Value.Item2;
-				}
-				if (free == 0)
-				{
-					continue;
-				}
-				if (free >= count)
-				{
-					if (_shopLogic.MakeSupply(new()
-					{
-						Id = shop.Id
-					}, engine, count))
-					{
-						count = 0;
-					}
-					else
-					{
-						_logger.LogWarning("Supply error");
-						return false;
-					}
-				}
-				else
-				{
-					if (_shopLogic.MakeSupply(new() { Id = shop.Id }, engine, free))
-						count -= free;
-					else
-					{
-						_logger.LogWarning("Supply error");
-						return false;
-					}
-				}
-				if (count <= 0)
-				{
-					return true;
-				}
-			}
-			return false;
-		}
 	}
 }

MotorPlant/MotorPlantBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -1,15 +1,10 @@
-using MotorPlantBusinessLogic.OfficePackage.HelperModels;
+using MotorPlantBusinessLogic.OfficePackage;
-using MotorPlantBusinessLogic.OfficePackage;
+using MotorPlantBusinessLogic.OfficePackage.HelperModels;
 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.BusinessLogic
 {
@@ -21,18 +16,21 @@ namespace MotorPlantBusinessLogic.BusinessLogic
 
         private readonly IOrderStorage _orderStorage;
 
+        private readonly IShopStorage _shopStorage;
+
         private readonly AbstractSaveToExcel _saveToExcel;
 
         private readonly AbstractSaveToWord _saveToWord;
 
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(IEngineStorage engineStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+        public ReportLogic(IEngineStorage engineStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
             AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _engineStorage = engineStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
+            _shopStorage = shopStorage;
 
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
@@ -42,28 +40,12 @@ namespace MotorPlantBusinessLogic.BusinessLogic
         public List<ReportEngineComponentViewModel> GetEngineComponents()
         {
 
-            var engines = _engineStorage.GetFullList();
+            return _engineStorage.GetFullList().Select(x => new ReportEngineComponentViewModel
-
-            var list = new List<ReportEngineComponentViewModel>();
-
-            foreach (var engine in engines)
             {
-                var record = new ReportEngineComponentViewModel
+                EngineName = x.EngineName,
-                {
+                Components = x.EngineComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(),
-                    EngineName = engine.EngineName,
+                TotalCount = x.EngineComponents.Select(x => x.Value.Item2).Sum()
-                    Components = new List<(string Component, int Count)>(),
+            }).ToList();
-                    TotalCount = 0,
-                };
-                foreach (var component in engine.EngineComponents)
-                {
-                    record.Components.Add(new(component.Value.Item1.ComponentName, component.Value.Item2));
-                    record.TotalCount += component.Value.Item2;
-                }
-
-                list.Add(record);
-            }
-
-            return list;
         }
 
         public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
@@ -111,5 +93,55 @@ namespace MotorPlantBusinessLogic.BusinessLogic
                 Orders = GetOrders(model)
             });
         }
+
+        public List<ReportShopsViewModel> GetShops()
+        {
+            return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel
+            {
+                ShopName = x.ShopName,
+                Engines = x.ShopEngines.Select(x => (x.Value.Item1.EngineName, x.Value.Item2)).ToList(),
+                TotalCount = x.ShopEngines.Select(x => x.Value.Item2).Sum()
+            }).ToList();
+        }
+
+        public List<ReportGroupOrdersViewModel> GetGroupedOrders()
+        {
+            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportGroupOrdersViewModel
+            {
+                Date = x.Key,
+                OrdersCount = x.Count(),
+                OrdersSum = x.Select(y => y.Sum).Sum()
+            }).ToList();
+        }
+
+        public void SaveShopsToWordFile(ReportBindingModel model)
+        {
+            _saveToWord.CreateShopsDoc(new WordShopInfo
+            {
+                FileName = model.FileName,
+                Title = "Список магазинов",
+                Shops = _shopStorage.GetFullList()
+            });
+        }
+
+        public void SaveShopsToExcelFile(ReportBindingModel model)
+        {
+            _saveToExcel.CreateShopEnginesReport(new ExcelShop
+            {
+                FileName = model.FileName,
+                Title = "Наполненость магазинов",
+                ShopEngines = GetShops()
+            });
+        }
+
+        public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo
+            {
+                FileName = model.FileName,
+                Title = "Список заказов сгруппированных по дате заказов",
+                GroupedOrders = GetGroupedOrders()
+            });
+        }
     }
 }

MotorPlant/MotorPlantBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -17,11 +17,13 @@ namespace MotorPlantBusinessLogic.BusinessLogic
     {
         private readonly ILogger _logger;
         private readonly IShopStorage _shopStorage;
+		private readonly IEngineStorage _engineStorage;
 
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, IEngineStorage engineStorage)
         {
             _logger = logger;
             _shopStorage = shopStorage;
+            _engineStorage = engineStorage;
         }
 
         public List<ShopViewModel> ReadList(ShopSearchModel model)
@@ -75,6 +77,7 @@ namespace MotorPlantBusinessLogic.BusinessLogic
             }
             return true;
         }
+
         public bool Delete(ShopBindingModel model)
         {
             CheckModel(model, false);
@@ -123,52 +126,70 @@ namespace MotorPlantBusinessLogic.BusinessLogic
 			}
 		}
 
-		public bool MakeSell(IEngineModel model, int count)
+		public bool MakeSupply(SupplyBindingModel model)
-		{
-			return _shopStorage.SellEngines(model, count);
-		}
-
-		public bool MakeSupply(ShopSearchModel model, IEngineModel engine, int count)
         {
             if (model == null)
+            {
                 throw new ArgumentNullException(nameof(model));
-			if (engine == null)
-				throw new ArgumentNullException(nameof(engine));
-			if (count <= 0)
-				throw new ArgumentNullException("Количество должно быть положительным числом");
-
-			ShopViewModel? curModel = _shopStorage.GetElement(model);
-			_logger.LogInformation("Make Supply. Id: {Id}. ShopName: {Name}", model.Id, model.Name);
-			if (curModel == null)
-				throw new ArgumentNullException(nameof(curModel));
-
-			var countItems = curModel.ShopEngines.Select(x => x.Value.Item2).Sum();
-			if (curModel.MaxCount - countItems < count)
-			{
-				_logger.LogWarning("Shop is overflowed");
-				return false;
             }
-
+            if (model.Count <= 0)
-			if (curModel.ShopEngines.TryGetValue(engine.Id, out var pair))
             {
-				curModel.ShopEngines[engine.Id] = (pair.Item1, pair.Item2 + count);
+                throw new ArgumentException("Количество движков должно быть больше 0");
-				_logger.LogInformation("Make Supply. Add Dress. ShopName: {ShopName}. DressName: {Name}. Count: {Count}", curModel.ShopName, pair.Item1, count + pair.Item2);
+            }
+            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
             {
-				curModel.ShopEngines.Add(engine.Id, (engine, count));
+                var pizza = _engineStorage.GetElement(new EngineSearchModel
-				_logger.LogInformation("Make Supply. Add new Dress. ShopName: {ShopName}. DressName: {Name}. Count: {Count}", curModel.ShopName, pair.Item1, count);
+                {
+                    Id = model.EngineId
+                });
+                if (pizza == null)
+                {
+                    throw new ArgumentException($"Поставка: Товар с id:{model.EngineId} не найденн");
+                }
+                shop.ShopEngines.Add(model.EngineId, (pizza, model.Count));
             }
 
-			return Update(new()
+            _shopStorage.Update(new ShopBindingModel()
             {
-				Id = curModel.Id,
+                Id = shop.Id,
-				ShopName = curModel.ShopName,
+                ShopName = shop.ShopName,
-				DateOpen = curModel.DateOpen,
+                Adress = shop.Adress,
-				MaxCount = curModel.MaxCount,
+                DateOpen = shop.DateOpen,
-				Adress = curModel.Adress,
+                ShopEngines = shop.ShopEngines,
-				ShopEngines = curModel.ShopEngines,
+                MaxCount = shop.MaxCount,
             });
+
+            return true;
+        }
+
+        public bool MakeSell(SupplySearchModel model)
+        {
+            if (!model.EngineId.HasValue || !model.Count.HasValue)
+            {
+                return false;
+            }
+            _logger.LogInformation("Check pizza count in all shops");
+            if (_shopStorage.SellEngines(model))
+            {
+                _logger.LogInformation("Selling sucsess");
+                return true;
+            }
+            _logger.LogInformation("Selling failed");
+            return false;
         }
     }
 }

MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -84,28 +84,81 @@ namespace MotorPlantBusinessLogic.OfficePackage
             SaveExcel(info);
         }
 
-        /// <summary>
+        public void CreateShopEnginesReport(ExcelShop info)
-        /// Создание excel-файла
+        {
-        /// </summary>
+            CreateExcel(info);
-        /// <param name="info"></param>
-        protected abstract void CreateExcel(ExcelInfo info);
 
-        /// <summary>
+            InsertCellInWorksheet(new ExcelCellParameters
-        /// Добавляем новую ячейку в лист
+            {
-        /// </summary>
+                ColumnName = "A",
-        /// <param name="cellParameters"></param>
+                RowIndex = 1,
+                Text = info.Title,
+                StyleInfo = ExcelStyleInfoType.Title
+            });
+
+            MergeCells(new ExcelMergeParameters
+            {
+                CellFromName = "A1",
+                CellToName = "C1"
+            });
+
+            uint rowIndex = 2;
+            foreach (var sr in info.ShopEngines)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = sr.ShopName,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+
+                foreach (var (Engine, Count) in sr.Engines)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "B",
+                        RowIndex = rowIndex,
+                        Text = Engine,
+                        StyleInfo = ExcelStyleInfoType.TextWithBorder
+                    });
+
+
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "C",
+                        RowIndex = rowIndex,
+                        Text = Count.ToString(),
+                        StyleInfo = ExcelStyleInfoType.TextWithBorder
+                    });
+
+                    rowIndex++;
+                }
+
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = "Итого",
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "C",
+                    RowIndex = rowIndex,
+                    Text = sr.TotalCount.ToString(),
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+            }
+
+            SaveExcel(info);
+        }
+
+        protected abstract void CreateExcel(IDocument info);
         protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
-
-        /// <summary>
-        /// Объединение ячеек
-        /// </summary>
-        /// <param name="mergeParameters"></param>
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
-
+        protected abstract void SaveExcel(IDocument info);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveExcel(ExcelInfo info);
     }
 }

MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -48,11 +48,40 @@ namespace MotorPlantBusinessLogic.OfficePackage
             SavePdf(info);
         }
 
+        public void CreateGroupedOrdersDoc(PdfGroupedOrdersInfo info)
+        {
+            CreatePdf(info);
+            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+            CreateTable(new List<string> { "4cm", "3cm", "2cm" });
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Дата заказа", "Кол-во", "Сумма" },
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+
+
+            foreach (var groupedOrder in info.GroupedOrders)
+            {
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { groupedOrder.Date.ToShortDateString(), groupedOrder.OrdersCount.ToString(), groupedOrder.OrdersSum.ToString() },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left
+                });
+            }
+
+            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.GroupedOrders.Sum(x => x.OrdersSum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+            SavePdf(info);
+        }
+
         /// <summary>
 		/// Создание pdf-файла
 		/// </summary>
 		/// <param name="info"></param>
-        protected abstract void CreatePdf(PdfInfo info);
+        protected abstract void CreatePdf(IDocument info);
 
         /// <summary>
         /// Создание параграфа с текстом
@@ -78,6 +107,6 @@ namespace MotorPlantBusinessLogic.OfficePackage
 		/// Сохранение файла
 		/// </summary>
 		/// <param name="info"></param>
-        protected abstract void SavePdf(PdfInfo info);
+        protected abstract void SavePdf(IDocument info);
     }
 }

MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -41,23 +41,51 @@ namespace MotorPlantBusinessLogic.OfficePackage
             SaveWord(info);
         }
 
-        /// <summary>
+        public void CreateShopsDoc(WordShopInfo info)
-		/// Создание doc-файла
+        {
-		/// </summary>
+            CreateWord(info);
-		/// <param name="info"></param>
+            CreateParagraph(new WordParagraph
-        protected abstract void CreateWord(WordInfo info);
+            {
+                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
+                TextProperties = new WordTextProperties
+                {
+                    Size = "24",
+                    JustificationType = WordJustificationType.Center
+                }
+            });
 
-        /// <summary>
+            CreateTable(new List<string> { "3000", "3000", "3000" });
-        /// Создание абзаца с текстом
+            CreateRow(new WordRowParameters
-        /// </summary>
+            {
-        /// <param name="paragraph"></param>
+                Texts = new List<string> { "Название", "Адрес", "Дата открытия" },
-        /// <returns></returns>
+                TextProperties = new WordTextProperties
+                {
+                    Size = "24",
+                    Bold = true,
+                    JustificationType = WordJustificationType.Center
+                }
+            });
+
+            foreach (var shop in info.Shops)
+            {
+                CreateRow(new WordRowParameters
+                {
+                    Texts = new List<string> { shop.ShopName, shop.Adress, shop.DateOpen.ToString() },
+                    TextProperties = new WordTextProperties
+                    {
+                        Size = "22",
+                        JustificationType = WordJustificationType.Both
+                    }
+                });
+            }
+
+            SaveWord(info);
+        }
+
+        protected abstract void CreateWord(IDocument info);
         protected abstract void CreateParagraph(WordParagraph paragraph);
-
+        protected abstract void SaveWord(IDocument info);
-        /// <summary>
+        protected abstract void CreateTable(List<string> colums);
-		/// Сохранение файла
+        protected abstract void CreateRow(WordRowParameters rowParameters);
-		/// </summary>
-		/// <param name="info"></param>
-        protected abstract void SaveWord(WordInfo info);
     }
 }

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
 {
-    public class ExcelInfo
+    public class ExcelInfo : IDocument
     {
         public string FileName { get; set; } = string.Empty;
 

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelShop.cs

@@ -0,0 +1,11 @@
+using MotorPlantContracts.ViewModels;
+
+namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelShop : IDocument
+    {
+        public string FileName { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public List<ReportShopsViewModel> ShopEngines { get; set; } = new();
+    }
+}

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

@@ -0,0 +1,13 @@
+using MotorPlantContracts.ViewModels;
+
+namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfGroupedOrdersInfo : IDocument
+    {
+        public string FileName { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public DateTime DateFrom { get; set; }
+        public DateTime DateTo { get; set; }
+        public List<ReportGroupOrdersViewModel> GroupedOrders { get; set; } = new();
+    }
+}

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
 {
-    public class PdfInfo
+    public class PdfInfo : IDocument
     {
         public string FileName { get; set; } = string.Empty;
 

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
 {
-    public class WordInfo
+    public class WordInfo : IDocument
     {
         public string FileName { get; set; } = string.Empty;
 

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordRowParameters
+    {
+        public List<string> Texts { get; set; } = new();
+        public WordTextProperties TextProperties { get; set; } = new();
+    }
+}

MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordShopInfo.cs

@@ -0,0 +1,16 @@
+using MotorPlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordShopInfo : IDocument
+    {
+        public string FileName { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public List<ShopViewModel> Shops { get; set; } = new();
+    }
+}

MotorPlant/MotorPlantBusinessLogic/OfficePackage/IDocument.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantBusinessLogic.OfficePackage
+{
+    public interface IDocument
+    {
+        public string FileName { get; set; }
+        public string Title { get; set; }
+    }
+}

MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -151,7 +151,7 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
             };
         }
 
-        protected override void CreateExcel(ExcelInfo info)
+        protected override void CreateExcel(IDocument info)
         {
             _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
             // Создаем книгу (в ней хранятся листы)
@@ -280,7 +280,7 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
             mergeCells.Append(mergeCell);
         }
 
-        protected override void SaveExcel(ExcelInfo info)
+        protected override void SaveExcel(IDocument info)
         {
             if (_spreadsheetDocument == null)
             {

MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -34,7 +34,7 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
             style.Font.Bold = true;
         }
 
-        protected override void CreatePdf(PdfInfo info)
+        protected override void CreatePdf(IDocument info)
         {
             _document = new Document();
             DefineStyles(_document);
@@ -96,7 +96,7 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
             }
         }
 
-        protected override void SavePdf(PdfInfo info)
+        protected override void SavePdf(IDocument info)
         {
             var renderer = new PdfDocumentRenderer(true)
             {

MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToWord .cs

@@ -81,7 +81,7 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
             return properties;
         }
 
-        protected override void CreateWord(WordInfo info)
+        protected override void CreateWord(IDocument info)
         {
             _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
@@ -119,7 +119,7 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
             _docBody.AppendChild(docParagraph);
         }
 
-        protected override void SaveWord(WordInfo info)
+        protected override void SaveWord(IDocument info)
         {
             if (_docBody == null || _wordDocument == null)
             {
@@ -131,5 +131,77 @@ namespace MotorPlantBusinessLogic.OfficePackage.Implements
 
             _wordDocument.Dispose();
         }
+
+        private Table? _lastTable;
+        protected override void CreateTable(List<string> columns)
+        {
+            if (_docBody == null)
+                return;
+
+            _lastTable = new Table();
+
+            var tableProp = new TableProperties();
+            tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
+            tableProp.AppendChild(new TableBorders(
+                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
+                ));
+            tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
+            _lastTable.AppendChild(tableProp);
+
+            TableGrid tableGrid = new TableGrid();
+            foreach (var column in columns)
+            {
+                tableGrid.AppendChild(new GridColumn() { Width = column });
+            }
+            _lastTable.AppendChild(tableGrid);
+
+            _docBody.AppendChild(_lastTable);
+        }
+
+        protected override void CreateRow(WordRowParameters rowParameters)
+        {
+            if (_docBody == null || _lastTable == null)
+                return;
+
+            TableRow docRow = new TableRow();
+            foreach (var column in rowParameters.Texts)
+            {
+                var docParagraph = new Paragraph();
+                WordParagraph paragraph = new WordParagraph
+                {
+                    Texts = new List<(string, WordTextProperties)> { (column, rowParameters.TextProperties) },
+                    TextProperties = rowParameters.TextProperties
+                };
+
+                docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+
+                foreach (var run in paragraph.Texts)
+                {
+                    var docRun = new Run();
+
+                    var properties = new RunProperties();
+                    properties.AppendChild(new FontSize { Val = run.Item2.Size });
+                    if (run.Item2.Bold)
+                    {
+                        properties.AppendChild(new Bold());
+                    }
+                    docRun.AppendChild(properties);
+
+                    docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
+
+                    docParagraph.AppendChild(docRun);
+                }
+
+                TableCell docCell = new TableCell();
+                docCell.AppendChild(docParagraph);
+                docRow.AppendChild(docCell);
+            }
+            _lastTable.AppendChild(docRow);
+        }
     }
 }

MotorPlant/MotorPlantContracts/BindingModels/SupplyBindingModel.cs

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

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -11,13 +11,14 @@ namespace MotorPlantContracts.BusinessLogicsContracts
     public interface IReportLogic
     {
         List<ReportEngineComponentViewModel> GetEngineComponents();
-
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-
+        List<ReportShopsViewModel> GetShops();
+        List<ReportGroupOrdersViewModel> GetGroupedOrders();
         void SaveEngineToWordFile(ReportBindingModel model);
-
         void SaveEngineComponentToExcelFile(ReportBindingModel model);
-
         void SaveOrdersToPdfFile(ReportBindingModel model);
+        void SaveShopsToWordFile(ReportBindingModel model);
+        void SaveShopsToExcelFile(ReportBindingModel model);
+        void SaveGroupedOrdersToPdfFile(ReportBindingModel model);
     }
 }

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -14,10 +14,10 @@ namespace MotorPlantContracts.BusinessLogicsContracts
     {
         List<ShopViewModel>? ReadList(ShopSearchModel? model);
         ShopViewModel? ReadElement(ShopSearchModel? model);
-        bool Create(ShopBindingModel? model);
+        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel? model);
+        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel? model);
+        bool Delete(ShopBindingModel model);
-        bool MakeSupply(ShopSearchModel model, IEngineModel engine, int count);
+        bool MakeSupply(SupplyBindingModel model);
-		bool MakeSell(IEngineModel model, int count);
+		bool MakeSell(SupplySearchModel model);
 	}
 }

MotorPlant/MotorPlantContracts/SearchModels/SupplySearchModel.cs

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

MotorPlant/MotorPlantContracts/StoragesContracts/IShopStorage.cs

@@ -18,6 +18,7 @@ namespace MotorPlantContracts.StoragesContracts
         ShopViewModel? Insert(ShopBindingModel model);
         ShopViewModel? Update(ShopBindingModel model);
         ShopViewModel? Delete(ShopBindingModel model);
-		bool SellEngines(IEngineModel model, int count);
+		bool SellEngines(SupplySearchModel model);
+        bool RestockingShops(SupplyBindingModel model);
     }
 }

MotorPlant/MotorPlantContracts/ViewModels/ReportGroupOrdersViewModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorPlantContracts.ViewModels
+{
+    public class ReportGroupOrdersViewModel
+    {
+        public DateTime Date { get; set; } = DateTime.Now;
+        public int OrdersCount { get; set; }
+        public double OrdersSum { get; set; }
+    }
+}

MotorPlant/MotorPlantContracts/ViewModels/ReportShopsViewModel.cs

@@ -0,0 +1,9 @@
+namespace MotorPlantContracts.ViewModels
+{
+    public class ReportShopsViewModel
+    {
+        public string ShopName { get; set; } = string.Empty;
+        public int TotalCount { get; set; }
+        public List<(string Engine, int count)> Engines { get; set; } = new();
+    }
+}

MotorPlant/MotorPlantDataModels/Models/ISupplyModel.cs

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

MotorPlant/MotorPlantDatabaseImplement/Implements/OrderStorage.cs

@@ -13,9 +13,7 @@ namespace MotorPlantDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new MotorPlantDatabase();
-			return context.Orders
+            return context.Orders.Include(x => x.Engine).Select(x => x.GetViewModel).ToList();
-			.Select(x => AccessEngineStorage(x.GetViewModel))
-		   .ToList();
         }
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
@@ -24,8 +22,6 @@ namespace MotorPlantDatabaseImplement.Implements
                 return new();
             }
             using var context = new MotorPlantDatabase();
-			return context.Orders.Where(x => x.Id == model.Id).Select(x => AccessEngineStorage(x.GetViewModel)).ToList();
-		}
             if (model.DateFrom.HasValue)
             {
                 return context.Orders
@@ -47,61 +43,53 @@ namespace MotorPlantDatabaseImplement.Implements
                 return null;
             }
             using var context = new MotorPlantDatabase();
-			return AccessEngineStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
+            return context.Orders.Include(x => x.Engine)
+                .FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {
-			var newOrder = Order.Create(model);
+            using var context = new MotorPlantDatabase();
+            if (model == null)
+                return null;
+            var newOrder = Order.Create(context, model);
             if (newOrder == null)
             {
                 return null;
             }
-			using var context = new MotorPlantDatabase();
             context.Orders.Add(newOrder);
             context.SaveChanges();
-			return AccessEngineStorage(newOrder.GetViewModel);
+            return newOrder.GetViewModel;
         }
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new MotorPlantDatabase();
-			var order = context.Orders.FirstOrDefault(x => x.Id ==
+            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
-		   model.Id);
             if (order == null)
             {
                 return null;
             }
             order.Update(model);
             context.SaveChanges();
-			return AccessEngineStorage(order.GetViewModel);
+            return context.Orders
+                         .Include(x => x.Engine)
+                         .FirstOrDefault(x => x.Id == model.Id)
+                         ?.GetViewModel;
         }
-
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new MotorPlantDatabase();
             var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
             if (element != null)
             {
+                var deletedElement = context.Orders
+                                           .Include(x => x.Engine)
+                                           .FirstOrDefault(x => x.Id == model.Id)
+                                           ?.GetViewModel;
                 context.Orders.Remove(element);
                 context.SaveChanges();
-                return AccessEngineStorage(element.GetViewModel);
+                return deletedElement;
             }
             return null;
         }
-
-		public static OrderViewModel AccessEngineStorage(OrderViewModel model)
-		{
-			if (model == null)
-				return null;
-			using var context = new MotorPlantDatabase();
-			foreach (var Engine in context.Engines)
-			{
-				if (Engine.Id == model.EngineId)
-				{
-					model.EngineName = Engine.EngineName;
-					break;
-				}
-			}
-			return model;
-		}
     }
 }

MotorPlant/MotorPlantDatabaseImplement/Implements/ShopStorage.cs

@@ -85,60 +85,116 @@ namespace MotorPlantDatabaseImplement.Implements
 		public ShopViewModel? Update(ShopBindingModel model)
 		{
             using var context = new MotorPlantDatabase();
+            using var transaction = context.Database.BeginTransaction();
+            try
+            {
                 var shop = context.Shops.FirstOrDefault(x => x.Id == model.Id);
                 if (shop == null)
                 {
                     return null;
                 }
-			try
-			{
-				if (context.Shops.Any(x => (x.ShopName == model.ShopName && x.Id != model.Id)))
-				{
-					throw new Exception("Не должно быть два магазина с одним названием");
-				}
                 shop.Update(model);
-				shop.UpdateDresses(context, model);
                 context.SaveChanges();
+                shop.UpdateEngines(context, model);
+                transaction.Commit();
                 return shop.GetViewModel;
             }
             catch
             {
+                transaction.Rollback();
                 throw;
             }
         }
-		public bool SellEngines(IEngineModel model, int count)
+
+        public bool RestockingShops(SupplyBindingModel model)
         {
-			if (model == null)
-				return false;
             using var context = new MotorPlantDatabase();
-			using var transaction = context.Database.BeginTransaction();
+            var transaction = context.Database.BeginTransaction();
-			List<ShopEngine> lst = new List<ShopEngine>();
+            var Shops = context.Shops.Include(x => x.Engines).ThenInclude(x => x.Engine).ToList().
-			foreach (var el in context.ShopEngines.Where(x => x.EngineId == model.Id))
+                Where(x => x.MaxCount > x.ShopEngines.Select(x => x.Value.Item2).Sum()).ToList();
+            if (model == null)
             {
-				int dif = count;
-				if (el.Count < dif)
-					dif = el.Count;
-				el.Count -= dif;
-				count -= dif;
-				if (el.Count == 0)
-				{
-					lst.Add(el);
-				}
-				if (count == 0)
-					break;
-			}
-			if (count > 0)
-			{
-				transaction.Rollback();
                 return false;
             }
-			foreach (var el in lst)
+            try
             {
-				context.ShopEngines.Remove(el);
+                foreach (Shop shop in Shops)
+                {
+                    int difference = shop.MaxCount - shop.ShopEngines.Select(x => x.Value.Item2).Sum();
+                    int refill = Math.Min(difference, model.Count);
+                    model.Count -= refill;
+                    if (shop.ShopEngines.ContainsKey(model.EngineId))
+                    {
+                        var datePair = shop.ShopEngines[model.EngineId];
+                        datePair.Item2 += refill;
+                        shop.ShopEngines[model.EngineId] = datePair;
                     }
-			context.SaveChanges();
+                    else
+                    {
+                        var pizza = context.Engines.First(x => x.Id == model.EngineId);
+                        shop.ShopEngines.Add(model.EngineId, (pizza, refill));
+                    }
+                    shop.EnginesDictionatyUpdate(context);
+                    if (model.Count == 0)
+                    {
                         transaction.Commit();
                         return true;
                     }
                 }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        public bool SellEngines(SupplySearchModel model)
+		{
+            using var context = new MotorPlantDatabase();
+            var transaction = context.Database.BeginTransaction();
+            try
+            {
+                var shops = context.Shops.Include(x => x.Engines).ThenInclude(x => x.Engine).ToList().
+                    Where(x => x.ShopEngines.ContainsKey(model.EngineId.Value)).OrderByDescending(x => x.ShopEngines[model.EngineId.Value].Item2).ToList();
+
+                foreach (var shop in shops)
+                {
+                    int residue = model.Count.Value - shop.ShopEngines[model.EngineId.Value].Item2;
+                    if (residue > 0)
+                    {
+                        shop.ShopEngines.Remove(model.EngineId.Value);
+                        shop.EnginesDictionatyUpdate(context);
+                        context.SaveChanges();
+                        model.Count = residue;
+
+                    }
+                    else
+                    {
+                        if (residue == 0)
+                            shop.ShopEngines.Remove(model.EngineId.Value);
+                        else
+                        {
+                            var dataPair = shop.ShopEngines[model.EngineId.Value];
+                            dataPair.Item2 = -residue;
+                            shop.ShopEngines[model.EngineId.Value] = dataPair;
+                        }
+
+                        shop.EnginesDictionatyUpdate(context);
+                        transaction.Commit();
+                        return true;
+                    }
+                }
+                transaction.Rollback();
+                return false;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+	}
 }

MotorPlant/MotorPlantDatabaseImplement/Migrations/20240516204547_ThirdMigtation.Designer.cs

@@ -0,0 +1,246 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MotorPlantDatabaseImplement;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MotorPlantDatabaseImplement.Migrations
+{
+    [DbContext(typeof(MotorPlantDatabase))]
+    [Migration("20240516204547_ThirdMigtation")]
+    partial class ThirdMigtation
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("EngineName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Engines");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("EngineId");
+
+                    b.ToTable("EngineComponents");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EngineId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Adress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("MaxCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ShopName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shops");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.ShopEngine", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("EngineId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("ShopId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EngineId");
+
+                    b.HasIndex("ShopId");
+
+                    b.ToTable("ShopEngines");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.EngineComponent", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Component", "Component")
+                        .WithMany("EngineComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                        .WithMany("Components")
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Engine");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", null)
+                        .WithMany("Orders")
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.ShopEngine", b =>
+                {
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Engine", "Engine")
+                        .WithMany()
+                        .HasForeignKey("EngineId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MotorPlantDatabaseImplement.Models.Shop", "Shop")
+                        .WithMany("Engines")
+                        .HasForeignKey("ShopId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Engine");
+
+                    b.Navigation("Shop");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("EngineComponents");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Engine", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("MotorPlantDatabaseImplement.Models.Shop", b =>
+                {
+                    b.Navigation("Engines");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MotorPlant/MotorPlantDatabaseImplement/Migrations/20240516204547_ThirdMigtation.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace MotorPlantDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class NewMig : Migration
+    public partial class ThirdMigtation : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

MotorPlant/MotorPlantDatabaseImplement/Models/Order.cs

@@ -12,7 +12,7 @@ namespace MotorPlantDatabaseImplement.Models
 
         [Required]
         public int EngineId { get; private set; }
-
+        public virtual Engine Engine { get; set; } = new();
         [Required]
         public int Count { get; private set; }
 
@@ -27,16 +27,13 @@ namespace MotorPlantDatabaseImplement.Models
 
         public DateTime? DateImplement { get; private set; }
 
-        public static Order? Create(OrderBindingModel? model)
+        public static Order Create(MotorPlantDatabase context, OrderBindingModel model)
         {
-            if (model == null)
-            {
-                return null;
-            }
             return new Order()
             {
                 Id = model.Id,
                 EngineId = model.EngineId,
+                Engine = context.Engines.First(x => x.Id == model.EngineId),
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -58,6 +55,7 @@ namespace MotorPlantDatabaseImplement.Models
         {
             Id = Id,
             EngineId = EngineId,
+            EngineName = Engine.EngineName,
             Count = Count,
             Sum = Sum,
             Status = Status,

MotorPlant/MotorPlantDatabaseImplement/Models/Shop.cs

@@ -15,16 +15,16 @@ namespace MotorPlantDatabaseImplement.Models
 	{
 		public int Id { get; private set; }
 		[Required]
-		public string ShopName { get; private set; }
+		public string ShopName { get; private set; } = string.Empty;
         [Required]
-		public string Adress { get; private set; }
+		public string Adress { get; private set; } = string.Empty;
         [Required]
 		public DateTime DateOpen { get; private set; }
 		[Required]
 		public int MaxCount { get; private set; }
 		private Dictionary<int, (IEngineModel, int)>? _shopEngines = null;
 		[NotMapped]
-		public Dictionary<int, (IEngineModel, int)>? ShopEngines
+		public Dictionary<int, (IEngineModel, int)> ShopEngines
 		{
 			get
 			{
@@ -74,7 +74,7 @@ namespace MotorPlantDatabaseImplement.Models
 			ShopEngines = ShopEngines
 		};
 
-		public void UpdateDresses(MotorPlantDatabase context, ShopBindingModel model)
+		public void UpdateEngines(MotorPlantDatabase context, ShopBindingModel model)
 		{
 			var shopEngines = context.ShopEngines.Where(rec => rec.ShopId == model.Id).ToList();
 			if (shopEngines != null && shopEngines.Count > 0)
@@ -101,5 +101,14 @@ namespace MotorPlantDatabaseImplement.Models
 			}
 			_shopEngines = null;
 		}
+
+        public void EnginesDictionatyUpdate(MotorPlantDatabase context)
+        {
+            UpdateEngines(context, new ShopBindingModel
+            {
+                Id = Id,
+                ShopEngines = ShopEngines,
+            });
+        }
     }
 }

MotorPlant/MotorPlantFileImplement/Implements/ShopStorage .cs

@@ -75,44 +75,73 @@ namespace MotorPlantFileImplement.Implements
 			return null;
 		}
 
-		public bool SellEngines(IEngineModel model, int count)
+		public bool SellEngines(SupplySearchModel model)
 		{
-			var eng = _source.Engines.FirstOrDefault(x => x.Id == model.Id);
+            if (model == null || !model.EngineId.HasValue || !model.Count.HasValue)
-            int store = _source.Shops.SelectMany(x => x.ShopEngines).Sum(y => y.Key == model.Id ? y.Value.Item2 : 0);
+                return false;
-
+            int remainingSpace = _source.Shops.Select(x => x.Engines.ContainsKey(model.EngineId.Value) ? x.Engines[model.EngineId.Value] : 0).Sum();
-            if (eng == null || store < count)
+            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();
-			for (int i = 0; i < _source.Shops.Count; i++)
+            foreach (var shop in shops)
             {
-				var shop = _source.Shops[i];
+                int residue = model.Count.Value - shop.Engines[model.EngineId.Value];
-				var engines = shop.ShopEngines;
+                if (residue > 0)
-				foreach (var engine in engines.Where(x => x.Value.Item1.Id == eng.Id))
                 {
-					var selling = Math.Min(engine.Value.Item2, count);
+                    shop.Engines.Remove(model.EngineId.Value);
-					engines[engine.Value.Item1.Id] = (engine.Value.Item1, engine.Value.Item2 - selling);
+                    shop.EngineUpdate();
-
+                    model.Count = residue;
-					count -= selling;
-
-					if (count <= 0)
-					{
-						break;
                 }
-				}
+                else
-				shop.Update(new ShopBindingModel
                 {
-					Id = model.Id,
+                    if (residue == 0)
-					ShopName = shop.ShopName,
+                    {
-					Adress = shop.Adress,
+                        shop.Engines.Remove(model.EngineId.Value);
-					MaxCount = shop.MaxCount,
-					DateOpen = shop.DateOpen,
-					ShopEngines = engines
-				});
                     }
+                    else
+                    {
+                        shop.Engines[model.EngineId.Value] = -residue;
+                    }
+                    shop.EngineUpdate();
                     _source.SaveShops();
                     return true;
                 }
             }
+            _source.SaveShops();
+            return false;
+        }
+
+        public bool RestockingShops(SupplyBindingModel model)
+        {
+            if (model == null || _source.Shops.Select(x => x.MaxCount - x.ShopEngines.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
+            {
+                return false;
+            }
+            foreach (Shop shop in _source.Shops)
+            {
+                int free_places = shop.MaxCount - 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.EngineUpdate();
+                if (model.Count == 0)
+                {
+                    _source.SaveShops();
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }

MotorPlant/MotorPlantFileImplement/Models/Shop.cs

@@ -98,5 +98,10 @@ namespace MotorPlantFileImplement.Models
 			new XElement("DateOpen", DateOpen),
 			new XElement("MaxCount", MaxCount),
 			new XElement("ShopEngines", Engines.Select(x => new XElement("ShopEngine", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()));
+
+        public void EngineUpdate()
+        {
+            _shopEngines = null;
+        }
     }
 }

MotorPlant/MotorPlantListImplement/Implements/OrderStorage.cs

@@ -31,7 +31,7 @@ namespace MotorPlantListImplement.Implements
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             var result = new List<OrderViewModel>();
-            if (model == null || !model.Id.HasValue)
+            if (model == null)
             {
                 return result;
             }

MotorPlant/MotorPlantListImplement/Implements/ShopStorage.cs

@@ -108,9 +108,14 @@ namespace MotorPlantListImplement.Implements
 		{
 			return true;
 		}
-		public bool SellEngines(IEngineModel model, int count)
+		public bool SellEngines(SupplySearchModel model)
 		{
-			return true;
+            throw new NotImplementedException();
+        }
+
+        public bool RestockingShops(SupplyBindingModel model)
+        {
+            throw new NotImplementedException();
         }
     }
 }

MotorPlant/MotorPlantView/FormMain.Designer.cs

@@ -32,10 +32,16 @@
             toolStripDropDownButton1 = new ToolStripDropDownButton();
             КомпонентыToolStripMenuItem = new ToolStripMenuItem();
             ДвигателиToolStripMenuItem = new ToolStripMenuItem();
+            магазиныToolStripMenuItem = new ToolStripMenuItem();
+            поставкаToolStripMenuItem = new ToolStripMenuItem();
+            продажаToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             списокДвигателейToolStripMenuItem = new ToolStripMenuItem();
             компонентыПоДвигателямToolStripMenuItem = new ToolStripMenuItem();
             списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
+            списокМагазиновToolStripMenuItem = new ToolStripMenuItem();
+            загруженностьМагазиновToolStripMenuItem = new ToolStripMenuItem();
+            заказыПоГруппамToolStripMenuItem = new ToolStripMenuItem();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
             buttonOrderReady = new Button();
@@ -59,7 +65,7 @@
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem, магазиныToolStripMenuItem, поставкаToolStripMenuItem, продажаToolStripMenuItem });
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
             toolStripDropDownButton1.Size = new Size(88, 22);
@@ -79,9 +85,30 @@
             ДвигателиToolStripMenuItem.Text = "Двигатели";
             ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
             // 
+            // магазиныToolStripMenuItem
+            // 
+            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            магазиныToolStripMenuItem.Size = new Size(145, 22);
+            магазиныToolStripMenuItem.Text = "Магазины";
+            магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
+            // 
+            // поставкаToolStripMenuItem
+            // 
+            поставкаToolStripMenuItem.Name = "поставкаToolStripMenuItem";
+            поставкаToolStripMenuItem.Size = new Size(145, 22);
+            поставкаToolStripMenuItem.Text = "Поставка";
+            поставкаToolStripMenuItem.Click += поставкаToolStripMenuItem_Click;
+            // 
+            // продажаToolStripMenuItem
+            // 
+            продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
+            продажаToolStripMenuItem.Size = new Size(145, 22);
+            продажаToolStripMenuItem.Text = "Продажа";
+            продажаToolStripMenuItem.Click += продажаToolStripMenuItem_Click;
+            // 
             // отчетыToolStripMenuItem
             // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокДвигателейToolStripMenuItem, компонентыПоДвигателямToolStripMenuItem, списокЗаказовToolStripMenuItem });
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокДвигателейToolStripMenuItem, компонентыПоДвигателямToolStripMenuItem, списокЗаказовToolStripMenuItem, списокМагазиновToolStripMenuItem, загруженностьМагазиновToolStripMenuItem, заказыПоГруппамToolStripMenuItem });
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(60, 25);
             отчетыToolStripMenuItem.Text = "Отчеты";
@@ -107,6 +134,27 @@
             списокЗаказовToolStripMenuItem.Text = "Список заказов";
             списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
             // 
+            // списокМагазиновToolStripMenuItem
+            // 
+            списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem";
+            списокМагазиновToolStripMenuItem.Size = new Size(228, 22);
+            списокМагазиновToolStripMenuItem.Text = "Список магазинов";
+            списокМагазиновToolStripMenuItem.Click += списокМагазиновToolStripMenuItem_Click;
+            // 
+            // загруженностьМагазиновToolStripMenuItem
+            // 
+            загруженностьМагазиновToolStripMenuItem.Name = "загруженностьМагазиновToolStripMenuItem";
+            загруженностьМагазиновToolStripMenuItem.Size = new Size(228, 22);
+            загруженностьМагазиновToolStripMenuItem.Text = "Загруженность магазинов";
+            загруженностьМагазиновToolStripMenuItem.Click += загруженностьМагазиновToolStripMenuItem_Click;
+            // 
+            // заказыПоГруппамToolStripMenuItem
+            // 
+            заказыПоГруппамToolStripMenuItem.Name = "заказыПоГруппамToolStripMenuItem";
+            заказыПоГруппамToolStripMenuItem.Size = new Size(228, 22);
+            заказыПоГруппамToolStripMenuItem.Text = "Заказы по группам";
+            заказыПоГруппамToolStripMenuItem.Click += заказыПоГруппамToolStripMenuItem_Click;
+            // 
             // buttonCreateOrder
             // 
             buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -219,5 +267,11 @@
         private ToolStripMenuItem списокДвигателейToolStripMenuItem;
         private ToolStripMenuItem компонентыПоДвигателямToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+        private ToolStripMenuItem магазиныToolStripMenuItem;
+        private ToolStripMenuItem поставкаToolStripMenuItem;
+        private ToolStripMenuItem продажаToolStripMenuItem;
+        private ToolStripMenuItem списокМагазиновToolStripMenuItem;
+        private ToolStripMenuItem загруженностьМагазиновToolStripMenuItem;
+        private ToolStripMenuItem заказыПоГруппамToolStripMenuItem;
     }
 }

MotorPlant/MotorPlantView/FormMain.cs

@@ -18,6 +18,7 @@ namespace MotorPlantView.Forms
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
         }
+
         private void FormMain_Load(object sender, EventArgs e)
         {
             LoadData();
@@ -33,7 +34,7 @@ namespace MotorPlantView.Forms
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["EngineId"].Visible = false;
-					dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
+                    dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
 
                 _logger.LogInformation("Загрузка заказов");
@@ -43,6 +44,7 @@ namespace MotorPlantView.Forms
                 _logger.LogError(ex, "Ошибка загрузки заказов");
             }
         }
+
         private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
@@ -52,6 +54,7 @@ namespace MotorPlantView.Forms
                 form.ShowDialog();
             }
         }
+
         private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormEngines));
@@ -61,6 +64,7 @@ namespace MotorPlantView.Forms
                 form.ShowDialog();
             }
         }
+
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
@@ -70,6 +74,7 @@ namespace MotorPlantView.Forms
                 LoadData();
             }
         }
+
         private void buttonTakeOrderInWork_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
@@ -95,6 +100,7 @@ namespace MotorPlantView.Forms
                 }
             }
         }
+
         private void buttonOrderReady_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
@@ -118,6 +124,7 @@ namespace MotorPlantView.Forms
                 }
             }
         }
+
         private void buttonIssuedOrder_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
@@ -139,10 +146,12 @@ namespace MotorPlantView.Forms
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
         }
+
         private void buttonRef_Click(object sender, EventArgs e)
         {
             LoadData();
@@ -175,5 +184,60 @@ namespace MotorPlantView.Forms
                 form.ShowDialog();
             }
         }
+
+        private void поставкаToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
+            if (service is FormSupply form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void продажаToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSell));
+            if (service is FormSell form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void списокМагазиновToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+
+        private void загруженностьМагазиновToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportShop));
+            if (service is FormReportShop form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void заказыПоГруппамToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
+            if (service is FormReportGroupedOrders form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
     }
 }

MotorPlant/MotorPlantView/FormReportGroupedOrders.Designer.cs

@@ -0,0 +1,86 @@
+namespace MotorPlantView
+{
+    partial class FormReportGroupedOrders
+    {
+        /// <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.panel = new System.Windows.Forms.Panel();
+            this.buttonToPDF = new System.Windows.Forms.Button();
+            this.buttonMake = new System.Windows.Forms.Button();
+            this.panel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel
+            // 
+            this.panel.Controls.Add(this.buttonToPDF);
+            this.panel.Controls.Add(this.buttonMake);
+            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel.Location = new System.Drawing.Point(0, 0);
+            this.panel.Name = "panel";
+            this.panel.Size = new System.Drawing.Size(970, 52);
+            this.panel.TabIndex = 1;
+            // 
+            // buttonToPDF
+            // 
+            this.buttonToPDF.Location = new System.Drawing.Point(486, 12);
+            this.buttonToPDF.Name = "buttonToPDF";
+            this.buttonToPDF.Size = new System.Drawing.Size(411, 29);
+            this.buttonToPDF.TabIndex = 5;
+            this.buttonToPDF.Text = "В PDF";
+            this.buttonToPDF.UseVisualStyleBackColor = true;
+            this.buttonToPDF.Click += new System.EventHandler(this.buttonToPDF_Click);
+            // 
+            // buttonMake
+            // 
+            this.buttonMake.Location = new System.Drawing.Point(49, 12);
+            this.buttonMake.Name = "buttonMake";
+            this.buttonMake.Size = new System.Drawing.Size(377, 29);
+            this.buttonMake.TabIndex = 4;
+            this.buttonMake.Text = "Сформировать";
+            this.buttonMake.UseVisualStyleBackColor = true;
+            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+            // 
+            // FormReportGroupedOrders
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(970, 450);
+            this.Controls.Add(this.panel);
+            this.Name = "FormReportGroupedOrders";
+            this.Text = "Отчёт по группированным заказам ";
+            this.panel.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Panel panel;
+        private Button buttonToPDF;
+        private Button buttonMake;
+    }
+}

MotorPlant/MotorPlantView/FormReportGroupedOrders.cs

@@ -0,0 +1,80 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorPlantView
+{
+    public partial class FormReportGroupedOrders : Form
+    {
+        private readonly ReportViewer reportViewer;
+        private readonly ILogger _logger;
+        private readonly IReportLogic _logic;
+
+        public FormReportGroupedOrders(ILogger<FormReportGroupedOrders> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            reportViewer = new ReportViewer
+            {
+                Dock = DockStyle.Fill
+            };
+            reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\salih\\OneDrive\\Рабочий стол\\MotorPlant\\MotorPlant\\MotorPlantView\\ReportGroupedOrders.rdlc", FileMode.Open));
+            Controls.Clear();
+            Controls.Add(reportViewer);
+            Controls.Add(panel);
+        }
+
+        private void ButtonMake_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                var dataSource = _logic.GetGroupedOrders();
+                var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
+                reportViewer.LocalReport.DataSources.Clear();
+                reportViewer.LocalReport.DataSources.Add(source);
+
+                reportViewer.RefreshReport();
+                _logger.LogInformation("Загрузка списка группированных заказов");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка группированных заказов на период");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+
+        private void buttonToPDF_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
+                    {
+                        FileName = dialog.FileName,
+                    });
+                    _logger.LogInformation("Сохранение списка группированных заказов");
+                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка сохранения списка группированных заказов");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+    }
+}

MotorPlant/MotorPlantView/FormReportGroupedOrders.resx

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

MotorPlant/MotorPlantView/FormReportShop.Designer.cs

@@ -0,0 +1,116 @@
+namespace MotorPlantView
+{
+    partial class FormReportShop
+    {
+        /// <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.buttonSaveToExcel = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnPizza = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // buttonSaveToExcel
+            // 
+            this.buttonSaveToExcel.Location = new System.Drawing.Point(0, 6);
+            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+            this.buttonSaveToExcel.Size = new System.Drawing.Size(223, 29);
+            this.buttonSaveToExcel.TabIndex = 3;
+            this.buttonSaveToExcel.Text = "Сохранить в Excel";
+            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.AllowUserToAddRows = false;
+            this.dataGridView.AllowUserToDeleteRows = false;
+            this.dataGridView.AllowUserToOrderColumns = true;
+            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.ColumnShop,
+            this.ColumnPizza,
+            this.ColumnCount});
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.dataGridView.Location = new System.Drawing.Point(0, 47);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(598, 403);
+            this.dataGridView.TabIndex = 2;
+            // 
+            // ColumnShop
+            // 
+            this.ColumnShop.FillWeight = 130F;
+            this.ColumnShop.HeaderText = "Магазин";
+            this.ColumnShop.MinimumWidth = 6;
+            this.ColumnShop.Name = "ColumnShop";
+            this.ColumnShop.ReadOnly = true;
+            // 
+            // ColumnPizza
+            // 
+            this.ColumnPizza.FillWeight = 140F;
+            this.ColumnPizza.HeaderText = "Пицца";
+            this.ColumnPizza.MinimumWidth = 6;
+            this.ColumnPizza.Name = "ColumnPizza";
+            this.ColumnPizza.ReadOnly = true;
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.FillWeight = 90F;
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.MinimumWidth = 6;
+            this.ColumnCount.Name = "ColumnCount";
+            this.ColumnCount.ReadOnly = true;
+            // 
+            // FormReportShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(598, 450);
+            this.Controls.Add(this.buttonSaveToExcel);
+            this.Controls.Add(this.dataGridView);
+            this.Name = "FormReportShop";
+            this.Text = "Наполненость магазинов";
+            this.Load += new System.EventHandler(this.FormReportShop_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Button buttonSaveToExcel;
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn ColumnShop;
+        private DataGridViewTextBoxColumn ColumnPizza;
+        private DataGridViewTextBoxColumn ColumnCount;
+    }
+}

MotorPlant/MotorPlantView/FormReportShop.cs

@@ -0,0 +1,78 @@
+using Microsoft.Extensions.Logging;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorPlantView
+{
+    public partial class FormReportShop : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IReportLogic _logic;
+
+        public FormReportShop(ILogger<FormReportShop> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormReportShop_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                var dict = _logic.GetShops();
+                if (dict != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in dict)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
+                        foreach (var listElem in elem.Engines)
+                        {
+                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+                        }
+                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+                        dataGridView.Rows.Add(Array.Empty<object>());
+                    }
+                }
+                _logger.LogInformation("Загрузка списка пицц по магазинам");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка пицц по магазинам");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveShopsToExcelFile(new ReportBindingModel
+                    {
+                        FileName = dialog.FileName
+                    });
+                    _logger.LogInformation("Сохранение списка пицц по магазинам");
+                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка сохранения списка пицц по магазинам");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+    }
+}

MotorPlant/MotorPlantView/FormReportShop.resx

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

MotorPlant/MotorPlantView/FormSell.cs

@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using MotorPlantDataModels.Models;
 using MotorPlantContracts.BusinessLogicsContracts;
 using MotorPlantContracts.ViewModels;
+using MotorPlantContracts.SearchModels;
 
 namespace MotorPlantView
 {
@@ -73,42 +74,32 @@ namespace MotorPlantView
 
 		private void buttonSave_Click(object sender, EventArgs e)
 		{
-			if (string.IsNullOrEmpty(textBoxCount.Text))
-			{
-				MessageBox.Show("Заполните поле Количество", "Ошибка",
-			   MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
             if (comboBoxEngine.SelectedValue == null)
             {
-				MessageBox.Show("Выберите двигатель", "Ошибка",
+                MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			   MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-
             try
             {
-				int count = Convert.ToInt32(textBoxCount.Text);
+                bool resout = _shopLogic.MakeSell(new SupplySearchModel
-
-				bool res = _shopLogic.MakeSell(
-					_engineLogic.ReadElement(new() { Id = Convert.ToInt32(comboBoxEngine.SelectedValue) }),
-					count
-				);
-
-				if (!res)
                 {
-					throw new Exception("Ошибка при продаже.");
+                    EngineId = Convert.ToInt32(comboBoxEngine.SelectedValue),
-				}
+                    Count = Convert.ToInt32(textBoxCount.Text)
-
+                });
-				MessageBox.Show("Продажа прошла успешно");
+                if (resout)
+                {
+                    MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     DialogResult = DialogResult.OK;
                     Close();
-
                 }
-			catch (Exception err)
+                else
                 {
-				MessageBox.Show("Ошибка продажи");
+                    MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 

MotorPlant/MotorPlantView/FormSupply.cs

@@ -1,4 +1,5 @@
-using MotorPlantContracts.BusinessLogicsContracts;
+using MotorPlantContracts.BindingModels;
+using MotorPlantContracts.BusinessLogicsContracts;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Models;
@@ -85,49 +86,35 @@ namespace MotorPlantView
 
         private void SaveButton_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(CountTextBox.Text))
+            if (ShopComboBox.SelectedValue == null)
             {
-                MessageBox.Show("Заполните поле Количество", "Ошибка",
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             if (EngineComboBox.SelectedValue == null)
             {
-                MessageBox.Show("Выберите двигатель", "Ошибка",
+                MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-            if (ShopComboBox.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
             try
             {
-                int count = Convert.ToInt32(CountTextBox.Text);
+                var operationResult = _shopLogic.MakeSupply(new SupplyBindingModel
-
-                bool res = _shopLogic.MakeSupply(
-                    new ShopSearchModel() { Id = Convert.ToInt32(ShopComboBox.SelectedValue) },
-                    _engineLogic.ReadElement(new() { Id = Convert.ToInt32(EngineComboBox.SelectedValue) }),
-                    count
-                );
-
-                if (!res)
                 {
-                    throw new Exception("Ошибка при пополнении. Дополнительная информация в логах");
+                    ShopId = Convert.ToInt32(ShopComboBox.SelectedValue),
+                    EngineId = Convert.ToInt32(EngineComboBox.SelectedValue),
+                    Count = Convert.ToInt32(CountTextBox.Text)
+                });
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
                 }
-
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                MessageBox.Show("Пополнение прошло успешно");
                 DialogResult = DialogResult.OK;
                 Close();
-
             }
-            catch (Exception er)
+            catch (Exception ex)
             {
-                MessageBox.Show("Ошибка пополнения");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
             }
         }
 

MotorPlant/MotorPlantView/Program.cs

@@ -44,10 +44,13 @@ namespace MotorPlantView
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IEngineStorage, EngineStorage>();
+            services.AddTransient<IShopStorage, ShopStorage>();
+
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IEngineLogic, EngineLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
+            services.AddTransient<IShopLogic, ShopLogic>();
 
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
@@ -59,8 +62,14 @@ namespace MotorPlantView
             services.AddTransient<FormEngine>();
             services.AddTransient<FormEngineComponent>();
             services.AddTransient<FormEngines>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormSupply>();
+            services.AddTransient<FormSell>();
             services.AddTransient<FormReportEngineComponents>();
             services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormReportShop>();
+            services.AddTransient<FormReportGroupedOrders>();
         }
     }
 }

MotorPlant/MotorPlantView/ReportGroupedOrders.rdlc

@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
+  <AutoRefresh>0</AutoRefresh>
+  <DataSources>
+    <DataSource Name="PrecastConcretePlantContractsViewModels">
+      <ConnectionProperties>
+        <DataProvider>System.Data.DataSet</DataProvider>
+        <ConnectString>/* Local Connection */</ConnectString>
+      </ConnectionProperties>
+      <rd:DataSourceID>20791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
+    </DataSource>
+  </DataSources>
+  <DataSets>
+    <DataSet Name="DataSetGroupedOrders">
+      <Query>
+        <DataSourceName>PrecastConcretePlantContractsViewModels</DataSourceName>
+        <CommandText>/* Local Query */</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="Date">
+          <DataField>Date</DataField>
+          <rd:TypeName>System.DateTime</rd:TypeName>
+        </Field>
+        <Field Name="OrdersCount">
+          <DataField>OrdersCount</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="OrdersSum">
+          <DataField>OrdersSum</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
+      </Fields>
+      <rd:DataSetInfo>
+        <rd:DataSetName>PrecastConcretePlantContracts.ViewModels</rd:DataSetName>
+        <rd:TableName>ReportGroupOrdersViewModel</rd:TableName>
+        <rd:ObjectDataSourceType>PrecastConcretePlantContracts.ViewModels.ReportGroupOrdersViewModel, PrecastConcretePlantContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
+      </rd:DataSetInfo>
+    </DataSet>
+  </DataSets>
+  <ReportSections>
+    <ReportSection>
+      <Body>
+        <ReportItems>
+          <Textbox Name="TextboxTitle">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>Отчёт по заказам</Value>
+                    <Style />
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Center</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Height>0.6cm</Height>
+            <Width>16.51cm</Width>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <VerticalAlign>Middle</VerticalAlign>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Textbox Name="ReportParameterPeriod">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
+                    <Style>
+                      <Format>d</Format>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Center</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
+            <Top>0.6cm</Top>
+            <Height>0.6cm</Height>
+            <Width>16.51cm</Width>
+            <ZIndex>1</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Tablix Name="Tablix1">
+            <TablixBody>
+              <TablixColumns>
+                <TablixColumn>
+                  <Width>3.90406cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3.97461cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3.65711cm</Width>
+                </TablixColumn>
+              </TablixColumns>
+              <TablixRows>
+                <TablixRow>
+                  <Height>0.6cm</Height>
+                  <TablixCells>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="TextboxDate">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Дата создания</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="TextboxCount">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Количество заказов</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="TextboxSum">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Общая сумма заказов</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                  </TablixCells>
+                </TablixRow>
+                <TablixRow>
+                  <Height>0.6cm</Height>
+                  <TablixCells>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Date">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!Date.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Date</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="OrdersCount">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!OrdersCount.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>OrdersCount</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="OrdersSum">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!OrdersSum.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>OrdersSum</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                  </TablixCells>
+                </TablixRow>
+              </TablixRows>
+            </TablixBody>
+            <TablixColumnHierarchy>
+              <TablixMembers>
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+              </TablixMembers>
+            </TablixColumnHierarchy>
+            <TablixRowHierarchy>
+              <TablixMembers>
+                <TablixMember>
+                  <KeepWithGroup>After</KeepWithGroup>
+                </TablixMember>
+                <TablixMember>
+                  <Group Name="Подробности" />
+                </TablixMember>
+              </TablixMembers>
+            </TablixRowHierarchy>
+            <DataSetName>DataSetGroupedOrders</DataSetName>
+            <Top>1.88242cm</Top>
+            <Left>2.68676cm</Left>
+            <Height>1.2cm</Height>
+            <Width>11.53578cm</Width>
+            <ZIndex>2</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+            </Style>
+          </Tablix>
+          <Textbox Name="TextboxResout">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>Итого:</Value>
+                    <Style />
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Top>3.29409cm</Top>
+            <Left>8.06542cm</Left>
+            <Height>0.6cm</Height>
+            <Width>2.5cm</Width>
+            <ZIndex>3</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Textbox Name="TextboxFullSum">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=Sum(Fields!OrdersSum.Value, "DataSetGroupedOrders")</Value>
+                    <Style>
+                      <Format>0.00;(0.00)</Format>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Top>3.29409cm</Top>
+            <Left>10.70653cm</Left>
+            <Height>0.6cm</Height>
+            <Width>3.48072cm</Width>
+            <ZIndex>4</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+        </ReportItems>
+        <Height>2in</Height>
+        <Style />
+      </Body>
+      <Width>6.5in</Width>
+      <Page>
+        <PageHeight>29.7cm</PageHeight>
+        <PageWidth>21cm</PageWidth>
+        <LeftMargin>2cm</LeftMargin>
+        <RightMargin>2cm</RightMargin>
+        <TopMargin>2cm</TopMargin>
+        <BottomMargin>2cm</BottomMargin>
+        <ColumnSpacing>0.13cm</ColumnSpacing>
+        <Style />
+      </Page>
+    </ReportSection>
+  </ReportSections>
+  <ReportParameters>
+    <ReportParameter Name="ReportParameterPeriod">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+  </ReportParameters>
+  <ReportParametersLayout>
+    <GridLayoutDefinition>
+      <NumberOfColumns>4</NumberOfColumns>
+      <NumberOfRows>2</NumberOfRows>
+      <CellDefinitions>
+        <CellDefinition>
+          <ColumnIndex>0</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>ReportParameterPeriod</ParameterName>
+        </CellDefinition>
+      </CellDefinitions>
+    </GridLayoutDefinition>
+  </ReportParametersLayout>
+  <rd:ReportUnitType>Cm</rd:ReportUnitType>
+  <rd:ReportID>b5a8ad5e-1151-4687-8576-a5270295c079</rd:ReportID>
+</Report>