Информация о клиенте добавлена в модель заказа

This commit is contained in:
Никита Потапов 2024-04-06 23:04:10 +04:00
parent 0e1780a96a
commit d67e4acbb8
4 changed files with 12 additions and 4 deletions

View File

@ -7,6 +7,7 @@ namespace SecuritySystemContracts.BindingModels
{ {
public int Id { get; set; } public int Id { get; set; }
public int SecureId { get; set; } public int SecureId { get; set; }
public int ClientId { get; set; }
public int Count { get; set; } public int Count { get; set; }
public double Sum { get; set; } public double Sum { get; set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

View File

@ -8,7 +8,10 @@ namespace SecuritySystemContracts.ViewModels
{ {
[DisplayName("Номер")] [DisplayName("Номер")]
public int Id { get; set; } public int Id { get; set; }
public int ClientId { get; set; }
public int SecureId { get; set; } public int SecureId { get; set; }
[DisplayName("ФИО клиента")]
public string ClientFIO { get; set; }
[DisplayName("Изделие")] [DisplayName("Изделие")]
public string SecureName { get; set; } = string.Empty; public string SecureName { get; set; } = string.Empty;
[DisplayName("Количество")] [DisplayName("Количество")]

View File

@ -5,6 +5,7 @@ namespace SecuritySystemDataModels.Models
public interface IOrderModel : IId public interface IOrderModel : IId
{ {
int SecureId { get; } int SecureId { get; }
int ClientId { get; }
int Count { get; } int Count { get; }
double Sum { get; } double Sum { get; }
OrderStatus Status { get; } OrderStatus Status { get; }

View File

@ -11,7 +11,8 @@ namespace SecuritySystemDatabaseImplement.Models
public int Id { get; private set; } public int Id { get; private set; }
[Required] [Required]
public int SecureId { get; private set; } public int SecureId { get; private set; }
[Required]
public int ClientId { get; private set; }
[Required] [Required]
public int Count { get; private set; } public int Count { get; private set; }
[Required] [Required]
@ -20,10 +21,9 @@ namespace SecuritySystemDatabaseImplement.Models
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
[Required] [Required]
public DateTime DateCreate { get; private set; } = DateTime.Now; public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; } public DateTime? DateImplement { get; private set; }
public virtual Secure Secure { get; private set; } public virtual Secure Secure { get; private set; }
public virtual Client Client { get; private set; }
public static Order? Create(OrderBindingModel? model) public static Order? Create(OrderBindingModel? model)
{ {
if (model == null) if (model == null)
@ -33,6 +33,7 @@ namespace SecuritySystemDatabaseImplement.Models
return new Order return new Order
{ {
SecureId = model.SecureId, SecureId = model.SecureId,
ClientId = model.ClientId,
Count = model.Count, Count = model.Count,
Sum = model.Sum, Sum = model.Sum,
Status = model.Status, Status = model.Status,
@ -55,13 +56,15 @@ namespace SecuritySystemDatabaseImplement.Models
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel => new()
{ {
SecureId = SecureId, SecureId = SecureId,
ClientId = ClientId,
Count = Count, Count = Count,
Sum = Sum, Sum = Sum,
DateCreate = DateCreate, DateCreate = DateCreate,
DateImplement = DateImplement, DateImplement = DateImplement,
Id = Id, Id = Id,
Status = Status, Status = Status,
SecureName = Secure.SecureName SecureName = Secure.SecureName,
ClientFIO = Client.ClientFIO
}; };
} }
} }