From 452f66187c9827384c26da5168b128fc1916ba7e Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Mon, 22 Apr 2024 10:12:59 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=20ImplementerId=20=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D1=8F=D1=85=20=D0=B7=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0,=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BE?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B1=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecuritySystemBusinessLogic/BusinessLogics/OrderLogic.cs | 2 ++ .../SecuritySystemContracts/BindingModels/OrderBindingModel.cs | 2 +- .../SecuritySystemContracts/ViewModels/OrderViewModel.cs | 2 +- SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/OrderLogic.cs b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/OrderLogic.cs index 43bd209..12dae88 100644 --- a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/OrderLogic.cs @@ -60,6 +60,8 @@ namespace SecuritySystemBusinessLogic.BusinessLogics _logger.LogWarning("Status change operation failed"); throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный"); } + if (element.ImplementerId.HasValue) + model.ImplementerId = element.ImplementerId; OrderStatus oldStatus = model.Status; model.Status = status; if (model.Status == OrderStatus.Выдан) diff --git a/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs index 7411a2c..c448804 100644 --- a/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs @@ -8,7 +8,7 @@ namespace SecuritySystemContracts.BindingModels public int Id { get; set; } public int SecureId { get; set; } public int ClientId { get; set; } - public int ImplementerId { get; set; } + public int? ImplementerId { get; set; } public int Count { get; set; } public double Sum { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs index 9c31d36..98ea577 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs @@ -10,7 +10,7 @@ namespace SecuritySystemContracts.ViewModels public int Id { get; set; } public int ClientId { get; set; } public int SecureId { get; set; } - public int ImplementerId { get; set; } + public int? ImplementerId { get; set; } [DisplayName("ФИО клиента")] public string ClientFIO { get; set; } = string.Empty; [DisplayName("Изделие")] diff --git a/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs b/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs index 4a4deab..ed60c7a 100644 --- a/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs +++ b/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs @@ -6,7 +6,7 @@ namespace SecuritySystemDataModels.Models { int SecureId { get; } int ClientId { get; } - int ImplementerId { get; } + int? ImplementerId { get; } int Count { get; } double Sum { get; } OrderStatus Status { get; }