diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs index 215cdf4..9af33ef 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs @@ -4,6 +4,7 @@ using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.StoragesContracts; using AutomobilePlantContracts.ViewModels; using AutomobilePlantDataModels.Enums; +using AutomobilePlantDataModels.Models; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -17,11 +18,17 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly IShopStorage _shopStorage; + private readonly IShopLogic _shopLogic; + private readonly ICarStorage _carStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopLogic shopLogic, ICarStorage carStorage, IShopStorage shopStorage) { _logger = logger; _orderStorage = orderStorage; + _shopLogic = shopLogic; + _carStorage = carStorage; + _shopStorage = shopStorage; } public List? ReadList(OrderSearchModel? model) @@ -40,16 +47,80 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics public bool CreateOrder(OrderBindingModel model) { CheckModel(model); - if (model.Status != OrderStatus.Неизвестен) return false; + if (model.Status != OrderStatus.Неизвестен) + return false; model.Status = OrderStatus.Принят; if (_orderStorage.Insert(model) == null) { + model.Status = OrderStatus.Неизвестен; _logger.LogWarning("Insert operation failed"); return false; } return true; } + public bool CheckThenSupplyMany(ICarModel car, int count) + { + if (count <= 0) + { + _logger.LogWarning("Check then supply operation error. Car count < 0."); + return false; + } + + int freeSpace = 0; + foreach (var shop in _shopStorage.GetFullList()) + { + freeSpace += shop.MaxCountCars; + foreach (var c in shop.ShopCars) + { + freeSpace -= c.Value.Item2; + } + } + + if (freeSpace < count) + { + _logger.LogWarning("Check then supply operation error. There's no place for new cars in shops."); + return false; + } + + foreach (var shop in _shopStorage.GetFullList()) + { + freeSpace = shop.MaxCountCars; + + foreach (var c in shop.ShopCars) + freeSpace -= c.Value.Item2; + + if (freeSpace <= 0) + continue; + + if (freeSpace >= count) + { + if (_shopLogic.SupplyCars(new ShopSearchModel() { Id = shop.Id }, car, count)) + count = 0; + else + { + _logger.LogWarning("Supply error"); + return false; + } + } + if (freeSpace < count) + { + if (_shopLogic.SupplyCars(new ShopSearchModel() { Id = shop.Id }, car, freeSpace)) + count -= freeSpace; + else + { + _logger.LogWarning("Supply error"); + return false; + } + } + if (count <= 0) + { + return true; + } + } + return false; + } + public bool ChangeStatus(OrderBindingModel model, OrderStatus status) { CheckModel(model, false); @@ -64,6 +135,23 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics _logger.LogWarning("Status change operation failed"); throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный"); } + + if (status == OrderStatus.Готов) + { + var car = _carStorage.GetElement(new CarSearchModel() { Id = model.CarId }); + if (car == null) + { + _logger.LogWarning("Status change operation failed. Car not found."); + return false; + } + + if (!CheckThenSupplyMany(car, model.Count)) + { + _logger.LogWarning("Status change operation failed. Shop supply error."); + return false; + } + } + OrderStatus oldStatus = model.Status; model.Status = status; if (model.Status == OrderStatus.Выдан) diff --git a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ShopLogic.cs b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ShopLogic.cs index f19ea43..97578c8 100644 --- a/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ShopLogic.cs @@ -88,25 +88,37 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics _logger.LogInformation("Shop element found. ID: {0}, Name: {1}", shopElement.Id, shopElement.Name); - if (shopElement.ShopCars.TryGetValue(car.Id, out var sameCar)) + int countCars = 0; + foreach (var c in shopElement.ShopCars) + countCars += c.Value.Item2; + + if (countCars > shopElement.MaxCountCars - countCars) { - shopElement.ShopCars[car.Id] = (car, sameCar.Item2 + count); - _logger.LogInformation("Same car found by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name); + _logger.LogWarning("Required shop will be overflowed"); + return false; } else { - shopElement.ShopCars[car.Id] = (car, count); - _logger.LogInformation("New car added by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name); - } + if (shopElement.ShopCars.TryGetValue(car.Id, out var sameCar)) + { + shopElement.ShopCars[car.Id] = (car, sameCar.Item2 + count); + _logger.LogInformation("Same car found by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name); + } + else + { + shopElement.ShopCars[car.Id] = (car, count); + _logger.LogInformation("New car added by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name); + } - _shopStorage.Update(new() - { - Id = shopElement.Id, - Name = shopElement.Name, - Address = shopElement.Address, - OpeningDate = shopElement.OpeningDate, - ShopCars = shopElement.ShopCars - }); + _shopStorage.Update(new() + { + Id = shopElement.Id, + Name = shopElement.Name, + Address = shopElement.Address, + OpeningDate = shopElement.OpeningDate, + ShopCars = shopElement.ShopCars + }); + } return true; } @@ -167,6 +179,11 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics throw new ArgumentNullException("Нет названия магазина!", nameof(model.Name)); } + if (model.MaxCountCars < 0) + { + throw new InvalidOperationException("Отрицательное максимальное количество авто!"); + } + _logger.LogInformation("Shop. Name: {0}, Address: {1}, ID: {2}", model.Name, model.Address, model.Id); var element = _shopStorage.GetElement(new ShopSearchModel @@ -179,5 +196,10 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics throw new InvalidOperationException("Магазин с таким названием уже есть"); } } + + public bool SellCar(ICarModel car, int count) + { + return _shopStorage.SellCar(car, count); + } } } diff --git a/AutomobilePlant/AutomobilePlantContracts/BindingModels/ShopBindingModel.cs b/AutomobilePlant/AutomobilePlantContracts/BindingModels/ShopBindingModel.cs index a0e0340..4ee41b3 100644 --- a/AutomobilePlant/AutomobilePlantContracts/BindingModels/ShopBindingModel.cs +++ b/AutomobilePlant/AutomobilePlantContracts/BindingModels/ShopBindingModel.cs @@ -15,6 +15,8 @@ namespace AutomobilePlantContracts.BindingModels public string Address { get; set; } = string.Empty; + public int MaxCountCars { get; set; } + public DateTime OpeningDate { get; set; } public Dictionary ShopCars diff --git a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IShopLogic.cs b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IShopLogic.cs index 34fcc4d..ae81414 100644 --- a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IShopLogic.cs +++ b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicsContracts/IShopLogic.cs @@ -18,5 +18,6 @@ namespace AutomobilePlantContracts.BusinessLogicsContracts bool Update(ShopBindingModel model); bool Delete(ShopBindingModel model); bool SupplyCars(ShopSearchModel model, ICarModel car, int count); + bool SellCar(ICarModel car, int count); } } diff --git a/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IShopStorage.cs b/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IShopStorage.cs index c93f7de..2397c7e 100644 --- a/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IShopStorage.cs +++ b/AutomobilePlant/AutomobilePlantContracts/StoragesContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; using System.Linq; @@ -17,5 +18,6 @@ namespace AutomobilePlantContracts.StoragesContracts ShopViewModel? Insert(ShopBindingModel model); ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + bool SellCar(ICarModel model, int count); } } diff --git a/AutomobilePlant/AutomobilePlantContracts/ViewModels/ShopViewModel.cs b/AutomobilePlant/AutomobilePlantContracts/ViewModels/ShopViewModel.cs index f93ef75..66472a4 100644 --- a/AutomobilePlant/AutomobilePlantContracts/ViewModels/ShopViewModel.cs +++ b/AutomobilePlant/AutomobilePlantContracts/ViewModels/ShopViewModel.cs @@ -11,12 +11,19 @@ namespace AutomobilePlantContracts.ViewModels public class ShopViewModel : IShopModel { public int Id { get; set; } + [DisplayName("Shop's name")] public string Name { get; set; } = string.Empty; + [DisplayName("Address")] public string Address { get; set; } = string.Empty; + + [DisplayName("Maximum cars' count in shop")] + public int MaxCountCars { get; set; } + [DisplayName("Opening date")] public DateTime OpeningDate { get; set; } + public Dictionary ShopCars { get; set; } = new(); } } diff --git a/AutomobilePlant/AutomobilePlantDataModels/Models/IShopModel.cs b/AutomobilePlant/AutomobilePlantDataModels/Models/IShopModel.cs index 8ee298b..176cdcb 100644 --- a/AutomobilePlant/AutomobilePlantDataModels/Models/IShopModel.cs +++ b/AutomobilePlant/AutomobilePlantDataModels/Models/IShopModel.cs @@ -10,6 +10,7 @@ namespace AutomobilePlantDataModels.Models { string Name { get; } string Address { get; } + int MaxCountCars { get; } DateTime OpeningDate { get; } Dictionary ShopCars { get; } } diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Implements/ShopStorage.cs b/AutomobilePlant/AutomobilePlantFileImplement/Implements/ShopStorage.cs index fc6eaf4..a44e3d3 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Implements/ShopStorage.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Implements/ShopStorage.cs @@ -90,26 +90,16 @@ namespace AutomobilePlantFileImplement.Implements return false; } - var countStore = count; var shopCars = source.Shops.SelectMany(shop => shop.ShopCars.Where(c => c.Value.Item1.Id == car.Id)); - foreach (var c in shopCars) - { - count -= c.Value.Item2; + int countStore = 0; - if (count <= 0) - { - break; - } - } + foreach (var it in shopCars) + countStore += it.Value.Item2; - if (count > 0) - { + if (count > countStore) return false; - } - - count = countStore; foreach (var shop in source.Shops) { @@ -117,14 +107,12 @@ namespace AutomobilePlantFileImplement.Implements foreach (var c in cars.Where(x => x.Value.Item1.Id == car.Id)) { - var min = Math.Min(c.Value.Item2, count); + int min = Math.Min(c.Value.Item2, count); cars[c.Value.Item1.Id] = (c.Value.Item1, c.Value.Item2 - min); count -= min; if (count <= 0) - { break; - } } shop.Update(new ShopBindingModel @@ -138,10 +126,11 @@ namespace AutomobilePlantFileImplement.Implements source.SaveShops(); - if (count <= 0) break; + if (count <= 0) + return true; } - return count <= 0; + return true; } } } diff --git a/AutomobilePlant/AutomobilePlantFileImplement/Models/Shop.cs b/AutomobilePlant/AutomobilePlantFileImplement/Models/Shop.cs index 91f0e4d..172b6c8 100644 --- a/AutomobilePlant/AutomobilePlantFileImplement/Models/Shop.cs +++ b/AutomobilePlant/AutomobilePlantFileImplement/Models/Shop.cs @@ -15,6 +15,7 @@ namespace AutomobilePlantFileImplement.Models public int Id { get; private set; } public string Name { get; private set; } = string.Empty; public string Address { get; private set; } = string.Empty; + public int MaxCountCars { get; private set; } public DateTime OpeningDate { get; private set; } public Dictionary Cars { get; private set; } = new(); private Dictionary? _shopCars = null; @@ -46,6 +47,7 @@ namespace AutomobilePlantFileImplement.Models Id = model.Id, Name = model.Name, Address = model.Address, + MaxCountCars = model.MaxCountCars, OpeningDate = model.OpeningDate, Cars = model.ShopCars.ToDictionary(x => x.Key, x => x.Value.Item2) }; @@ -62,6 +64,7 @@ namespace AutomobilePlantFileImplement.Models Id = Convert.ToInt32(element.Attribute("Id")!.Value), Name = element.Element("Name")!.Value, Address = element.Element("Address")!.Value, + MaxCountCars = Convert.ToInt32(element.Element("MaxCountCars")!.Value), OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value), Cars = element.Element("ShopCars")!.Elements("ShopCar").ToDictionary( x => Convert.ToInt32(x.Element("Key")?.Value), @@ -79,6 +82,7 @@ namespace AutomobilePlantFileImplement.Models } Name = model.Name; Address = model.Address; + MaxCountCars = model.MaxCountCars; OpeningDate = model.OpeningDate; if (model.ShopCars.Count > 0) { @@ -91,6 +95,7 @@ namespace AutomobilePlantFileImplement.Models Id = Id, Name = Name, Address = Address, + MaxCountCars = MaxCountCars, OpeningDate = OpeningDate, ShopCars = ShopCars, }; @@ -100,6 +105,7 @@ namespace AutomobilePlantFileImplement.Models new XAttribute("Id", Id), new XElement("Name", Name), new XElement("Address", Address), + new XElement("MaxCountCars", MaxCountCars), new XElement("OpeningDate", OpeningDate.ToString()), new XElement("ShopCars", Cars.Select(x => new XElement("ShopCar", diff --git a/AutomobilePlant/AutomobilePlantListImplement/Implements/ShopStorage.cs b/AutomobilePlant/AutomobilePlantListImplement/Implements/ShopStorage.cs index 1d4a4bd..a45d459 100644 --- a/AutomobilePlant/AutomobilePlantListImplement/Implements/ShopStorage.cs +++ b/AutomobilePlant/AutomobilePlantListImplement/Implements/ShopStorage.cs @@ -2,6 +2,7 @@ using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.StoragesContracts; using AutomobilePlantContracts.ViewModels; +using AutomobilePlantDataModels.Models; using AutomobilePlantListImplement.Models; using System; using System.Collections.Generic; @@ -13,6 +14,10 @@ namespace AutomobilePlantListImplement.Implements { public class ShopStorage : IShopStorage { + public bool SellCar(ICarModel car, int count) + { + throw new NotImplementedException(); + } private readonly DataListSingleton _source; public ShopStorage() diff --git a/AutomobilePlant/AutomobilePlantListImplement/Models/Shop.cs b/AutomobilePlant/AutomobilePlantListImplement/Models/Shop.cs index 167007d..c1e3c81 100644 --- a/AutomobilePlant/AutomobilePlantListImplement/Models/Shop.cs +++ b/AutomobilePlant/AutomobilePlantListImplement/Models/Shop.cs @@ -14,6 +14,7 @@ namespace AutomobilePlantListImplement.Models public int Id { get; private set; } public string Name { get; private set; } = string.Empty; public string Address { get; private set; } = string.Empty; + public int MaxCountCars { get; private set; } public DateTime OpeningDate { get; private set; } public Dictionary ShopCars { get; private set; } = new(); diff --git a/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs index 08dcb1f..77820d5 100644 --- a/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs +++ b/AutomobilePlant/AutomobilePlantView/FormMain.Designer.cs @@ -32,14 +32,15 @@ toolStripMenuItemCatalogs = new ToolStripMenuItem(); toolStripMenuItemComponents = new ToolStripMenuItem(); toolStripMenuItemCars = new ToolStripMenuItem(); + shopsToolStripMenuItem = new ToolStripMenuItem(); + shopsSupplyToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); - shopsToolStripMenuItem = new ToolStripMenuItem(); - shopsSupplyToolStripMenuItem = new ToolStripMenuItem(); + sellCarsToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -55,7 +56,7 @@ // // toolStripMenuItemCatalogs // - toolStripMenuItemCatalogs.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemComponents, toolStripMenuItemCars, shopsToolStripMenuItem, shopsSupplyToolStripMenuItem }); + toolStripMenuItemCatalogs.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemComponents, toolStripMenuItemCars, shopsToolStripMenuItem, shopsSupplyToolStripMenuItem, sellCarsToolStripMenuItem }); toolStripMenuItemCatalogs.Name = "toolStripMenuItemCatalogs"; toolStripMenuItemCatalogs.Size = new Size(65, 20); toolStripMenuItemCatalogs.Text = "Catalogs"; @@ -74,6 +75,20 @@ toolStripMenuItemCars.Text = "Cars"; toolStripMenuItemCars.Click += CarsToolStripMenuItem_Click; // + // shopsToolStripMenuItem + // + shopsToolStripMenuItem.Name = "shopsToolStripMenuItem"; + shopsToolStripMenuItem.Size = new Size(180, 22); + shopsToolStripMenuItem.Text = "Shops"; + shopsToolStripMenuItem.Click += shopsToolStripMenuItem_Click; + // + // shopsSupplyToolStripMenuItem + // + shopsSupplyToolStripMenuItem.Name = "shopsSupplyToolStripMenuItem"; + shopsSupplyToolStripMenuItem.Size = new Size(180, 22); + shopsSupplyToolStripMenuItem.Text = "Shop's supply"; + shopsSupplyToolStripMenuItem.Click += shopsSupplyToolStripMenuItem_Click; + // // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -133,19 +148,12 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRef_Click; // - // shopsToolStripMenuItem + // sellCarsToolStripMenuItem // - shopsToolStripMenuItem.Name = "shopsToolStripMenuItem"; - shopsToolStripMenuItem.Size = new Size(180, 22); - shopsToolStripMenuItem.Text = "Shops"; - shopsToolStripMenuItem.Click += shopsToolStripMenuItem_Click; - // - // shopsSupplyToolStripMenuItem - // - shopsSupplyToolStripMenuItem.Name = "shopsSupplyToolStripMenuItem"; - shopsSupplyToolStripMenuItem.Size = new Size(180, 22); - shopsSupplyToolStripMenuItem.Text = "Shop's supply"; - shopsSupplyToolStripMenuItem.Click += shopsSupplyToolStripMenuItem_Click; + sellCarsToolStripMenuItem.Name = "sellCarsToolStripMenuItem"; + sellCarsToolStripMenuItem.Size = new Size(180, 22); + sellCarsToolStripMenuItem.Text = "Sell Cars"; + sellCarsToolStripMenuItem.Click += sellCarsToolStripMenuItem_Click; // // FormMain // @@ -183,5 +191,6 @@ private Button buttonRefresh; private ToolStripMenuItem shopsToolStripMenuItem; private ToolStripMenuItem shopsSupplyToolStripMenuItem; + private ToolStripMenuItem sellCarsToolStripMenuItem; } } \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormMain.cs b/AutomobilePlant/AutomobilePlantView/FormMain.cs index 21457ef..79fb19f 100644 --- a/AutomobilePlant/AutomobilePlantView/FormMain.cs +++ b/AutomobilePlant/AutomobilePlantView/FormMain.cs @@ -38,7 +38,6 @@ namespace AutomobilePlantView { dataGridView.DataSource = list; dataGridView.Columns["CarId"].Visible = false; - } _logger.LogInformation("Загрузка заказов"); } @@ -48,6 +47,8 @@ namespace AutomobilePlantView MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + // управление менюшкой private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); @@ -64,6 +65,32 @@ namespace AutomobilePlantView form.ShowDialog(); } } + private void shopsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) + { + form.ShowDialog(); + } + } + private void shopsSupplyToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply)); + if (service is FormShopSupply form) + { + form.ShowDialog(); + } + } + private void sellCarsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShopSell)); + if (service is FormShopSell form) + { + form.ShowDialog(); + } + } + + // управление заказами private void ButtonCreateOrder_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); @@ -158,23 +185,6 @@ namespace AutomobilePlantView LoadData(); } - private void shopsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormShops)); - if (service is FormShops form) - { - form.ShowDialog(); - } - } - - private void shopsSupplyToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply)); - if (service is FormShopSupply form) - { - form.ShowDialog(); - } - } } } diff --git a/AutomobilePlant/AutomobilePlantView/FormShop.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormShop.Designer.cs index dbe21c2..21d05f3 100644 --- a/AutomobilePlant/AutomobilePlantView/FormShop.Designer.cs +++ b/AutomobilePlant/AutomobilePlantView/FormShop.Designer.cs @@ -40,26 +40,28 @@ IdCol = new DataGridViewTextBoxColumn(); CarCol = new DataGridViewTextBoxColumn(); CountCol = new DataGridViewTextBoxColumn(); + textBoxMaxCountCars = new TextBox(); + labelMaxCountCars = new Label(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // // textBoxName // - textBoxName.Location = new Point(100, 6); + textBoxName.Location = new Point(60, 6); textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(378, 23); + textBoxName.Size = new Size(418, 23); textBoxName.TabIndex = 0; // // textBoxAddress // - textBoxAddress.Location = new Point(100, 35); + textBoxAddress.Location = new Point(60, 35); textBoxAddress.Name = "textBoxAddress"; - textBoxAddress.Size = new Size(378, 23); + textBoxAddress.Size = new Size(418, 23); textBoxAddress.TabIndex = 1; // // openingDateTimePicker // - openingDateTimePicker.Location = new Point(100, 64); + openingDateTimePicker.Location = new Point(100, 93); openingDateTimePicker.Name = "openingDateTimePicker"; openingDateTimePicker.Size = new Size(378, 23); openingDateTimePicker.TabIndex = 3; @@ -85,7 +87,7 @@ // labelOpeningDate // labelOpeningDate.AutoSize = true; - labelOpeningDate.Location = new Point(12, 70); + labelOpeningDate.Location = new Point(12, 99); labelOpeningDate.Name = "labelOpeningDate"; labelOpeningDate.Size = new Size(82, 15); labelOpeningDate.TabIndex = 6; @@ -93,7 +95,7 @@ // // buttonSave // - buttonSave.Location = new Point(322, 334); + buttonSave.Location = new Point(322, 363); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(75, 23); buttonSave.TabIndex = 7; @@ -103,7 +105,7 @@ // // buttonCancel // - buttonCancel.Location = new Point(403, 334); + buttonCancel.Location = new Point(403, 363); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(75, 23); buttonCancel.TabIndex = 8; @@ -119,7 +121,7 @@ dataGridView.AllowUserToResizeRows = false; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Columns.AddRange(new DataGridViewColumn[] { IdCol, CarCol, CountCol }); - dataGridView.Location = new Point(12, 93); + dataGridView.Location = new Point(12, 122); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; dataGridView.Size = new Size(466, 235); @@ -142,11 +144,29 @@ CountCol.HeaderText = "Count"; CountCol.Name = "CountCol"; // + // textBoxMaxCountCars + // + textBoxMaxCountCars.Location = new Point(144, 64); + textBoxMaxCountCars.Name = "textBoxMaxCountCars"; + textBoxMaxCountCars.Size = new Size(334, 23); + textBoxMaxCountCars.TabIndex = 10; + // + // labelMaxCountCars + // + labelMaxCountCars.AutoSize = true; + labelMaxCountCars.Location = new Point(12, 67); + labelMaxCountCars.Name = "labelMaxCountCars"; + labelMaxCountCars.Size = new Size(126, 15); + labelMaxCountCars.TabIndex = 11; + labelMaxCountCars.Text = "Maximum cars' count:"; + // // FormShop // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(490, 369); + ClientSize = new Size(490, 396); + Controls.Add(labelMaxCountCars); + Controls.Add(textBoxMaxCountCars); Controls.Add(dataGridView); Controls.Add(buttonCancel); Controls.Add(buttonSave); @@ -157,7 +177,7 @@ Controls.Add(textBoxAddress); Controls.Add(textBoxName); Name = "FormShop"; - Text = "FormShop"; + Text = "Shop"; Load += FormShop_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); @@ -178,5 +198,7 @@ private DataGridViewTextBoxColumn IdCol; private DataGridViewTextBoxColumn CarCol; private DataGridViewTextBoxColumn CountCol; + private TextBox textBoxMaxCountCars; + private Label labelMaxCountCars; } } \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormShop.cs b/AutomobilePlant/AutomobilePlantView/FormShop.cs index cfcfaa6..bd97051 100644 --- a/AutomobilePlant/AutomobilePlantView/FormShop.cs +++ b/AutomobilePlant/AutomobilePlantView/FormShop.cs @@ -45,6 +45,7 @@ namespace AutomobilePlantView { textBoxName.Text = view.Name; textBoxAddress.Text = view.Address; + textBoxMaxCountCars.Text = view.MaxCountCars.ToString(); openingDateTimePicker.Value = view.OpeningDate; _shopCars = view.ShopCars ?? new Dictionary(); LoadData(); @@ -94,6 +95,12 @@ namespace AutomobilePlantView return; } + if (string.IsNullOrEmpty(textBoxMaxCountCars.Text)) + { + MessageBox.Show("Заполните макс. количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); try @@ -103,6 +110,7 @@ namespace AutomobilePlantView Id = _id ?? 0, Name = textBoxName.Text, Address = textBoxAddress.Text, + MaxCountCars = Convert.ToInt32(textBoxMaxCountCars.Text), OpeningDate = openingDateTimePicker.Value.Date, ShopCars = _shopCars }; diff --git a/AutomobilePlant/AutomobilePlantView/FormShop.resx b/AutomobilePlant/AutomobilePlantView/FormShop.resx index 8e413d1..118309e 100644 --- a/AutomobilePlant/AutomobilePlantView/FormShop.resx +++ b/AutomobilePlant/AutomobilePlantView/FormShop.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormShopSell.Designer.cs b/AutomobilePlant/AutomobilePlantView/FormShopSell.Designer.cs new file mode 100644 index 0000000..14f9ed9 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormShopSell.Designer.cs @@ -0,0 +1,119 @@ +namespace AutomobilePlantView +{ + partial class FormShopSell + { + /// + /// 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() + { + labelCar = new Label(); + labelCount = new Label(); + comboBoxCar = new ComboBox(); + textBoxCount = new TextBox(); + buttonCancel = new Button(); + buttonSell = new Button(); + SuspendLayout(); + // + // labelCar + // + labelCar.AutoSize = true; + labelCar.Location = new Point(12, 9); + labelCar.Name = "labelCar"; + labelCar.Size = new Size(28, 15); + labelCar.TabIndex = 0; + labelCar.Text = "Car:"; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(12, 38); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(43, 15); + labelCount.TabIndex = 1; + labelCount.Text = "Count:"; + // + // comboBoxCar + // + comboBoxCar.FormattingEnabled = true; + comboBoxCar.Location = new Point(61, 6); + comboBoxCar.Name = "comboBoxCar"; + comboBoxCar.Size = new Size(324, 23); + comboBoxCar.TabIndex = 2; + // + // textBoxCount + // + textBoxCount.Location = new Point(61, 35); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(324, 23); + textBoxCount.TabIndex = 3; + // + // buttonCancel + // + buttonCancel.Location = new Point(229, 64); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(75, 23); + buttonCancel.TabIndex = 4; + buttonCancel.Text = "Cancel"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // buttonSell + // + buttonSell.Location = new Point(310, 64); + buttonSell.Name = "buttonSell"; + buttonSell.Size = new Size(75, 23); + buttonSell.TabIndex = 5; + buttonSell.Text = "Sell"; + buttonSell.UseVisualStyleBackColor = true; + buttonSell.Click += buttonSell_Click; + // + // FormShopSell + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(397, 93); + Controls.Add(buttonSell); + Controls.Add(buttonCancel); + Controls.Add(textBoxCount); + Controls.Add(comboBoxCar); + Controls.Add(labelCount); + Controls.Add(labelCar); + Name = "FormShopSell"; + Text = "Sell"; + Load += FormShopSell_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelCar; + private Label labelCount; + private ComboBox comboBoxCar; + private TextBox textBoxCount; + private Button buttonCancel; + private Button buttonSell; + } +} \ No newline at end of file diff --git a/AutomobilePlant/AutomobilePlantView/FormShopSell.cs b/AutomobilePlant/AutomobilePlantView/FormShopSell.cs new file mode 100644 index 0000000..5d0cd15 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormShopSell.cs @@ -0,0 +1,95 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.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 AutomobilePlantView +{ + public partial class FormShopSell : Form + { + private readonly ILogger _logger; + private readonly ICarLogic _logicCar; + private readonly IShopLogic _logicShop; + + public FormShopSell(ILogger logger, ICarLogic logicCar, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicCar = logicCar; + _logicShop = logicShop; + } + + private void FormShopSell_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка авто для продажи"); + try + { + var list = _logicCar.ReadList(null); + if (list != null) + { + comboBoxCar.DisplayMember = "CarName"; + comboBoxCar.ValueMember = "Id"; + comboBoxCar.DataSource = list; + comboBoxCar.SelectedItem = null; + } + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка авто"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonSell_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxCar.SelectedValue == null) + { + MessageBox.Show("Выберите авто", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Создание продажи"); + try + { + var operationResult = _logicShop.SellCar( + new CarBindingModel + { + Id = Convert.ToInt32(comboBoxCar.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/AutomobilePlant/AutomobilePlantView/FormShopSell.resx b/AutomobilePlant/AutomobilePlantView/FormShopSell.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutomobilePlant/AutomobilePlantView/FormShopSell.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/AutomobilePlant/AutomobilePlantView/Program.cs b/AutomobilePlant/AutomobilePlantView/Program.cs index 0f6e74d..eff8d71 100644 --- a/AutomobilePlant/AutomobilePlantView/Program.cs +++ b/AutomobilePlant/AutomobilePlantView/Program.cs @@ -52,6 +52,7 @@ namespace AutomobilePlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file