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; }