From 9a30c35fad4d25590e20aae92c3e3c4d2308f542 Mon Sep 17 00:00:00 2001 From: ujijrujijr Date: Tue, 23 Apr 2024 21:55:59 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=81=D0=B2=D1=8F=D0=B7=D0=B8=20=D0=BC=D0=B5=D0=B6=D0=B4=D1=83?= =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D1=82=D0=B8=D1=8F=D0=BC=D0=B8/=D0=B7?= =?UTF-8?q?=D0=B0=D1=8F=D0=B2=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=D0=BC=D0=B8=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?,=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D0=B2.=20=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B1=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/OrderBindingModel.cs | 6 +++-- .../BindingModels/RequestBindingModel.cs | 5 ++++ .../BindingModels/ShipmentBindingModel.cs | 2 ++ .../SearchModels/OrderSearchModel.cs | 2 -- .../SearchModels/RequestSearchModel.cs | 2 ++ .../SearchModels/ShipmentSearchModel.cs | 2 ++ .../ViewModels/OrderViewModel.cs | 7 ++++-- .../ViewModels/RequestViewModel.cs | 5 +++- .../ViewModels/ShipmentViewModel.cs | 6 ++++- ComputerShopDataModels/Models/IOrderModel.cs | 13 +++------- .../Models/IRequestModel.cs | 2 +- .../Models/IShipmentModel.cs | 5 ++++ .../ComputerShopDatabaseImplement.csproj | 4 +++ ComputerShopDatabaseImplement/Models/User.cs | 25 +++++++++++++++++++ 14 files changed, 68 insertions(+), 18 deletions(-) create mode 100644 ComputerShopDatabaseImplement/Models/User.cs diff --git a/ComputerShopContracts/BindingModels/OrderBindingModel.cs b/ComputerShopContracts/BindingModels/OrderBindingModel.cs index 0caef7e..ca040d2 100644 --- a/ComputerShopContracts/BindingModels/OrderBindingModel.cs +++ b/ComputerShopContracts/BindingModels/OrderBindingModel.cs @@ -14,9 +14,11 @@ namespace ComputerShopContracts.BindingModels public int UserId { get; set; } - public Dictionary OrderRequests { get; set; } = new(); + //!!!УДАЛИТЬ (после того, как нормально будут многие-ко-многим между заказами и заявками) + //public Dictionary OrderRequests { get; set; } = new(); - public Dictionary OrderShipments { get; set; } = new(); + //!!!УДАЛИТЬ (после того, как нормально будут многие-ко-многим между заказами и партиями) + //public Dictionary OrderShipments { get; set; } = new(); public DateTime DateCreate { get; set; } = DateTime.Now; diff --git a/ComputerShopContracts/BindingModels/RequestBindingModel.cs b/ComputerShopContracts/BindingModels/RequestBindingModel.cs index 1099c61..eef6ad9 100644 --- a/ComputerShopContracts/BindingModels/RequestBindingModel.cs +++ b/ComputerShopContracts/BindingModels/RequestBindingModel.cs @@ -13,11 +13,16 @@ namespace ComputerShopContracts.BindingModels public int UserId { get; set; } + //!!!ДОБАВИТЬ ССЫЛКУ НА СБОРКУ + + public DateTime DateMake { get; set; } = DateTime.Now; //!!!МБ НЕ НАДО string.Empty public string ClientFIO { get; set; } = string.Empty; + public Dictionary RequestOrders { get; set; } = new(); + //!!!ДОБАВИТЬ СТАТУС, ЕСЛИ БУДЕТ В ОБЫЧНОЙ МОДЕЛИ } } diff --git a/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs b/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs index ccde416..a570d71 100644 --- a/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs +++ b/ComputerShopContracts/BindingModels/ShipmentBindingModel.cs @@ -17,5 +17,7 @@ namespace ComputerShopContracts.BindingModels public string ProviderName { get; set; } = string.Empty; public DateTime DateShipment { get; set; } = DateTime.Now; + + public Dictionary ShipmentOrders { get; set; } = new(); } } diff --git a/ComputerShopContracts/SearchModels/OrderSearchModel.cs b/ComputerShopContracts/SearchModels/OrderSearchModel.cs index ffd8143..9550bca 100644 --- a/ComputerShopContracts/SearchModels/OrderSearchModel.cs +++ b/ComputerShopContracts/SearchModels/OrderSearchModel.cs @@ -12,8 +12,6 @@ namespace ComputerShopContracts.SearchModels public int? Id { get; set; } public int? UserId { get; set; } - //!!!МБ НАДО ДОБАВИТЬ ПОИСК ПО ЗАЯВКАМ/ПАРТИЯМ ТОВАРОВ - public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/ComputerShopContracts/SearchModels/RequestSearchModel.cs b/ComputerShopContracts/SearchModels/RequestSearchModel.cs index f049aae..c696ba4 100644 --- a/ComputerShopContracts/SearchModels/RequestSearchModel.cs +++ b/ComputerShopContracts/SearchModels/RequestSearchModel.cs @@ -13,6 +13,8 @@ namespace ComputerShopContracts.SearchModels //!!!ДОБАВИТЬ ПОИСК ПО СБОРКЕ (СУЩНОСТИ ОЛЕГА) + //!!!мб надо добавить поиск по заказам + public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/ComputerShopContracts/SearchModels/ShipmentSearchModel.cs b/ComputerShopContracts/SearchModels/ShipmentSearchModel.cs index 6e4af7d..d5001f1 100644 --- a/ComputerShopContracts/SearchModels/ShipmentSearchModel.cs +++ b/ComputerShopContracts/SearchModels/ShipmentSearchModel.cs @@ -10,6 +10,8 @@ namespace ComputerShopContracts.SearchModels { public int? Id { get; set; } public int? UserId { get; set; } + + //!!!мб надо добавить поиск по заказам public string? ProviderName { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/ComputerShopContracts/ViewModels/OrderViewModel.cs b/ComputerShopContracts/ViewModels/OrderViewModel.cs index bbc6cc2..dca947b 100644 --- a/ComputerShopContracts/ViewModels/OrderViewModel.cs +++ b/ComputerShopContracts/ViewModels/OrderViewModel.cs @@ -19,8 +19,11 @@ namespace ComputerShopContracts.ViewModels public int UserId { get; set; } //!!!ТУТ МБ НАДО DisplayName (НО ВЯРД ЛИ) - public Dictionary OrderRequests { get; set; } = new(); - public Dictionary OrderShipments { get; set; } = new(); + + //!!!УДАЛИТЬ (если нормально работает многие-ко-многим) + + //public Dictionary OrderRequests { get; set; } = new(); + //public Dictionary OrderShipments { get; set; } = new(); //!!!МБ НЕ НУЖНО DateTime.Now [DisplayName("Дата оформления")] diff --git a/ComputerShopContracts/ViewModels/RequestViewModel.cs b/ComputerShopContracts/ViewModels/RequestViewModel.cs index bee1b3c..ab73799 100644 --- a/ComputerShopContracts/ViewModels/RequestViewModel.cs +++ b/ComputerShopContracts/ViewModels/RequestViewModel.cs @@ -1,4 +1,5 @@ -using System; +using ComputerShopDataModels.Models; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -20,6 +21,8 @@ namespace ComputerShopContracts.ViewModels //!!!МБ ДОБАВИТЬ ID СБОРКИ + public Dictionary RequestOrders { get; set; } = new(); + //!!!МБ НЕ НУЖНО DateTime.Now [DisplayName("Дата оформления")] public DateTime DateMake { get; set; } = DateTime.Now; diff --git a/ComputerShopContracts/ViewModels/ShipmentViewModel.cs b/ComputerShopContracts/ViewModels/ShipmentViewModel.cs index 5b5fc7d..289852f 100644 --- a/ComputerShopContracts/ViewModels/ShipmentViewModel.cs +++ b/ComputerShopContracts/ViewModels/ShipmentViewModel.cs @@ -1,4 +1,5 @@ -using System; +using ComputerShopDataModels.Models; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -19,6 +20,9 @@ namespace ComputerShopContracts.ViewModels //!!!МБ ДОБАВИТЬ НИК ПОЛЬЗОВАТЕЛЯ, СОЗДАВШЕГО ПАРТИЮ + + public Dictionary ShipmentOrders { get; set; } = new(); + //!!!МБ НЕ НУЖЕН string.Empty [DisplayName("Поставщик")] public string ProviderName { get; set; } = string.Empty; diff --git a/ComputerShopDataModels/Models/IOrderModel.cs b/ComputerShopDataModels/Models/IOrderModel.cs index f5a66f8..0635539 100644 --- a/ComputerShopDataModels/Models/IOrderModel.cs +++ b/ComputerShopDataModels/Models/IOrderModel.cs @@ -12,23 +12,18 @@ namespace ComputerShopDataModels.Models //ID пользователя, который создал заказ int UserId { get; } + //!!!УДАЛИТЬ (после того, как нормально будут многие-ко-многим между заказами и партиями) /// /// Заявки в заказе (может не быть) /// - Dictionary? OrderRequests { get; } + //Dictionary? OrderRequests { get; } - //!!!УДАЛИТЬ - //ID заявки (может быть пустым) - //int? RequestId { get; } - - //!!!УДАЛИТЬ - //ID партии товаров (может быть пустым) - //int? ShipmentId { get; } + //!!!УДАЛИТЬ (после того, как нормально будут многие-ко-многим между заказами и партиями) /// /// Партии товаров в заказе (может не быть) /// - Dictionary? OrderShipments { get; } + //Dictionary? OrderShipments { get; } diff --git a/ComputerShopDataModels/Models/IRequestModel.cs b/ComputerShopDataModels/Models/IRequestModel.cs index be173b1..ed3c073 100644 --- a/ComputerShopDataModels/Models/IRequestModel.cs +++ b/ComputerShopDataModels/Models/IRequestModel.cs @@ -21,7 +21,7 @@ namespace ComputerShopDataModels.Models //!!!ДОБАВИТЬ ССЫЛКУ НА СБОРКУ ИЗ ЧАСТИ ОЛЕГА - + Dictionary RequestOrders { get; } /// /// Дата создания заявки diff --git a/ComputerShopDataModels/Models/IShipmentModel.cs b/ComputerShopDataModels/Models/IShipmentModel.cs index 704647d..a771ad2 100644 --- a/ComputerShopDataModels/Models/IShipmentModel.cs +++ b/ComputerShopDataModels/Models/IShipmentModel.cs @@ -23,5 +23,10 @@ namespace ComputerShopDataModels.Models /// Дата поставки /// DateTime DateShipment { get; } + + /// + /// Заказы, в которых участвует партия товаров + /// + Dictionary ShipmentOrders { get; } } } diff --git a/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj b/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj index 26b239e..b721344 100644 --- a/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj +++ b/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/ComputerShopDatabaseImplement/Models/User.cs b/ComputerShopDatabaseImplement/Models/User.cs new file mode 100644 index 0000000..48bbaa5 --- /dev/null +++ b/ComputerShopDatabaseImplement/Models/User.cs @@ -0,0 +1,25 @@ +using ComputerShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputerShopDatabaseImplement.Models +{ + public class User : IUserModel + { + public int Id { get; private set; } + + [Required] + public string Login { get; set; } = string.Empty; + + [Required] + public string Password { get; set; } = string.Empty; + + //!!!МБ ТУТ НУЖНА ДОП. АННОТАЦИЯ ПРОВЕРКИ ПОЧТЫ + [Required] + public string Email { get; set; } = string.Empty; + } +}