From adafe6d8eab380b81fa1d73155b94d5ce24a4cc5 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Sun, 12 Mar 2023 16:01:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FurnitureAssemFileImplement/Implements/ShopStorage.cs | 3 ++- FurnitureAssembly/FurnitureAssembly/FormSell.cs | 1 + FurnitureAssembly/FurnitureAssembly/FormShop.Designer.cs | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/FurnitureAssembly/FurnitureAssemFileImplement/Implements/ShopStorage.cs b/FurnitureAssembly/FurnitureAssemFileImplement/Implements/ShopStorage.cs index 7b77cdc..f90fe45 100644 --- a/FurnitureAssembly/FurnitureAssemFileImplement/Implements/ShopStorage.cs +++ b/FurnitureAssembly/FurnitureAssemFileImplement/Implements/ShopStorage.cs @@ -124,6 +124,7 @@ namespace FurnitureAssemFileImplement.Implements }); break; } + count -= shop.Furnitures[furniture.Id].Item2; shop.Furnitures[furniture.Id] = (shop.Furnitures[furniture.Id].Item1, 0); shop.Update(new ShopBindingModel { @@ -134,7 +135,7 @@ namespace FurnitureAssemFileImplement.Implements Address = shop.Address, DateOpening = shop.DateOpening, }); - count -= shop.Furnitures[furniture.Id].Item2; + } } source.SaveShops(); diff --git a/FurnitureAssembly/FurnitureAssembly/FormSell.cs b/FurnitureAssembly/FurnitureAssembly/FormSell.cs index 7a5fe9f..efe5584 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormSell.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormSell.cs @@ -106,6 +106,7 @@ namespace FurnitureAssembly { MessageBox.Show("Не удалось продать изделие " + FurnitureModel.FurnitureName, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; } MessageBox.Show("Продажа прошла успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/FurnitureAssembly/FurnitureAssembly/FormShop.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormShop.Designer.cs index 52d32f1..ba32c9c 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormShop.Designer.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormShop.Designer.cs @@ -154,9 +154,9 @@ this.labelMaxCount.AutoSize = true; this.labelMaxCount.Location = new System.Drawing.Point(35, 141); this.labelMaxCount.Name = "labelMaxCount"; - this.labelMaxCount.Size = new System.Drawing.Size(40, 15); + this.labelMaxCount.Size = new System.Drawing.Size(80, 15); this.labelMaxCount.TabIndex = 10; - this.labelMaxCount.Text = "Адрес"; + this.labelMaxCount.Text = "Вместимость"; // // FormShop //