From 6e69bc0e5cf48e842c444c051750e2cbddbe5f31 Mon Sep 17 00:00:00 2001 From: "safiulova.k" Date: Wed, 13 Mar 2024 11:16:22 +0400 Subject: [PATCH 1/9] =?UTF-8?q?=D0=BC=D0=B5=D0=B6=D0=B4=D1=83=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8=20=D1=82=D0=B0=D0=B5=D1=82=20=D0=BB=D0=B5?= =?UTF-8?q?=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataListSingleton.cs | 5 + .../AbstractShopListImplement/Shop.cs | 90 +++++++++ .../AbstractShopListImplement/ShopStorage.cs | 147 +++++++++++++++ .../AircraftPlantBusinessLogic/OrderLogic.cs | 52 ------ .../AircraftPlantBusinessLogic/PlaneLogic.cs | 47 ----- .../AircraftPlantBusinessLogic/ShopLogic.cs | 157 ++++++++++++++++ .../BindingModels/ShopBindingModel.cs | 22 +++ .../BusinessLogicsContracts/IShopLogic.cs | 22 +++ .../SearchModels/ShopSearchModel.cs | 14 ++ .../StoragesContracts/IShopStorage.cs | 21 +++ .../ViewModels/ShopViewModel.cs | 26 +++ .../AircraftPlantDataModels/IShopModel.cs | 16 ++ .../AircraftPlantView/FormMain.Designer.cs | 15 +- .../AircraftPlantView/FormShop.Designer.cs | 173 ++++++++++++++++++ AircraftPlant/AircraftPlantView/FormShop.cs | 163 +++++++++++++++++ AircraftPlant/AircraftPlantView/FormShop.resx | 72 ++++++++ .../AircraftPlantView/FormSupply.Designer.cs | 145 +++++++++++++++ AircraftPlant/AircraftPlantView/FormSupply.cs | 145 +++++++++++++++ .../AircraftPlantView/FormSupply.resx | 60 ++++++ 19 files changed, 1290 insertions(+), 102 deletions(-) create mode 100644 AircraftPlant/AbstractShopListImplement/Shop.cs create mode 100644 AircraftPlant/AbstractShopListImplement/ShopStorage.cs create mode 100644 AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/SearchModels/ShopSearchModel.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs create mode 100644 AircraftPlant/AircraftPlantDataModels/IShopModel.cs create mode 100644 AircraftPlant/AircraftPlantView/FormShop.Designer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormShop.cs create mode 100644 AircraftPlant/AircraftPlantView/FormShop.resx create mode 100644 AircraftPlant/AircraftPlantView/FormSupply.Designer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormSupply.cs create mode 100644 AircraftPlant/AircraftPlantView/FormSupply.resx diff --git a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs index 7754b68..d931deb 100644 --- a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs +++ b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs @@ -31,6 +31,10 @@ namespace AircraftPlantListImplement /// Список классов-моделей изделий /// public List Planes { get; set; } + /// + /// Список классов-моделей магазинов + /// + public List Shops { get; set; } /// /// Конструктор @@ -40,6 +44,7 @@ namespace AircraftPlantListImplement Components = new List(); Orders = new List(); Planes = new List(); + Shops = new List(); } /// /// Получить ссылку на класс diff --git a/AircraftPlant/AbstractShopListImplement/Shop.cs b/AircraftPlant/AbstractShopListImplement/Shop.cs new file mode 100644 index 0000000..5e3481e --- /dev/null +++ b/AircraftPlant/AbstractShopListImplement/Shop.cs @@ -0,0 +1,90 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantListImplement.Models +{ + /// + /// Сущность "Магазин" + /// + public class Shop : IShopModel + { + /// + /// Идентификатор + /// + public int Id { get; private set; } + /// + /// Название магазина + /// + public string ShopName { get; private set; } = string.Empty; + /// + /// Адрес магазина + /// + public string Address { get; private set; } = string.Empty; + /// + /// Дата открытия магазина + /// + public DateTime DateOpening { get; private set; } + /// + /// Коллекция изделий в магазине + /// + public Dictionary ShopPlanes + { + get; + private set; + } = new Dictionary(); + /// + /// Создание модели магазина + /// + /// + /// + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpening = model.DateOpening, + ShopPlanes = model.ShopPlanes + }; + } + /// + /// Изменение модели магазина + /// + /// + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + + ShopName = model.ShopName; + Address = model.Address; + DateOpening = model.DateOpening; + ShopPlanes = model.ShopPlanes; + } + /// + /// Получение модели магазина + /// + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + ShopPlanes = ShopPlanes + }; + } +} diff --git a/AircraftPlant/AbstractShopListImplement/ShopStorage.cs b/AircraftPlant/AbstractShopListImplement/ShopStorage.cs new file mode 100644 index 0000000..3d60ed6 --- /dev/null +++ b/AircraftPlant/AbstractShopListImplement/ShopStorage.cs @@ -0,0 +1,147 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.StoragesContracts; +using AircraftPlantContracts.ViewModels; +using AircraftPlantListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantListImplement.Implements +{ + /// + /// Реализация интерфейса хранилища для магазина + /// + public class ShopStorage : IShopStorage + { + /// + /// Хранилище + /// + private readonly DataListSingleton _source; + /// + /// Конструктор + /// + public ShopStorage() + { + _source = DataListSingleton.GetInstance(); + } + /// + /// Получение полного списка + /// + /// + public List GetFullList() + { + var result = new List(); + foreach (var shop in _source.Shops) + { + result.Add(shop.GetViewModel); + } + return result; + } + /// + /// Получение фильтрованного списка + /// + /// + /// + public List GetFilteredList(ShopSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ShopName)) + { + return result; + } + + foreach (var shop in _source.Shops) + { + if (shop.ShopName.Contains(model.ShopName)) + { + result.Add(shop.GetViewModel); + } + } + return result; + } + /// + /// Получение элемента + /// + /// + /// + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + + foreach (var shop in _source.Shops) + { + if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) || (model.Id.HasValue && shop.Id == model.Id)) + { + return shop.GetViewModel; + } + } + return null; + } + /// + /// Добавление элемента + /// + /// + /// + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = 1; + foreach (var shop in _source.Shops) + { + if (model.Id <= shop.Id) + { + model.Id = shop.Id + 1; + } + } + + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + + _source.Shops.Add(newShop); + return newShop.GetViewModel; + } + /// + /// Редактирование элемента + /// + /// + /// + public ShopViewModel? Update(ShopBindingModel model) + { + foreach (var shop in _source.Shops) + { + if (shop.Id == model.Id) + { + shop.Update(model); + return shop.GetViewModel; + } + } + return null; + } + /// + /// Удаление элемента + /// + /// + /// + public ShopViewModel? Delete(ShopBindingModel model) + { + for (int i = 0; i < _source.Shops.Count; ++i) + { + if (_source.Shops[i].Id == model.Id) + { + var element = _source.Shops[i]; + _source.Shops.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} diff --git a/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs index f496482..eb94058 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs @@ -13,36 +13,15 @@ using System.Threading.Tasks; namespace AircraftPlantBusinessLogic.BusinessLogics { - /// - /// Реализация интерфейса бизнес-логики для заказов - /// public class OrderLogic : IOrderLogic { - /// - /// Логгер - /// private readonly ILogger _logger; - - /// - /// Взаимодействие с хранилищем заказов - /// private readonly IOrderStorage _orderStorage; - - /// - /// Конструктор - /// - /// - /// public OrderLogic(ILogger logger, IOrderStorage orderStorage) { _logger = logger; _orderStorage = orderStorage; } - /// - /// Получение списка - /// - /// - /// public List? ReadList(OrderSearchModel? model) { _logger.LogInformation("ReadList. Order.Id:{ Id}", model?.Id); @@ -57,11 +36,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - /// - /// Создание заказа - /// - /// - /// public bool CreateOrder(OrderBindingModel model) { CheckModel(model); @@ -80,38 +54,18 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } return true; } - /// - /// Смена статуса заказа (Выполняется) - /// - /// - /// public bool TakeOrderInWork(OrderBindingModel model) { return StatusUpdate(model, OrderStatus.Выполняется); } - /// - /// Смена статуса заказа (Выдан) - /// - /// - /// public bool FinishOrder(OrderBindingModel model) { return StatusUpdate(model, OrderStatus.Выдан); } - /// - /// Смена статуса заказа (Готов) - /// - /// - /// public bool DeliveryOrder(OrderBindingModel model) { return StatusUpdate(model, OrderStatus.Готов); } - /// - /// Проверка модели заказа - /// - /// - /// private void CheckModel(OrderBindingModel model, bool withParams = true) { if (model == null) @@ -136,12 +90,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } _logger.LogInformation("Order. OrderID:{Id}.Sum:{ Sum}. PlaneId: { PlaneId}", model.Id, model.Sum, model.PlaneId); } - /// - /// Смена статуса заказа - /// - /// - /// - /// private bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) { var element = _orderStorage.GetElement(new OrderSearchModel diff --git a/AircraftPlant/AircraftPlantBusinessLogic/PlaneLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/PlaneLogic.cs index 1ee8908..f322f6e 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/PlaneLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/PlaneLogic.cs @@ -12,36 +12,15 @@ using System.Threading.Tasks; namespace AircraftPlantBusinessLogic.BusinessLogics { - /// - /// Реализация интерфейса бизнес-логики для изделия - /// public class PlaneLogic : IPlaneLogic { - /// - /// Логгер - /// private readonly ILogger _logger; - - /// - /// Взаимодействие с хранилищем изделий - /// private readonly IPlaneStorage _planeStorage; - - /// - /// Конструктор - /// - /// - /// public PlaneLogic(ILogger logger, IPlaneStorage planeStorage) { _logger = logger; _planeStorage = planeStorage; } - /// - /// Получение списка - /// - /// - /// public List? ReadList(PlaneSearchModel? model) { _logger.LogInformation("ReadList. PlaneName:{PlaneName}.Id:{ Id}", model?.PlaneName, model?.Id); @@ -56,12 +35,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - /// - /// Получение отдельной записи - /// - /// - /// - /// public PlaneViewModel? ReadElement(PlaneSearchModel model) { if (model == null) @@ -81,11 +54,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); return element; } - /// - /// Создание записи - /// - /// - /// public bool Create(PlaneBindingModel model) { CheckModel(model); @@ -97,11 +65,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } return true; } - /// - /// Изменение записи - /// - /// - /// public bool Update(PlaneBindingModel model) { CheckModel(model); @@ -113,11 +76,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } return true; } - /// - /// Удаление записи - /// - /// - /// public bool Delete(PlaneBindingModel model) { CheckModel(model, false); @@ -130,11 +88,6 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } return true; } - /// - /// Проверка модели изделия - /// - /// - /// private void CheckModel(PlaneBindingModel model, bool withParams = true) { if (model == null) diff --git a/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs new file mode 100644 index 0000000..f9db95b --- /dev/null +++ b/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs @@ -0,0 +1,157 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.StoragesContracts; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Models; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantBusinessLogic.BusinessLogics +{ + public class ShopLogic : IShopLogic + { + private readonly ILogger _logger; + private readonly IShopStorage _shopStorage; + public ShopLogic(ILogger logger, IShopStorage shopStorage) + { + _logger = logger; + _shopStorage = shopStorage; + } + public List? ReadList(ShopSearchModel? model) + { + _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id); + + var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public ShopViewModel? ReadElement(ShopSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); + + var element = _shopStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + public bool Create(ShopBindingModel model) + { + CheckModel(model); + + if (_shopStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(ShopBindingModel model) + { + CheckModel(model); + + if (_shopStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(ShopBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + + if (_shopStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + public bool AddPlaneInShop(ShopSearchModel model, IPlaneModel plane, int count) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (count <= 0) + { + throw new ArgumentException("Кол-во изделий должно быть больше 0", nameof(count)); + } + _logger.LogInformation("AddPlaneInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); + var element = _shopStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("AddPlaneInShop element not found"); + return false; + } + _logger.LogInformation("AddPlaneInShop find. Id:{Id}", element.Id); + + if (element.ShopPlanes.TryGetValue(plane.Id, out var pair)) + { + element.ShopPlanes[plane.Id] = (plane, count + pair.Item2); + _logger.LogInformation("AddPlaneInShop. Added {count} {plane} to '{ShopName}' shop", count, plane.PlaneName, element.ShopName); + } + else + { + element.ShopPlanes[plane.Id] = (plane, count); + _logger.LogInformation("AddPlaneInShop. Added {count} new plane {plane} to '{ShopName}' shop", count, plane.PlaneName, element.ShopName); + } + + _shopStorage.Update(new() + { + Id = element.Id, + Address = element.Address, + ShopName = element.ShopName, + DateOpening = element.DateOpening, + ShopPlanes = element.ShopPlanes + }); + return true; + } + private void CheckModel(ShopBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ShopName)) + { + throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName)); + } + _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{ Address}. Id:{ Id}", model.ShopName, model.Address, model.Id); + var element = _shopStorage.GetElement(new ShopSearchModel + { + ShopName = model.ShopName + }); + if (element != null && element.Id != model.Id && element.ShopName == model.ShopName) + { + throw new InvalidOperationException("Магазин с таким названием уже есть"); + } + } + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs b/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..f371e22 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs @@ -0,0 +1,22 @@ +using AircraftPlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.BindingModels +{ + public class ShopBindingModel : IShopModel + { + public int Id { get; set; } + public string ShopName { get; set; } = string.Empty; + public string Address { get; set; } = string.Empty; + public DateTime DateOpening { get; set; } = DateTime.Now; + public Dictionary ShopPlanes + { + get; + set; + } = new(); + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs new file mode 100644 index 0000000..3c8ce2b --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs @@ -0,0 +1,22 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantDataModels.Models; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.BusinessLogicsContracts +{ + public interface IShopLogic + { + List? ReadList(ShopSearchModel? model); + ShopViewModel? ReadElement(ShopSearchModel model); + bool Create(ShopBindingModel model); + bool Update(ShopBindingModel model); + bool Delete(ShopBindingModel model); + bool AddPlaneInShop(ShopSearchModel model, IPlaneModel plane, int count); + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/SearchModels/ShopSearchModel.cs b/AircraftPlant/AircraftPlantContracts»/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..836093b --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/SearchModels/ShopSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + public string? ShopName { get; set; } + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs b/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..47b0af4 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs @@ -0,0 +1,21 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.StoragesContracts +{ + public interface IShopStorage + { + List GetFullList(); + List GetFilteredList(ShopSearchModel model); + ShopViewModel? GetElement(ShopSearchModel model); + ShopViewModel? Insert(ShopBindingModel model); + ShopViewModel? Update(ShopBindingModel model); + ShopViewModel? Delete(ShopBindingModel model); + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs b/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..b65d879 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs @@ -0,0 +1,26 @@ +using AircraftPlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.ViewModels +{ + public class ShopViewModel : IShopModel + { + public int Id { get; set; } + [DisplayName("Название магазина")] + public string ShopName { get; set; } = string.Empty; + [DisplayName("Адрес магазина")] + public string Address { get; set; } = string.Empty; + [DisplayName("Дата открытия")] + public DateTime DateOpening { get; set; } = DateTime.Now; + public Dictionary ShopPlanes + { + get; + set; + } = new(); + } +} diff --git a/AircraftPlant/AircraftPlantDataModels/IShopModel.cs b/AircraftPlant/AircraftPlantDataModels/IShopModel.cs new file mode 100644 index 0000000..43e1362 --- /dev/null +++ b/AircraftPlant/AircraftPlantDataModels/IShopModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantDataModels.Models +{ + public interface IShopModel : IId + { + string ShopName { get; } + string Address { get; } + DateTime DateOpening { get; } + Dictionary ShopPlanes { get; } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs index 5fec25f..e9b4f04 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs @@ -38,6 +38,7 @@ this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -124,7 +125,8 @@ // this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.компонентыToolStripMenuItem, - this.изделияToolStripMenuItem}); + this.изделияToolStripMenuItem, + this.магазиныToolStripMenuItem}); this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20); this.справочникиToolStripMenuItem.Text = "Справочники"; @@ -132,17 +134,23 @@ // компонентыToolStripMenuItem // this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.компонентыToolStripMenuItem.Text = "Компоненты"; this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); // // изделияToolStripMenuItem // this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - this.изделияToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.изделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.изделияToolStripMenuItem.Text = "Изделия"; this.изделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); // + // магазиныToolStripMenuItem + // + this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.магазиныToolStripMenuItem.Text = "Магазины"; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -179,5 +187,6 @@ private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem изделияToolStripMenuItem; + private ToolStripMenuItem магазиныToolStripMenuItem; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShop.Designer.cs b/AircraftPlant/AircraftPlantView/FormShop.Designer.cs new file mode 100644 index 0000000..d741c4d --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormShop.Designer.cs @@ -0,0 +1,173 @@ +namespace AircraftPlantView +{ + partial class FormShop + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.textBoxAddress = new System.Windows.Forms.TextBox(); + this.dateTimePicker = new System.Windows.Forms.DateTimePicker(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.Plane = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(62, 15); + this.label1.TabIndex = 0; + this.label1.Text = "Название:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 39); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(43, 15); + this.label2.TabIndex = 1; + this.label2.Text = "Адрес:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(12, 74); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(90, 15); + this.label3.TabIndex = 2; + this.label3.Text = "Дата открытия:"; + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(116, 6); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(200, 23); + this.textBoxName.TabIndex = 3; + // + // textBoxAddress + // + this.textBoxAddress.Location = new System.Drawing.Point(116, 39); + this.textBoxAddress.Name = "textBoxAddress"; + this.textBoxAddress.Size = new System.Drawing.Size(200, 23); + this.textBoxAddress.TabIndex = 4; + // + // dateTimePicker + // + this.dateTimePicker.Location = new System.Drawing.Point(116, 74); + this.dateTimePicker.Name = "dateTimePicker"; + this.dateTimePicker.Size = new System.Drawing.Size(200, 23); + this.dateTimePicker.TabIndex = 5; + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Plane, + this.Count}); + this.dataGridView.Location = new System.Drawing.Point(26, 118); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(446, 325); + this.dataGridView.TabIndex = 6; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(316, 444); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 7; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(397, 444); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 8; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // Plane + // + this.Plane.HeaderText = "Изделие"; + this.Plane.Name = "Plane"; + this.Plane.Width = 300; + // + // Count + // + this.Count.HeaderText = "Количество"; + this.Count.Name = "Count"; + // + // FormShop + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(481, 470); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.dateTimePicker); + this.Controls.Add(this.textBoxAddress); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "FormShop"; + this.Text = "Магазин"; + this.Load += new System.EventHandler(this.FormShop_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label label1; + private Label label2; + private Label label3; + private TextBox textBoxName; + private TextBox textBoxAddress; + private DateTimePicker dateTimePicker; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn Plane; + private DataGridViewTextBoxColumn Count; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShop.cs b/AircraftPlant/AircraftPlantView/FormShop.cs new file mode 100644 index 0000000..0c74932 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormShop.cs @@ -0,0 +1,163 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts.SearchModels; +using AircraftPlantDataModels.Models; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AircraftPlantView +{ + /// + /// Форма для магазина + /// + public partial class FormShop : Form + { + /// + /// Логгер + /// + private readonly ILogger _logger; + /// + /// Бизнес-логика для магазинов + /// + private readonly IShopLogic _logic; + /// + /// Идентификатор + /// + private int? _id; + public int Id { set { _id = value; } } + /// + /// Список изделий в магазине + /// + private Dictionary _shopPlanes; + /// + /// Конструктор + /// + /// + /// + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _shopPlanes = new Dictionary(); + } + /// + /// Загрузка списка изделий в магазине + /// + /// + /// + private void FormShop_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка магазина"); + try + { + var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value }); + if (view != null) + { + textBoxName.Text = view.ShopName; + textBoxAddress.Text = view.Address; + dateTimePicker.Text = view.DateOpening.ToString(); + _shopPlanes = view.ShopPlanes ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + /// + /// Кнопка "Сохранить" + /// + /// + /// + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxAddress.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAddress.Text, + DateOpening = dateTimePicker.Value.Date, + ShopPlanes = _shopPlanes + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// + /// Кнопка "Отмена" + /// + /// + /// + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + /// + /// Метод загрузки изделий магазина + /// + private void LoadData() + { + _logger.LogInformation("Загрузка изделий магазина"); + try + { + if (_shopPlanes != null) + { + dataGridView.Rows.Clear(); + foreach (var elem in _shopPlanes) + { + dataGridView.Rows.Add(new object[] + { + elem.Key, + elem.Value.Item1.PlaneName, + elem.Value.Item2 + }); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделий магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormShop.resx b/AircraftPlant/AircraftPlantView/FormShop.resx new file mode 100644 index 0000000..05b9989 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormShop.resx @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormSupply.Designer.cs b/AircraftPlant/AircraftPlantView/FormSupply.Designer.cs new file mode 100644 index 0000000..c24306a --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormSupply.Designer.cs @@ -0,0 +1,145 @@ +namespace AircraftPlantView +{ + partial class FormSupply + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.labelShop = new System.Windows.Forms.Label(); + this.labelPlane = new System.Windows.Forms.Label(); + this.labelCount = new System.Windows.Forms.Label(); + this.comboBoxShop = new System.Windows.Forms.ComboBox(); + this.comboBoxPlane = new System.Windows.Forms.ComboBox(); + this.numericUpDownCount = new System.Windows.Forms.NumericUpDown(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit(); + this.SuspendLayout(); + // + // labelShop + // + this.labelShop.AutoSize = true; + this.labelShop.Location = new System.Drawing.Point(12, 9); + this.labelShop.Name = "labelShop"; + this.labelShop.Size = new System.Drawing.Size(57, 15); + this.labelShop.TabIndex = 0; + this.labelShop.Text = "Магазин:"; + // + // labelPlane + // + this.labelPlane.AutoSize = true; + this.labelPlane.Location = new System.Drawing.Point(12, 44); + this.labelPlane.Name = "labelPlane"; + this.labelPlane.Size = new System.Drawing.Size(56, 15); + this.labelPlane.TabIndex = 1; + this.labelPlane.Text = "Изделие:"; + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(12, 81); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(75, 15); + this.labelCount.TabIndex = 2; + this.labelCount.Text = "Количество:"; + // + // comboBoxShop + // + this.comboBoxShop.FormattingEnabled = true; + this.comboBoxShop.Location = new System.Drawing.Point(97, 9); + this.comboBoxShop.Name = "comboBoxShop"; + this.comboBoxShop.Size = new System.Drawing.Size(229, 23); + this.comboBoxShop.TabIndex = 3; + // + // comboBoxPlane + // + this.comboBoxPlane.FormattingEnabled = true; + this.comboBoxPlane.Location = new System.Drawing.Point(97, 44); + this.comboBoxPlane.Name = "comboBoxPlane"; + this.comboBoxPlane.Size = new System.Drawing.Size(229, 23); + this.comboBoxPlane.TabIndex = 4; + // + // numericUpDownCount + // + this.numericUpDownCount.Location = new System.Drawing.Point(98, 79); + this.numericUpDownCount.Name = "numericUpDownCount"; + this.numericUpDownCount.Size = new System.Drawing.Size(228, 23); + this.numericUpDownCount.TabIndex = 5; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(170, 108); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 6; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(251, 108); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // FormSupply + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(341, 140); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.numericUpDownCount); + this.Controls.Add(this.comboBoxPlane); + this.Controls.Add(this.comboBoxShop); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.labelPlane); + this.Controls.Add(this.labelShop); + this.Name = "FormSupply"; + this.Text = "Поступление"; + this.Load += new System.EventHandler(this.FormSupply_Load); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelShop; + private Label labelPlane; + private Label labelCount; + private ComboBox comboBoxShop; + private ComboBox comboBoxPlane; + private NumericUpDown numericUpDownCount; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormSupply.cs b/AircraftPlant/AircraftPlantView/FormSupply.cs new file mode 100644 index 0000000..069f9c8 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormSupply.cs @@ -0,0 +1,145 @@ +using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts.SearchModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AircraftPlantView +{ + public partial class FormSupply : Form + { + private readonly ILogger _logger; + /// + /// Бизнес-логика для магазина + /// + private readonly IShopLogic _logicS; + /// + /// Бизнес-логика для изделий + /// + private readonly IPlaneLogic _logicP; + /// + /// Конструктор + /// + /// + /// + /// + public FormSupply(ILogger logger, IShopLogic logicS, IPlaneLogic logicP) + { + InitializeComponent(); + _logger = logger; + _logicS = logicS; + _logicP = logicP; + } + /// + /// Загрузка списиков магазинов и изделий + /// + /// + /// + private void FormSupply_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка магазинов"); + try + { + var listShops = _logicS.ReadList(null); + if (listShops != null) + { + comboBoxShop.DisplayMember = "ShopName"; + comboBoxShop.ValueMember = "Id"; + comboBoxShop.DataSource = listShops; + comboBoxShop.SelectedItem = null; + } + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + _logger.LogInformation("Загрузка изделий"); + try + { + var listPlanes = _logicP.ReadList(null); + if (listPlanes != null) + { + comboBoxPlane.DisplayMember = "PlaneName"; + comboBoxPlane.ValueMember = "Id"; + comboBoxPlane.DataSource = listPlanes; + comboBoxPlane.SelectedItem = null; + } + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// + /// Кнопка "Сохранить" + /// + /// + /// + private void buttonSave_Click(object sender, EventArgs e) + { + if (comboBoxShop.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxPlane.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Добавление изделия в магазин"); + try + { + var plane = _logicP.ReadElement(new() + { + Id = (int)comboBoxPlane.SelectedValue + }); + if (plane == null) + { + throw new Exception("Не найдено изделие. Дополнительная информация в логах."); + } + var resultOperation = _logicS.AddPlaneInShop( + new ShopSearchModel + { + Id = (int)comboBoxShop.SelectedValue + }, + plane, + (int)numericUpDownCount.Value + ); + if (!resultOperation) + { + throw new Exception("Ошибка при добавлении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка добавления поступления"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + /// + /// Кнопка "Отмена" + /// + /// + /// + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormSupply.resx b/AircraftPlant/AircraftPlantView/FormSupply.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormSupply.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file From 48a39a209f96eb80724874d705712ac14b18ae1d Mon Sep 17 00:00:00 2001 From: "safiulova.k" Date: Sun, 24 Mar 2024 22:42:16 +0400 Subject: [PATCH 2/9] =?UTF-8?q?=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AircraftPlantView/FormMain.Designer.cs | 14 ++ AircraftPlant/AircraftPlantView/FormMain.cs | 26 ++++ .../AircraftPlantView/FormShops.Designer.cs | 114 ++++++++++++++ AircraftPlant/AircraftPlantView/FormShops.cs | 145 ++++++++++++++++++ .../AircraftPlantView/FormShops.resx | 60 ++++++++ 5 files changed, 359 insertions(+) create mode 100644 AircraftPlant/AircraftPlantView/FormShops.Designer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormShops.cs create mode 100644 AircraftPlant/AircraftPlantView/FormShops.resx diff --git a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs index e9b4f04..4eead6e 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs @@ -39,6 +39,7 @@ this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.buttonAddPlane = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -150,12 +151,24 @@ this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.магазиныToolStripMenuItem.Text = "Магазины"; + this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.МагазиныToolStripMenuItem_Click); + // + // buttonAddPlane + // + this.buttonAddPlane.Location = new System.Drawing.Point(811, 280); + this.buttonAddPlane.Name = "buttonAddPlane"; + this.buttonAddPlane.Size = new System.Drawing.Size(146, 23); + this.buttonAddPlane.TabIndex = 7; + this.buttonAddPlane.Text = "Пополнение магазина"; + this.buttonAddPlane.UseVisualStyleBackColor = true; + this.buttonAddPlane.Click += new System.EventHandler(this.buttonAddPlane_Click); // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(977, 401); + this.Controls.Add(this.buttonAddPlane); this.Controls.Add(this.ButtonRef); this.Controls.Add(this.ButtonIssuedOrder); this.Controls.Add(this.ButtonOrderReady); @@ -188,5 +201,6 @@ private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem изделияToolStripMenuItem; private ToolStripMenuItem магазиныToolStripMenuItem; + private Button buttonAddPlane; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormMain.cs b/AircraftPlant/AircraftPlantView/FormMain.cs index ce50e8d..e9df26c 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.cs @@ -74,6 +74,19 @@ namespace AircraftPlantView } } /// + /// Показать список всех магазинов + /// + /// + /// + private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) + { + form.ShowDialog(); + } + } + /// /// Кнопка "Создать заказ" /// /// @@ -201,5 +214,18 @@ namespace AircraftPlantView MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + /// + /// Кнопка "Пополнение магазина" + /// + /// + /// + private void buttonAddPlane_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSupply)); + if (service is FormSupply form) + { + form.ShowDialog(); + } + } } } diff --git a/AircraftPlant/AircraftPlantView/FormShops.Designer.cs b/AircraftPlant/AircraftPlantView/FormShops.Designer.cs new file mode 100644 index 0000000..c6c86a2 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormShops.Designer.cs @@ -0,0 +1,114 @@ +namespace AircraftPlantView +{ + partial class FormShops + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonUpdate = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(495, 449); + this.dataGridView.TabIndex = 0; + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(524, 22); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(524, 71); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(75, 23); + this.buttonUpdate.TabIndex = 2; + this.buttonUpdate.Text = "Изменить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(524, 123); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(75, 23); + this.buttonDelete.TabIndex = 3; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); + // + // buttonRefresh + // + this.buttonRefresh.Location = new System.Drawing.Point(524, 174); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(75, 23); + this.buttonRefresh.TabIndex = 4; + this.buttonRefresh.Text = "Обновить"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click); + // + // FormShops + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(624, 450); + this.Controls.Add(this.buttonRefresh); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.buttonUpdate); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormShops"; + this.Text = "Магазины"; + this.Load += new System.EventHandler(this.FormShops_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonUpdate; + private Button buttonDelete; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShops.cs b/AircraftPlant/AircraftPlantView/FormShops.cs new file mode 100644 index 0000000..c14f592 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormShops.cs @@ -0,0 +1,145 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AircraftPlantView +{ + /// + /// Форма для вывода всех магазинов + /// + public partial class FormShops : Form + { + /// + /// Логгер + /// + private readonly ILogger _logger; + /// + /// Бизнес-логика для магазина + /// + private readonly IShopLogic _logic; + /// + /// Конструктор + /// + public FormShops(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + /// + /// Загрузка списка магазинов + /// + /// + /// + private void FormShops_Load(object sender, EventArgs e) + { + LoadData(); + } + /// + /// Кнопка "Добавить" + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (service is FormShop form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + /// + /// Кнопка "Изменить" + /// + /// + /// + private void buttonUpdate_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (service is FormShop form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + /// + /// Кнопка "Удалить" + /// + /// + /// + private void buttonDelete_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление магазина"); + try + { + if (!_logic.Delete(new ShopBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + /// + /// Кнопка "Обновить" + /// + /// + /// + private void buttonRefresh_Click(object sender, EventArgs e) + { + LoadData(); + } + /// + /// Метод загрузки списка магазинов + /// + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ShopPlanes"].Visible = false; + } + _logger.LogInformation("Загрузка магазинов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormShops.resx b/AircraftPlant/AircraftPlantView/FormShops.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormShops.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file From 9ce4882940b1d7903db5067a7b22a633189f0929 Mon Sep 17 00:00:00 2001 From: "safiulova.k" Date: Mon, 25 Mar 2024 20:50:34 +0400 Subject: [PATCH 3/9] =?UTF-8?q?=D0=BC=D0=B5=D0=B6=D0=B4=D1=83=D0=BD=D0=B0?= =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=BD=D1=8B=D0=B9=20=D0=B4=D0=B5=D0=BD=D1=8C?= =?UTF-8?q?=20=D0=B2=D0=B0=D1=84=D0=B5=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AircraftPlantView/FormShop.Designer.cs | 116 ++++++++++-------- AircraftPlant/AircraftPlantView/FormShop.cs | 4 +- AircraftPlant/AircraftPlantView/FormShop.resx | 9 +- .../AircraftPlantView/FormShops.Designer.cs | 23 ++-- AircraftPlant/AircraftPlantView/FormShops.cs | 16 +-- AircraftPlant/AircraftPlantView/Program.cs | 5 + 6 files changed, 96 insertions(+), 77 deletions(-) diff --git a/AircraftPlant/AircraftPlantView/FormShop.Designer.cs b/AircraftPlant/AircraftPlantView/FormShop.Designer.cs index d741c4d..10c183e 100644 --- a/AircraftPlant/AircraftPlantView/FormShop.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormShop.Designer.cs @@ -28,46 +28,47 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.labelName = new System.Windows.Forms.Label(); + this.labelAddress = new System.Windows.Forms.Label(); + this.labelDate = new System.Windows.Forms.Label(); this.textBoxName = new System.Windows.Forms.TextBox(); this.textBoxAddress = new System.Windows.Forms.TextBox(); this.dateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.dataGridView = new System.Windows.Forms.DataGridView(); + this.dataGridViewShop = new System.Windows.Forms.DataGridView(); this.buttonSave = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); - this.Plane = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnPlane = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).BeginInit(); this.SuspendLayout(); // - // label1 + // labelName // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 9); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 15); - this.label1.TabIndex = 0; - this.label1.Text = "Название:"; + this.labelName.AutoSize = true; + this.labelName.Location = new System.Drawing.Point(12, 9); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(62, 15); + this.labelName.TabIndex = 0; + this.labelName.Text = "Название:"; // - // label2 + // labelAddress // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 39); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(43, 15); - this.label2.TabIndex = 1; - this.label2.Text = "Адрес:"; + this.labelAddress.AutoSize = true; + this.labelAddress.Location = new System.Drawing.Point(12, 39); + this.labelAddress.Name = "labelAddress"; + this.labelAddress.Size = new System.Drawing.Size(43, 15); + this.labelAddress.TabIndex = 1; + this.labelAddress.Text = "Адрес:"; // - // label3 + // labelDate // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 74); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(90, 15); - this.label3.TabIndex = 2; - this.label3.Text = "Дата открытия:"; + this.labelDate.AutoSize = true; + this.labelDate.Location = new System.Drawing.Point(12, 74); + this.labelDate.Name = "labelDate"; + this.labelDate.Size = new System.Drawing.Size(90, 15); + this.labelDate.TabIndex = 2; + this.labelDate.Text = "Дата открытия:"; // // textBoxName // @@ -90,17 +91,18 @@ this.dateTimePicker.Size = new System.Drawing.Size(200, 23); this.dateTimePicker.TabIndex = 5; // - // dataGridView + // dataGridViewShop // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Plane, - this.Count}); - this.dataGridView.Location = new System.Drawing.Point(26, 118); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(446, 325); - this.dataGridView.TabIndex = 6; + this.dataGridViewShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ColumnID, + this.ColumnPlane, + this.ColumnCount}); + this.dataGridViewShop.Location = new System.Drawing.Point(26, 118); + this.dataGridViewShop.Name = "dataGridViewShop"; + this.dataGridViewShop.RowTemplate.Height = 25; + this.dataGridViewShop.Size = new System.Drawing.Size(446, 325); + this.dataGridViewShop.TabIndex = 6; // // buttonSave // @@ -122,16 +124,22 @@ this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // - // Plane + // ColumnID // - this.Plane.HeaderText = "Изделие"; - this.Plane.Name = "Plane"; - this.Plane.Width = 300; + this.ColumnID.HeaderText = "ID"; + this.ColumnID.Name = "ColumnID"; + this.ColumnID.Visible = false; // - // Count + // ColumnPlane // - this.Count.HeaderText = "Количество"; - this.Count.Name = "Count"; + this.ColumnPlane.HeaderText = "Изделие"; + this.ColumnPlane.Name = "ColumnPlane"; + this.ColumnPlane.Width = 300; + // + // ColumnCount + // + this.ColumnCount.HeaderText = "Количество"; + this.ColumnCount.Name = "ColumnCount"; // // FormShop // @@ -140,17 +148,17 @@ this.ClientSize = new System.Drawing.Size(481, 470); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); - this.Controls.Add(this.dataGridView); + this.Controls.Add(this.dataGridViewShop); this.Controls.Add(this.dateTimePicker); this.Controls.Add(this.textBoxAddress); this.Controls.Add(this.textBoxName); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); + this.Controls.Add(this.labelDate); + this.Controls.Add(this.labelAddress); + this.Controls.Add(this.labelName); this.Name = "FormShop"; this.Text = "Магазин"; this.Load += new System.EventHandler(this.FormShop_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -169,5 +177,13 @@ private DataGridViewTextBoxColumn Count; private Button buttonSave; private Button buttonCancel; + private Label labelName; + private Label labelAddress; + private Label labelDate; + private DataGridView dataGridViewShops; + private DataGridViewTextBoxColumn ColumnID; + private DataGridViewTextBoxColumn ColumnPlane; + private DataGridViewTextBoxColumn ColumnCount; + private DataGridView dataGridViewShop; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShop.cs b/AircraftPlant/AircraftPlantView/FormShop.cs index 0c74932..888ed05 100644 --- a/AircraftPlant/AircraftPlantView/FormShop.cs +++ b/AircraftPlant/AircraftPlantView/FormShop.cs @@ -141,10 +141,10 @@ namespace AircraftPlantView { if (_shopPlanes != null) { - dataGridView.Rows.Clear(); + dataGridViewShop.Rows.Clear(); foreach (var elem in _shopPlanes) { - dataGridView.Rows.Add(new object[] + dataGridViewShop.Rows.Add(new object[] { elem.Key, elem.Value.Item1.PlaneName, diff --git a/AircraftPlant/AircraftPlantView/FormShop.resx b/AircraftPlant/AircraftPlantView/FormShop.resx index 05b9989..4ff2619 100644 --- a/AircraftPlant/AircraftPlantView/FormShop.resx +++ b/AircraftPlant/AircraftPlantView/FormShop.resx @@ -57,16 +57,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - - True - - + True \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShops.Designer.cs b/AircraftPlant/AircraftPlantView/FormShops.Designer.cs index c6c86a2..2083ddb 100644 --- a/AircraftPlant/AircraftPlantView/FormShops.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormShops.Designer.cs @@ -28,22 +28,22 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); + this.dataGridViewShops = new System.Windows.Forms.DataGridView(); this.buttonAdd = new System.Windows.Forms.Button(); this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonDelete = new System.Windows.Forms.Button(); this.buttonRefresh = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShops)).BeginInit(); this.SuspendLayout(); // - // dataGridView + // dataGridViewShops // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(0, 0); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(495, 449); - this.dataGridView.TabIndex = 0; + this.dataGridViewShops.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewShops.Location = new System.Drawing.Point(0, 0); + this.dataGridViewShops.Name = "dataGridViewShops"; + this.dataGridViewShops.RowTemplate.Height = 25; + this.dataGridViewShops.Size = new System.Drawing.Size(495, 449); + this.dataGridViewShops.TabIndex = 0; // // buttonAdd // @@ -94,11 +94,11 @@ this.Controls.Add(this.buttonDelete); this.Controls.Add(this.buttonUpdate); this.Controls.Add(this.buttonAdd); - this.Controls.Add(this.dataGridView); + this.Controls.Add(this.dataGridViewShops); this.Name = "FormShops"; this.Text = "Магазины"; this.Load += new System.EventHandler(this.FormShops_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShops)).EndInit(); this.ResumeLayout(false); } @@ -110,5 +110,6 @@ private Button buttonUpdate; private Button buttonDelete; private Button buttonRefresh; + private DataGridView dataGridViewShops; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShops.cs b/AircraftPlant/AircraftPlantView/FormShops.cs index c14f592..7150b27 100644 --- a/AircraftPlant/AircraftPlantView/FormShops.cs +++ b/AircraftPlant/AircraftPlantView/FormShops.cs @@ -67,12 +67,12 @@ namespace AircraftPlantView /// private void buttonUpdate_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) + if (dataGridViewShops.SelectedRows.Count == 1) { var service = Program.ServiceProvider?.GetService(typeof(FormShop)); if (service is FormShop form) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + form.Id = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); @@ -87,11 +87,11 @@ namespace AircraftPlantView /// private void buttonDelete_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) + if (dataGridViewShops.SelectedRows.Count == 1) { if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + int id = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); _logger.LogInformation("Удаление магазина"); try { @@ -128,10 +128,10 @@ namespace AircraftPlantView var list = _logic.ReadList(null); if (list != null) { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ShopPlanes"].Visible = false; + dataGridViewShops.DataSource = list; + dataGridViewShops.Columns["Id"].Visible = false; + dataGridViewShops.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridViewShops.Columns["ShopPlanes"].Visible = false; } _logger.LogInformation("Загрузка магазинов"); } diff --git a/AircraftPlant/AircraftPlantView/Program.cs b/AircraftPlant/AircraftPlantView/Program.cs index 90280e1..ed671cc 100644 --- a/AircraftPlant/AircraftPlantView/Program.cs +++ b/AircraftPlant/AircraftPlantView/Program.cs @@ -49,10 +49,12 @@ namespace AircraftPlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -61,6 +63,9 @@ namespace AircraftPlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file From 6d9cbb11db21a977b3610f36b553f7469c5e4594 Mon Sep 17 00:00:00 2001 From: "safiulova.k" Date: Wed, 27 Mar 2024 10:52:00 +0400 Subject: [PATCH 4/9] =?UTF-8?q?1=D1=83=D1=81=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AircraftPlant/AircraftPlantView/FormSupply.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AircraftPlant/AircraftPlantView/FormSupply.cs b/AircraftPlant/AircraftPlantView/FormSupply.cs index 069f9c8..cdb14c7 100644 --- a/AircraftPlant/AircraftPlantView/FormSupply.cs +++ b/AircraftPlant/AircraftPlantView/FormSupply.cs @@ -38,7 +38,7 @@ namespace AircraftPlantView _logicP = logicP; } /// - /// Загрузка списиков магазинов и изделий + /// Загрузка списков магазинов и изделий /// /// /// From 13462601c5247da276ec7c788a02317aefd7d5e6 Mon Sep 17 00:00:00 2001 From: kamilia Date: Sat, 6 Apr 2024 23:27:31 +0400 Subject: [PATCH 5/9] hard2 --- AircraftPlant/AircraftPlantView/FormMain.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AircraftPlant/AircraftPlantView/FormMain.cs b/AircraftPlant/AircraftPlantView/FormMain.cs index ce50e8d..64a01f8 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.cs @@ -202,4 +202,4 @@ namespace AircraftPlantView } } } -} +} \ No newline at end of file From cffa0b1ef6eba447726607b4a4d73b9d7694e02b Mon Sep 17 00:00:00 2001 From: kamilia Date: Wed, 24 Apr 2024 08:40:12 +0400 Subject: [PATCH 6/9] =?UTF-8?q?=D1=8D=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs index eb94058..2ebbd1c 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs @@ -17,10 +17,16 @@ namespace AircraftPlantBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + private IShopStorage _shopStorage; + private IShopLogic _shopLogic; + private IPlaneStorage _planeStorage; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage, IShopLogic shopLogic, IPlaneStorage planeStorage) { _logger = logger; _orderStorage = orderStorage; + _shopStorage = shopStorage; + _shopLogic = shopLogic; + _planeStorage = planeStorage; } public List? ReadList(OrderSearchModel? model) { From 8eb42276e91e32c07447766b3e5301e03bf23af4 Mon Sep 17 00:00:00 2001 From: kamilia Date: Sun, 5 May 2024 14:10:57 +0400 Subject: [PATCH 7/9] =?UTF-8?q?=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=BD=D0=B0=D0=BA=D0=BE=D0=BB=D1=83=D0=BF=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataListSingleton.cs | 4 + .../AbstractShopListImplement/Shop.cs | 9 +- .../AbstractShopListImplement/ShopStorage.cs | 23 +++ .../AircraftPlantBusinessLogic/OrderLogic.cs | 83 +++++++++++ .../AircraftPlantBusinessLogic/ShopLogic.cs | 19 +++ .../BindingModels/ShopBindingModel.cs | 1 + .../BusinessLogicsContracts/IShopLogic.cs | 1 + .../StoragesContracts/IShopStorage.cs | 3 + .../ViewModels/ShopViewModel.cs | 2 + .../AircraftPlantDataModels/IShopModel.cs | 1 + .../DataFileSingleton.cs | 5 + .../OrderStorage.cs | 19 ++- .../AircraftPlantFileImplement/Shop.cs | 102 +++++++++++++ .../AircraftPlantFileImplement/ShopStorage.cs | 138 ++++++++++++++++++ 14 files changed, 406 insertions(+), 4 deletions(-) create mode 100644 AircraftPlant/AircraftPlantFileImplement/Shop.cs create mode 100644 AircraftPlant/AircraftPlantFileImplement/ShopStorage.cs diff --git a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs index d931deb..3316230 100644 --- a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs +++ b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs @@ -35,6 +35,10 @@ namespace AircraftPlantListImplement /// Список классов-моделей магазинов /// public List Shops { get; set; } + /// + /// Список классов-моделей магазинов + /// + public List Shops { get; set; } /// /// Конструктор diff --git a/AircraftPlant/AbstractShopListImplement/Shop.cs b/AircraftPlant/AbstractShopListImplement/Shop.cs index 5e3481e..1287c01 100644 --- a/AircraftPlant/AbstractShopListImplement/Shop.cs +++ b/AircraftPlant/AbstractShopListImplement/Shop.cs @@ -39,6 +39,10 @@ namespace AircraftPlantListImplement.Models private set; } = new Dictionary(); /// + /// Максимальное количество изделий + /// + public int MaxPlanes { get; private set; } + /// /// Создание модели магазина /// /// @@ -57,6 +61,7 @@ namespace AircraftPlantListImplement.Models Address = model.Address, DateOpening = model.DateOpening, ShopPlanes = model.ShopPlanes + MaxPlanes = model.MaxPlanes }; } /// @@ -74,6 +79,7 @@ namespace AircraftPlantListImplement.Models Address = model.Address; DateOpening = model.DateOpening; ShopPlanes = model.ShopPlanes; + MaxPlanes = model.MaxPlanes; } /// /// Получение модели магазина @@ -84,7 +90,8 @@ namespace AircraftPlantListImplement.Models ShopName = ShopName, Address = Address, DateOpening = DateOpening, - ShopPlanes = ShopPlanes + ShopPlanes = ShopPlanes, + MaxPlanes = MaxPlanes }; } } diff --git a/AircraftPlant/AbstractShopListImplement/ShopStorage.cs b/AircraftPlant/AbstractShopListImplement/ShopStorage.cs index 3d60ed6..bde12c1 100644 --- a/AircraftPlant/AbstractShopListImplement/ShopStorage.cs +++ b/AircraftPlant/AbstractShopListImplement/ShopStorage.cs @@ -2,6 +2,7 @@ using AircraftPlantContracts.SearchModels; using AircraftPlantContracts.StoragesContracts; using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Models; using AircraftPlantListImplement.Models; using System; using System.Collections.Generic; @@ -143,5 +144,27 @@ namespace AircraftPlantListImplement.Implements } return null; } + /// + /// Продажа изделий + /// + /// + /// + /// + /// + public bool SellPlanes(IPlaneModel model, int count) + { + throw new NotImplementedException(); + } + /// + /// Проверка наличия в нужном количестве + /// + /// + /// + /// + /// + public bool CheckCount(IPlaneModel model, int count) + { + throw new NotImplementedException(); + } } } diff --git a/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs index 2ebbd1c..95af29c 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/OrderLogic.cs @@ -4,6 +4,7 @@ using AircraftPlantContracts.SearchModels; using AircraftPlantContracts.StoragesContracts; using AircraftPlantContracts.ViewModels; using AircraftPlantDataModels.Enums; +using AircraftPlantDataModels.Models; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -114,6 +115,21 @@ namespace AircraftPlantBusinessLogic.BusinessLogics model.Status = newStatus; + if (newStatus == OrderStatus.Выдан) + { + var plane = _planeStorage.GetElement(new PlaneSearchModel { Id = element.PlaneId }); + if (plane == null) + { + _logger.LogWarning("Status change error. Plane not found"); + return false; + } + if (!CheckSupply(plane, element.Count)) + { + _logger.LogWarning("Status change error. Shop is overflowed"); + return false; + } + } + if (model.Status == OrderStatus.Выдан) { model.DateImplement = DateTime.Now; @@ -130,5 +146,72 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } return true; } + public bool CheckSupply(IPlaneModel model, int count) + { + if (count <= 0) + { + _logger.LogWarning("Check supply operation error. Planes count < 0"); + return false; + } + + int sumCapacity = _shopStorage.GetFullList().Select(x => x.MaxPlanes).Sum(); + int sumCount = _shopStorage.GetFullList().Select(x => x.ShopPlanes.Select(y => y.Value.Item2).Sum()).Sum(); + int free = sumCapacity - sumCount; + if (free < count) + { + _logger.LogWarning("Check supply error. No place for new planes"); + return false; + } + + foreach (var shop in _shopStorage.GetFullList()) + { + free = shop.MaxPlanes; + foreach (var plane in shop.ShopPlanes) + { + free -= plane.Value.Item2; + } + + if (free == 0) + { + continue; + } + + if (free >= count) + { + if (_shopLogic.AddPlaneInShop(new() + { + Id = shop.Id + }, model, count)) + { + count = 0; + } + else + { + _logger.LogWarning("Supply error"); + return false; + } + } + else + { + if (_shopLogic.AddPlaneInShop(new() + { + Id = shop.Id + }, model, free)) + { + count -= free; + } + else + { + _logger.LogWarning("Supply error"); + return false; + } + } + if (count <= 0) + { + return true; + } + } + return false; + } } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs index f9db95b..8601f86 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs @@ -129,6 +129,25 @@ namespace AircraftPlantBusinessLogic.BusinessLogics }); return true; } + public bool SellPlanes(IPlaneModel plane, int count) + { + if (plane == null) + { + throw new ArgumentNullException(nameof(plane)); + } + if (count <= 0) + { + throw new ArgumentException("Количество изделий должно быть больше 0", nameof(count)); + } + + if (_shopStorage.SellPlanes(plane, count)) + { + _logger.LogInformation("Selling sucsess"); + return true; + } + _logger.LogInformation("Selling failed"); + return false; + } private void CheckModel(ShopBindingModel model, bool withParams = true) { if (model == null) diff --git a/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs b/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs index f371e22..2425ede 100644 --- a/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs +++ b/AircraftPlant/AircraftPlantContracts»/BindingModels/ShopBindingModel.cs @@ -18,5 +18,6 @@ namespace AircraftPlantContracts.BindingModels get; set; } = new(); + public int MaxPlanes { get; set; } } } diff --git a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs index 3c8ce2b..814c1f1 100644 --- a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs +++ b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IShopLogic.cs @@ -18,5 +18,6 @@ namespace AircraftPlantContracts.BusinessLogicsContracts bool Update(ShopBindingModel model); bool Delete(ShopBindingModel model); bool AddPlaneInShop(ShopSearchModel model, IPlaneModel plane, int count); + bool SellPlanes(IPlaneModel plane, int count); } } diff --git a/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs b/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs index 47b0af4..9f715bf 100644 --- a/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs +++ b/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using AircraftPlantContracts.BindingModels; using AircraftPlantContracts.SearchModels; using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Models; using System; using System.Collections.Generic; using System.Linq; @@ -17,5 +18,7 @@ namespace AircraftPlantContracts.StoragesContracts ShopViewModel? Insert(ShopBindingModel model); ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + bool SellPlanes(IPlaneModel model, int count); + bool CheckCount(IPlaneModel model, int count); } } diff --git a/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs b/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs index b65d879..26c6566 100644 --- a/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs +++ b/AircraftPlant/AircraftPlantContracts»/ViewModels/ShopViewModel.cs @@ -22,5 +22,7 @@ namespace AircraftPlantContracts.ViewModels get; set; } = new(); + [DisplayName("Максимальное количество изделий")] + public int MaxPlanes { get; set; } } } diff --git a/AircraftPlant/AircraftPlantDataModels/IShopModel.cs b/AircraftPlant/AircraftPlantDataModels/IShopModel.cs index 43e1362..21fe206 100644 --- a/AircraftPlant/AircraftPlantDataModels/IShopModel.cs +++ b/AircraftPlant/AircraftPlantDataModels/IShopModel.cs @@ -12,5 +12,6 @@ namespace AircraftPlantDataModels.Models string Address { get; } DateTime DateOpening { get; } Dictionary ShopPlanes { get; } + int MaxPlanes { get; } } } diff --git a/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs b/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs index 4d2ea23..1a3aa6f 100644 --- a/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs +++ b/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs @@ -14,9 +14,12 @@ namespace AircraftPlantFileImplement private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string PlaneFileName = "Plane.xml"; + private readonly string ShopFileName = "Shop.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Planes { get; private set; } + public List Shops { get; set; } + public static DataFileSingleton GetInstance() { if (instance == null) @@ -28,11 +31,13 @@ namespace AircraftPlantFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SavePlanes() => SaveData(Planes, PlaneFileName, "Planes", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXEleme private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Planes = LoadData(PlaneFileName, "Plane", x => Plane.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/AircraftPlant/AircraftPlantFileImplement/OrderStorage.cs b/AircraftPlant/AircraftPlantFileImplement/OrderStorage.cs index ca152f7..31e9bb8 100644 --- a/AircraftPlant/AircraftPlantFileImplement/OrderStorage.cs +++ b/AircraftPlant/AircraftPlantFileImplement/OrderStorage.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Xml.Linq; namespace AircraftPlantFileImplement.Implements { @@ -20,7 +21,9 @@ namespace AircraftPlantFileImplement.Implements } public List GetFullList() { - return _source.Orders.Select(x => GetViewModel(x)).ToList(); + return _source.Orders + .Select(x => GetViewModel(x)) + .ToList(); } public List GetFilteredList(OrderSearchModel model) { @@ -28,7 +31,11 @@ namespace AircraftPlantFileImplement.Implements { return new(); } - return _source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList(); + + return _source.Orders + .Where(x => x.Id.Equals(model.Id)) + .Select(x => GetViewModel(x)) + .ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) { @@ -36,6 +43,7 @@ namespace AircraftPlantFileImplement.Implements { return null; } + return GetViewModel(_source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))); } public OrderViewModel? Insert(OrderBindingModel model) @@ -47,6 +55,7 @@ namespace AircraftPlantFileImplement.Implements { return null; } + _source.Orders.Add(newOrder); _source.SaveOrders(); return GetViewModel(newOrder); @@ -58,6 +67,7 @@ namespace AircraftPlantFileImplement.Implements { return null; } + order.Update(model); _source.SaveOrders(); return GetViewModel(order); @@ -77,7 +87,10 @@ namespace AircraftPlantFileImplement.Implements { var viewModel = order.GetViewModel; var plane = _source.Planes.FirstOrDefault(x => x.Id == order.PlaneId); - viewModel.PlaneName = plane?.PlaneName; + if (plane != null) + { + viewModel.PlaneName = plane.PlaneName; + } return viewModel; } } diff --git a/AircraftPlant/AircraftPlantFileImplement/Shop.cs b/AircraftPlant/AircraftPlantFileImplement/Shop.cs new file mode 100644 index 0000000..347a33d --- /dev/null +++ b/AircraftPlant/AircraftPlantFileImplement/Shop.cs @@ -0,0 +1,102 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AircraftPlantFileImplement +{ + public class Shop : IShopModel + { + public int Id { get; private set; } + public string ShopName { get; private set; } = string.Empty; + public string Address { get; private set; } = string.Empty; + public DateTime DateOpening { get; private set; } + public Dictionary Planes { get; private set; } = new(); + private Dictionary? _shopPlanes = null; + public Dictionary ShopPlanes + { + get + { + if (_shopPlanes == null) + { + var source = DataFileSingleton.GetInstance(); + _shopPlanes = Planes.ToDictionary(x => x.Key, y => ((source.Planes.FirstOrDefault(z => z.Id == y.Key) as IPlaneModel)!, y.Value)); + } + return _shopPlanes; + } + } + public int MaxPlanes { get; private set; } + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + Address = element.Element("Address")!.Value, + DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value), + Planes = element.Element("ShopPlanes")!.Elements("ShopPlanes")! + .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)), + MaxPlanes = Convert.ToInt32(element.Element("MaxPlanes")!.Value) + }; + } + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpening = model.DateOpening, + Planes = model.ShopPlanes.ToDictionary(x => x.Key, x => x.Value.Item2), + MaxPlanes = model.MaxPlanes + }; + } + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + + ShopName = model.ShopName; + Address = model.Address; + DateOpening = model.DateOpening; + Planes = model.ShopPlanes.ToDictionary(x => x.Key, x => x.Value.Item2); + MaxPlanes = model.MaxPlanes; + _shopPlanes = null; + } + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + ShopPlanes = ShopPlanes, + MaxPlanes = MaxPlanes + }; + public XElement GetXElement => new("Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("Address", Address), + new XElement("DateOpening", DateOpening.ToString()), + new XElement("ShopPlanes", Planes.Select(x => + new XElement("ShopPlanes", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray()), + new XElement("MaxPlanes", MaxPlanes.ToString())); + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantFileImplement/ShopStorage.cs b/AircraftPlant/AircraftPlantFileImplement/ShopStorage.cs new file mode 100644 index 0000000..32b7786 --- /dev/null +++ b/AircraftPlant/AircraftPlantFileImplement/ShopStorage.cs @@ -0,0 +1,138 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.StoragesContracts; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Models; +using AircraftPlantFileImplement; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantFileImplement +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton _source; + public ShopStorage() + { + _source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return _source.Shops + .Select(x => x.GetViewModel) + .ToList(); + } + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + + return _source.Shops + .Where(x => x.ShopName.Contains(model.ShopName)) + .Select(x => x.GetViewModel) + .ToList(); + } + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + + return _source.Shops + .FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ShopName) && + x.ShopName == model.ShopName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = _source.Shops.Count > 0 ? _source.Shops.Max(x => x.Id) + 1 : 1; + + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + + _source.Shops.Add(newShop); + _source.SaveShops(); + return newShop.GetViewModel; + } + public ShopViewModel? Update(ShopBindingModel model) + { + var shop = _source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + + shop.Update(model); + _source.SaveShops(); + return shop.GetViewModel; + } + public ShopViewModel? Delete(ShopBindingModel model) + { + var element = _source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + _source.Shops.Remove(element); + _source.SaveShops(); + return element.GetViewModel; + } + return null; + } + public bool SellPlanes(IPlaneModel model, int count) + { + var plane = _source.Planes.FirstOrDefault(x => x.Id == model.Id); + if (plane == null || !CheckCount(model, count)) + { + return false; + } + + foreach (var shop in _source.Shops) + { + var planes = shop.ShopPlanes; + foreach (var elem in planes.Where(x => x.Value.Item1.Id == plane.Id)) + { + var selling = Math.Min(elem.Value.Item2, count); + planes[elem.Value.Item1.Id] = (elem.Value.Item1, elem.Value.Item2 - selling); + count -= selling; + + if (count <= 0) + { + break; + } + } + + shop.Update(new ShopBindingModel + { + Id = model.Id, + ShopName = shop.ShopName, + Address = shop.Address, + DateOpening = shop.DateOpening, + ShopPlanes = planes, + MaxPlanes = shop.MaxPlanes + }); + } + + _source.SaveShops(); + return true; + } + public bool CheckCount(IPlaneModel model, int count) + { + int store = _source.Shops + .Select(x => x.ShopPlanes + .Select(y => (y.Value.Item1.Id == model.Id ? y.Value.Item2 : 0)) + .Sum()).Sum(); + return store >= count; + } + } +} From ff37326332bd68c3988b5c25275dc04a0638ace3 Mon Sep 17 00:00:00 2001 From: kamilia Date: Mon, 6 May 2024 02:41:11 +0400 Subject: [PATCH 8/9] =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=BA=D0=BE=D0=BB=D1=83=D0=BF=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataListSingleton.cs | 4 - .../AbstractShopListImplement/Shop.cs | 2 +- .../DataFileSingleton.cs | 2 +- .../AircraftPlantView/FormMain.Designer.cs | 258 ++++++++++-------- AircraftPlant/AircraftPlantView/FormMain.cs | 13 + AircraftPlant/AircraftPlantView/FormMain.resx | 62 ++++- .../AircraftPlantView/FormSell.Designer.cs | 119 ++++++++ AircraftPlant/AircraftPlantView/FormSell.cs | 87 ++++++ AircraftPlant/AircraftPlantView/FormSell.resx | 120 ++++++++ .../AircraftPlantView/FormShop.Designer.cs | 233 +++++++++------- AircraftPlant/AircraftPlantView/FormShop.cs | 4 +- AircraftPlant/AircraftPlantView/FormShop.resx | 62 ++++- AircraftPlant/AircraftPlantView/Program.cs | 2 + 13 files changed, 739 insertions(+), 229 deletions(-) create mode 100644 AircraftPlant/AircraftPlantView/FormSell.Designer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormSell.cs create mode 100644 AircraftPlant/AircraftPlantView/FormSell.resx diff --git a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs index 3316230..d931deb 100644 --- a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs +++ b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs @@ -35,10 +35,6 @@ namespace AircraftPlantListImplement /// Список классов-моделей магазинов /// public List Shops { get; set; } - /// - /// Список классов-моделей магазинов - /// - public List Shops { get; set; } /// /// Конструктор diff --git a/AircraftPlant/AbstractShopListImplement/Shop.cs b/AircraftPlant/AbstractShopListImplement/Shop.cs index 1287c01..a5c0a73 100644 --- a/AircraftPlant/AbstractShopListImplement/Shop.cs +++ b/AircraftPlant/AbstractShopListImplement/Shop.cs @@ -60,7 +60,7 @@ namespace AircraftPlantListImplement.Models ShopName = model.ShopName, Address = model.Address, DateOpening = model.DateOpening, - ShopPlanes = model.ShopPlanes + ShopPlanes = model.ShopPlanes, MaxPlanes = model.MaxPlanes }; } diff --git a/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs b/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs index 1a3aa6f..58c89d2 100644 --- a/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs +++ b/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs @@ -31,7 +31,7 @@ namespace AircraftPlantFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SavePlanes() => SaveData(Planes, PlaneFileName, "Planes", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); - public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXEleme + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; diff --git a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs index 4eead6e..9bb4111 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs @@ -28,164 +28,183 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.ButtonCreateOrder = new System.Windows.Forms.Button(); - this.ButtonTakeOrderInWork = new System.Windows.Forms.Button(); - this.ButtonOrderReady = new System.Windows.Forms.Button(); - this.ButtonIssuedOrder = new System.Windows.Forms.Button(); - this.ButtonRef = new System.Windows.Forms.Button(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.buttonAddPlane = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); + dataGridView = new DataGridView(); + ButtonCreateOrder = new Button(); + ButtonTakeOrderInWork = new Button(); + ButtonOrderReady = new Button(); + ButtonIssuedOrder = new Button(); + ButtonRef = new Button(); + menuStrip1 = new MenuStrip(); + справочникиToolStripMenuItem = new ToolStripMenuItem(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + изделияToolStripMenuItem = new ToolStripMenuItem(); + магазиныToolStripMenuItem = new ToolStripMenuItem(); + buttonAddPlane = new Button(); + buttonSellPlanes = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + menuStrip1.SuspendLayout(); + SuspendLayout(); // // dataGridView // - this.dataGridView.AllowUserToAddRows = false; - this.dataGridView.AllowUserToDeleteRows = false; - this.dataGridView.BackgroundColor = System.Drawing.Color.White; - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; - this.dataGridView.GridColor = System.Drawing.Color.White; - this.dataGridView.Location = new System.Drawing.Point(0, 24); - this.dataGridView.MultiSelect = false; - this.dataGridView.Name = "dataGridView"; - this.dataGridView.ReadOnly = true; - this.dataGridView.RowHeadersVisible = false; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView.Size = new System.Drawing.Size(780, 377); - this.dataGridView.TabIndex = 0; + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.BackgroundColor = Color.White; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Left; + dataGridView.GridColor = Color.White; + dataGridView.Location = new Point(0, 30); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 25; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(891, 505); + dataGridView.TabIndex = 0; // // ButtonCreateOrder // - this.ButtonCreateOrder.Location = new System.Drawing.Point(804, 42); - this.ButtonCreateOrder.Name = "ButtonCreateOrder"; - this.ButtonCreateOrder.Size = new System.Drawing.Size(153, 23); - this.ButtonCreateOrder.TabIndex = 1; - this.ButtonCreateOrder.Text = "Создать заказ"; - this.ButtonCreateOrder.UseVisualStyleBackColor = true; - this.ButtonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + ButtonCreateOrder.Location = new Point(919, 56); + ButtonCreateOrder.Margin = new Padding(3, 4, 3, 4); + ButtonCreateOrder.Name = "ButtonCreateOrder"; + ButtonCreateOrder.Size = new Size(175, 31); + ButtonCreateOrder.TabIndex = 1; + ButtonCreateOrder.Text = "Создать заказ"; + ButtonCreateOrder.UseVisualStyleBackColor = true; + ButtonCreateOrder.Click += ButtonCreateOrder_Click; // // ButtonTakeOrderInWork // - this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(804, 89); - this.ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; - this.ButtonTakeOrderInWork.Size = new System.Drawing.Size(153, 23); - this.ButtonTakeOrderInWork.TabIndex = 2; - this.ButtonTakeOrderInWork.Text = "Отдать на выполнение"; - this.ButtonTakeOrderInWork.UseVisualStyleBackColor = true; - this.ButtonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + ButtonTakeOrderInWork.Location = new Point(919, 119); + ButtonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4); + ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; + ButtonTakeOrderInWork.Size = new Size(175, 31); + ButtonTakeOrderInWork.TabIndex = 2; + ButtonTakeOrderInWork.Text = "Отдать на выполнение"; + ButtonTakeOrderInWork.UseVisualStyleBackColor = true; + ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; // // ButtonOrderReady // - this.ButtonOrderReady.Location = new System.Drawing.Point(804, 139); - this.ButtonOrderReady.Name = "ButtonOrderReady"; - this.ButtonOrderReady.Size = new System.Drawing.Size(153, 23); - this.ButtonOrderReady.TabIndex = 3; - this.ButtonOrderReady.Text = "Заказ готов"; - this.ButtonOrderReady.UseVisualStyleBackColor = true; - this.ButtonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); + ButtonOrderReady.Location = new Point(919, 185); + ButtonOrderReady.Margin = new Padding(3, 4, 3, 4); + ButtonOrderReady.Name = "ButtonOrderReady"; + ButtonOrderReady.Size = new Size(175, 31); + ButtonOrderReady.TabIndex = 3; + ButtonOrderReady.Text = "Заказ готов"; + ButtonOrderReady.UseVisualStyleBackColor = true; + ButtonOrderReady.Click += ButtonOrderReady_Click; // // ButtonIssuedOrder // - this.ButtonIssuedOrder.Location = new System.Drawing.Point(804, 187); - this.ButtonIssuedOrder.Name = "ButtonIssuedOrder"; - this.ButtonIssuedOrder.Size = new System.Drawing.Size(153, 23); - this.ButtonIssuedOrder.TabIndex = 4; - this.ButtonIssuedOrder.Text = "Заказ выдан"; - this.ButtonIssuedOrder.UseVisualStyleBackColor = true; - this.ButtonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + ButtonIssuedOrder.Location = new Point(919, 249); + ButtonIssuedOrder.Margin = new Padding(3, 4, 3, 4); + ButtonIssuedOrder.Name = "ButtonIssuedOrder"; + ButtonIssuedOrder.Size = new Size(175, 31); + ButtonIssuedOrder.TabIndex = 4; + ButtonIssuedOrder.Text = "Заказ выдан"; + ButtonIssuedOrder.UseVisualStyleBackColor = true; + ButtonIssuedOrder.Click += ButtonIssuedOrder_Click; // // ButtonRef // - this.ButtonRef.Location = new System.Drawing.Point(804, 236); - this.ButtonRef.Name = "ButtonRef"; - this.ButtonRef.Size = new System.Drawing.Size(153, 23); - this.ButtonRef.TabIndex = 5; - this.ButtonRef.Text = "Обновить список"; - this.ButtonRef.UseVisualStyleBackColor = true; - this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); + ButtonRef.Location = new Point(919, 315); + ButtonRef.Margin = new Padding(3, 4, 3, 4); + ButtonRef.Name = "ButtonRef"; + ButtonRef.Size = new Size(175, 31); + ButtonRef.TabIndex = 5; + ButtonRef.Text = "Обновить список"; + ButtonRef.UseVisualStyleBackColor = true; + ButtonRef.Click += ButtonRef_Click; // // menuStrip1 // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.справочникиToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(977, 24); - this.menuStrip1.TabIndex = 6; - this.menuStrip1.Text = "menuStrip1"; + menuStrip1.ImageScalingSize = new Size(20, 20); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Padding = new Padding(7, 3, 0, 3); + menuStrip1.Size = new Size(1117, 30); + menuStrip1.TabIndex = 6; + menuStrip1.Text = "menuStrip1"; // // справочникиToolStripMenuItem // - this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.компонентыToolStripMenuItem, - this.изделияToolStripMenuItem, - this.магазиныToolStripMenuItem}); - this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20); - this.справочникиToolStripMenuItem.Text = "Справочники"; + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, магазиныToolStripMenuItem }); + справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; + справочникиToolStripMenuItem.Size = new Size(117, 24); + справочникиToolStripMenuItem.Text = "Справочники"; // // компонентыToolStripMenuItem // - this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.компонентыToolStripMenuItem.Text = "Компоненты"; - this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(224, 26); + компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // изделияToolStripMenuItem // - this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - this.изделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.изделияToolStripMenuItem.Text = "Изделия"; - this.изделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); + изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; + изделияToolStripMenuItem.Size = new Size(224, 26); + изделияToolStripMenuItem.Text = "Изделия"; + изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // // магазиныToolStripMenuItem // - this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.магазиныToolStripMenuItem.Text = "Магазины"; - this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.МагазиныToolStripMenuItem_Click); + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(224, 26); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; // // buttonAddPlane // - this.buttonAddPlane.Location = new System.Drawing.Point(811, 280); - this.buttonAddPlane.Name = "buttonAddPlane"; - this.buttonAddPlane.Size = new System.Drawing.Size(146, 23); - this.buttonAddPlane.TabIndex = 7; - this.buttonAddPlane.Text = "Пополнение магазина"; - this.buttonAddPlane.UseVisualStyleBackColor = true; - this.buttonAddPlane.Click += new System.EventHandler(this.buttonAddPlane_Click); + buttonAddPlane.Location = new Point(919, 393); + buttonAddPlane.Margin = new Padding(3, 4, 3, 4); + buttonAddPlane.Name = "buttonAddPlane"; + buttonAddPlane.Size = new Size(186, 30); + buttonAddPlane.TabIndex = 7; + buttonAddPlane.Text = "Пополнение магазина"; + buttonAddPlane.UseVisualStyleBackColor = true; + buttonAddPlane.Click += buttonAddPlane_Click; + // + // buttonSellPlanes + // + buttonSellPlanes.Location = new Point(919, 431); + buttonSellPlanes.Margin = new Padding(3, 4, 3, 4); + buttonSellPlanes.Name = "buttonSellPlanes"; + buttonSellPlanes.Size = new Size(186, 31); + buttonSellPlanes.TabIndex = 8; + buttonSellPlanes.Text = "Продать изделия"; + buttonSellPlanes.UseVisualStyleBackColor = true; + buttonSellPlanes.Click += buttonSellPlanes_Click; // // FormMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(977, 401); - this.Controls.Add(this.buttonAddPlane); - this.Controls.Add(this.ButtonRef); - this.Controls.Add(this.ButtonIssuedOrder); - this.Controls.Add(this.ButtonOrderReady); - this.Controls.Add(this.ButtonTakeOrderInWork); - this.Controls.Add(this.ButtonCreateOrder); - this.Controls.Add(this.dataGridView); - this.Controls.Add(this.menuStrip1); - this.MainMenuStrip = this.menuStrip1; - this.Name = "FormMain"; - this.Text = "Авиационный завод"; - this.Load += new System.EventHandler(this.FormMain_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1117, 535); + Controls.Add(buttonSellPlanes); + Controls.Add(buttonAddPlane); + Controls.Add(ButtonRef); + Controls.Add(ButtonIssuedOrder); + Controls.Add(ButtonOrderReady); + Controls.Add(ButtonTakeOrderInWork); + Controls.Add(ButtonCreateOrder); + Controls.Add(dataGridView); + Controls.Add(menuStrip1); + MainMenuStrip = menuStrip1; + Margin = new Padding(3, 4, 3, 4); + Name = "FormMain"; + Text = "Авиационный завод"; + Load += FormMain_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); + ResumeLayout(false); + PerformLayout(); } #endregion @@ -202,5 +221,6 @@ private ToolStripMenuItem изделияToolStripMenuItem; private ToolStripMenuItem магазиныToolStripMenuItem; private Button buttonAddPlane; + private Button buttonSellPlanes; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormMain.cs b/AircraftPlant/AircraftPlantView/FormMain.cs index 88bec8b..0415502 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.cs @@ -227,5 +227,18 @@ namespace AircraftPlantView form.ShowDialog(); } } + /// + /// Кнопка "Продать изделия" + /// + /// + /// + private void buttonSellPlanes_Click(object sender, EventArgs e) + { + var services = Program.ServiceProvider?.GetService(typeof(FormSell)); + if (services is FormSell form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormMain.resx b/AircraftPlant/AircraftPlantView/FormMain.resx index 938108a..a0623c8 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.resx +++ b/AircraftPlant/AircraftPlantView/FormMain.resx @@ -1,4 +1,64 @@ - + + + diff --git a/AircraftPlant/AircraftPlantView/FormSell.Designer.cs b/AircraftPlant/AircraftPlantView/FormSell.Designer.cs new file mode 100644 index 0000000..20dd960 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormSell.Designer.cs @@ -0,0 +1,119 @@ +namespace AircraftPlantView +{ + partial class FormSell + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + labelPlane = new Label(); + labelCount = new Label(); + comboBoxPlane = new ComboBox(); + textBoxCount = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // labelPlane + // + labelPlane.AutoSize = true; + labelPlane.Location = new Point(12, 18); + labelPlane.Name = "labelPlane"; + labelPlane.Size = new Size(71, 20); + labelPlane.TabIndex = 0; + labelPlane.Text = "Изделие:"; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(12, 54); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(93, 20); + labelCount.TabIndex = 1; + labelCount.Text = "Количество:"; + // + // comboBoxPlane + // + comboBoxPlane.FormattingEnabled = true; + comboBoxPlane.Location = new Point(115, 15); + comboBoxPlane.Name = "comboBoxPlane"; + comboBoxPlane.Size = new Size(267, 28); + comboBoxPlane.TabIndex = 2; + // + // textBoxCount + // + textBoxCount.Location = new Point(115, 54); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(267, 27); + textBoxCount.TabIndex = 3; + // + // buttonSave + // + buttonSave.Location = new Point(178, 100); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 29); + buttonSave.TabIndex = 4; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(288, 100); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // FormSell + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(424, 146); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(textBoxCount); + Controls.Add(comboBoxPlane); + Controls.Add(labelCount); + Controls.Add(labelPlane); + Name = "FormSell"; + Text = "FormSell"; + Load += FormSell_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelPlane; + private Label labelCount; + private ComboBox comboBoxPlane; + private TextBox textBoxCount; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormSell.cs b/AircraftPlant/AircraftPlantView/FormSell.cs new file mode 100644 index 0000000..ad6e45b --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormSell.cs @@ -0,0 +1,87 @@ +using AircraftPlantContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AircraftPlantView +{ + public partial class FormSell : Form + { + private readonly ILogger _logger; + private readonly IPlaneLogic _logicP; + private readonly IShopLogic _logicS; + public FormSell(ILogger logger, IPlaneLogic planeLogic, IShopLogic shopLogic) + { + InitializeComponent(); + _logger = logger; + _logicP = planeLogic; + _logicS = shopLogic; + } + private void FormSell_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка изделий для продажи"); + try + { + var list = _logicP.ReadList(null); + if (list != null) + { + comboBoxPlane.DisplayMember = "PlaneName"; + comboBoxPlane.ValueMember = "Id"; + comboBoxPlane.DataSource = list; + comboBoxPlane.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxPlane.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Продажа изделий"); + _logger.LogInformation("Создание заказа"); + try + { + var operationResult = _logicS.SellPlanes( + _logicP.ReadElement(new() { Id = Convert.ToInt32(comboBoxPlane.SelectedValue) }), + Convert.ToInt32(textBoxCount.Text) + ); + if (!operationResult) + { + throw new Exception("Ошибка при продаже изделий. Доп. информация в логах."); + } + MessageBox.Show("Продажа прошла успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка продажи изделий"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormSell.resx b/AircraftPlant/AircraftPlantView/FormSell.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormSell.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShop.Designer.cs b/AircraftPlant/AircraftPlantView/FormShop.Designer.cs index 10c183e..f445849 100644 --- a/AircraftPlant/AircraftPlantView/FormShop.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormShop.Designer.cs @@ -28,140 +28,169 @@ /// private void InitializeComponent() { - this.labelName = new System.Windows.Forms.Label(); - this.labelAddress = new System.Windows.Forms.Label(); - this.labelDate = new System.Windows.Forms.Label(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxAddress = new System.Windows.Forms.TextBox(); - this.dateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.dataGridViewShop = new System.Windows.Forms.DataGridView(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnPlane = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).BeginInit(); - this.SuspendLayout(); + labelName = new Label(); + labelAddress = new Label(); + labelDate = new Label(); + textBoxName = new TextBox(); + textBoxAddress = new TextBox(); + dateTimePicker = new DateTimePicker(); + dataGridViewShop = new DataGridView(); + ColumnID = new DataGridViewTextBoxColumn(); + ColumnPlane = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + labelMaxPlanes = new Label(); + numericUpDownMaxPlanes = new NumericUpDown(); + ((System.ComponentModel.ISupportInitialize)dataGridViewShop).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownMaxPlanes).BeginInit(); + SuspendLayout(); // // labelName // - this.labelName.AutoSize = true; - this.labelName.Location = new System.Drawing.Point(12, 9); - this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(62, 15); - this.labelName.TabIndex = 0; - this.labelName.Text = "Название:"; + labelName.AutoSize = true; + labelName.Location = new Point(14, 12); + labelName.Name = "labelName"; + labelName.Size = new Size(80, 20); + labelName.TabIndex = 0; + labelName.Text = "Название:"; // // labelAddress // - this.labelAddress.AutoSize = true; - this.labelAddress.Location = new System.Drawing.Point(12, 39); - this.labelAddress.Name = "labelAddress"; - this.labelAddress.Size = new System.Drawing.Size(43, 15); - this.labelAddress.TabIndex = 1; - this.labelAddress.Text = "Адрес:"; + labelAddress.AutoSize = true; + labelAddress.Location = new Point(14, 52); + labelAddress.Name = "labelAddress"; + labelAddress.Size = new Size(54, 20); + labelAddress.TabIndex = 1; + labelAddress.Text = "Адрес:"; // // labelDate // - this.labelDate.AutoSize = true; - this.labelDate.Location = new System.Drawing.Point(12, 74); - this.labelDate.Name = "labelDate"; - this.labelDate.Size = new System.Drawing.Size(90, 15); - this.labelDate.TabIndex = 2; - this.labelDate.Text = "Дата открытия:"; + labelDate.AutoSize = true; + labelDate.Location = new Point(14, 99); + labelDate.Name = "labelDate"; + labelDate.Size = new Size(113, 20); + labelDate.TabIndex = 2; + labelDate.Text = "Дата открытия:"; // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(116, 6); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(200, 23); - this.textBoxName.TabIndex = 3; + textBoxName.Location = new Point(133, 8); + textBoxName.Margin = new Padding(3, 4, 3, 4); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(228, 27); + textBoxName.TabIndex = 3; // // textBoxAddress // - this.textBoxAddress.Location = new System.Drawing.Point(116, 39); - this.textBoxAddress.Name = "textBoxAddress"; - this.textBoxAddress.Size = new System.Drawing.Size(200, 23); - this.textBoxAddress.TabIndex = 4; + textBoxAddress.Location = new Point(133, 52); + textBoxAddress.Margin = new Padding(3, 4, 3, 4); + textBoxAddress.Name = "textBoxAddress"; + textBoxAddress.Size = new Size(228, 27); + textBoxAddress.TabIndex = 4; // // dateTimePicker // - this.dateTimePicker.Location = new System.Drawing.Point(116, 74); - this.dateTimePicker.Name = "dateTimePicker"; - this.dateTimePicker.Size = new System.Drawing.Size(200, 23); - this.dateTimePicker.TabIndex = 5; + dateTimePicker.Location = new Point(133, 99); + dateTimePicker.Margin = new Padding(3, 4, 3, 4); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(228, 27); + dateTimePicker.TabIndex = 5; // // dataGridViewShop // - this.dataGridViewShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.ColumnID, - this.ColumnPlane, - this.ColumnCount}); - this.dataGridViewShop.Location = new System.Drawing.Point(26, 118); - this.dataGridViewShop.Name = "dataGridViewShop"; - this.dataGridViewShop.RowTemplate.Height = 25; - this.dataGridViewShop.Size = new System.Drawing.Size(446, 325); - this.dataGridViewShop.TabIndex = 6; - // - // buttonSave - // - this.buttonSave.Location = new System.Drawing.Point(316, 444); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(75, 23); - this.buttonSave.TabIndex = 7; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); - // - // buttonCancel - // - this.buttonCancel.Location = new System.Drawing.Point(397, 444); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 8; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + dataGridViewShop.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridViewShop.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewShop.Columns.AddRange(new DataGridViewColumn[] { ColumnID, ColumnPlane, ColumnCount }); + dataGridViewShop.Location = new Point(30, 195); + dataGridViewShop.Margin = new Padding(3, 4, 3, 4); + dataGridViewShop.Name = "dataGridViewShop"; + dataGridViewShop.RowHeadersWidth = 51; + dataGridViewShop.RowTemplate.Height = 25; + dataGridViewShop.Size = new Size(588, 433); + dataGridViewShop.TabIndex = 6; // // ColumnID // - this.ColumnID.HeaderText = "ID"; - this.ColumnID.Name = "ColumnID"; - this.ColumnID.Visible = false; + ColumnID.HeaderText = "ID"; + ColumnID.MinimumWidth = 6; + ColumnID.Name = "ColumnID"; + ColumnID.Visible = false; // // ColumnPlane // - this.ColumnPlane.HeaderText = "Изделие"; - this.ColumnPlane.Name = "ColumnPlane"; - this.ColumnPlane.Width = 300; + ColumnPlane.HeaderText = "Изделие"; + ColumnPlane.MinimumWidth = 6; + ColumnPlane.Name = "ColumnPlane"; // // ColumnCount // - this.ColumnCount.HeaderText = "Количество"; - this.ColumnCount.Name = "ColumnCount"; + ColumnCount.HeaderText = "Количество"; + ColumnCount.MinimumWidth = 6; + ColumnCount.Name = "ColumnCount"; + // + // buttonSave + // + buttonSave.Location = new Point(399, 640); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(99, 31); + buttonSave.TabIndex = 7; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(519, 640); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(99, 31); + buttonCancel.TabIndex = 8; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // labelMaxPlanes + // + labelMaxPlanes.AutoSize = true; + labelMaxPlanes.Location = new Point(14, 148); + labelMaxPlanes.Name = "labelMaxPlanes"; + labelMaxPlanes.Size = new Size(103, 20); + labelMaxPlanes.TabIndex = 9; + labelMaxPlanes.Text = "Вместимость:"; + // + // numericUpDownMaxPlanes + // + numericUpDownMaxPlanes.Location = new Point(133, 146); + numericUpDownMaxPlanes.Name = "numericUpDownMaxPlanes"; + numericUpDownMaxPlanes.Size = new Size(228, 27); + numericUpDownMaxPlanes.TabIndex = 10; // // FormShop // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(481, 470); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.dataGridViewShop); - this.Controls.Add(this.dateTimePicker); - this.Controls.Add(this.textBoxAddress); - this.Controls.Add(this.textBoxName); - this.Controls.Add(this.labelDate); - this.Controls.Add(this.labelAddress); - this.Controls.Add(this.labelName); - this.Name = "FormShop"; - this.Text = "Магазин"; - this.Load += new System.EventHandler(this.FormShop_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(645, 684); + Controls.Add(numericUpDownMaxPlanes); + Controls.Add(labelMaxPlanes); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(dataGridViewShop); + Controls.Add(dateTimePicker); + Controls.Add(textBoxAddress); + Controls.Add(textBoxName); + Controls.Add(labelDate); + Controls.Add(labelAddress); + Controls.Add(labelName); + Margin = new Padding(3, 4, 3, 4); + Name = "FormShop"; + Text = "Магазин"; + Load += FormShop_Load; + ((System.ComponentModel.ISupportInitialize)dataGridViewShop).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownMaxPlanes).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion @@ -185,5 +214,7 @@ private DataGridViewTextBoxColumn ColumnPlane; private DataGridViewTextBoxColumn ColumnCount; private DataGridView dataGridViewShop; + private Label labelMaxPlanes; + private NumericUpDown numericUpDownMaxPlanes; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormShop.cs b/AircraftPlant/AircraftPlantView/FormShop.cs index 888ed05..ba5c728 100644 --- a/AircraftPlant/AircraftPlantView/FormShop.cs +++ b/AircraftPlant/AircraftPlantView/FormShop.cs @@ -67,6 +67,7 @@ namespace AircraftPlantView textBoxName.Text = view.ShopName; textBoxAddress.Text = view.Address; dateTimePicker.Text = view.DateOpening.ToString(); + numericUpDownMaxPlanes.Value = view.MaxPlanes; _shopPlanes = view.ShopPlanes ?? new Dictionary(); LoadData(); } @@ -104,7 +105,8 @@ namespace AircraftPlantView ShopName = textBoxName.Text, Address = textBoxAddress.Text, DateOpening = dateTimePicker.Value.Date, - ShopPlanes = _shopPlanes + ShopPlanes = _shopPlanes, + MaxPlanes = Convert.ToInt32(numericUpDownMaxPlanes.Value) }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) diff --git a/AircraftPlant/AircraftPlantView/FormShop.resx b/AircraftPlant/AircraftPlantView/FormShop.resx index 4ff2619..4859161 100644 --- a/AircraftPlant/AircraftPlantView/FormShop.resx +++ b/AircraftPlant/AircraftPlantView/FormShop.resx @@ -1,4 +1,64 @@ - + + + diff --git a/AircraftPlant/AircraftPlantView/Program.cs b/AircraftPlant/AircraftPlantView/Program.cs index 2dd4986..aa71485 100644 --- a/AircraftPlant/AircraftPlantView/Program.cs +++ b/AircraftPlant/AircraftPlantView/Program.cs @@ -1,6 +1,7 @@ using AircraftPlantBusinessLogic.BusinessLogics; using AircraftPlantContracts.BusinessLogicsContracts; using AircraftPlantContracts.StoragesContracts; +using AircraftPlantFileImplement; using AircraftPlantFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -66,6 +67,7 @@ namespace AircraftPlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file From e1fa07bcb8f25728eb91fdbd6c205c64d6f65146 Mon Sep 17 00:00:00 2001 From: kamilia Date: Mon, 6 May 2024 03:19:38 +0400 Subject: [PATCH 9/9] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=202=20=D1=83=D1=81=D0=BB!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AircraftPlantBusinessLogic/ShopLogic.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs index 8601f86..356d475 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/ShopLogic.cs @@ -97,7 +97,7 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } if (count <= 0) { - throw new ArgumentException("Кол-во изделий должно быть больше 0", nameof(count)); + throw new ArgumentException("Количество изделий должно быть больше 0", nameof(count)); } _logger.LogInformation("AddPlaneInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); var element = _shopStorage.GetElement(model); @@ -108,6 +108,13 @@ namespace AircraftPlantBusinessLogic.BusinessLogics } _logger.LogInformation("AddPlaneInShop find. Id:{Id}", element.Id); + var countPlanes = element.ShopPlanes.Select(x => x.Value.Item2).Sum(); + if (element.MaxPlanes - countPlanes < count) + { + _logger.LogWarning("Shop is overflowed"); + return false; + } + if (element.ShopPlanes.TryGetValue(plane.Id, out var pair)) { element.ShopPlanes[plane.Id] = (plane, count + pair.Item2); @@ -125,7 +132,8 @@ namespace AircraftPlantBusinessLogic.BusinessLogics Address = element.Address, ShopName = element.ShopName, DateOpening = element.DateOpening, - ShopPlanes = element.ShopPlanes + ShopPlanes = element.ShopPlanes, + MaxPlanes = element.MaxPlanes }); return true; }