Добавлены некоторые модели

ComputerShopProvider/ComputerShopContracts/BindingModels/EquipmentReceivingBindingModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+
+namespace ComputerShopContracts.BindingModels
+{
+    public class EquipmentReceivingBindingModel : IEquipmentReceivingModel
+    {
+        public int Id { get; set; }
+        public EquipmentReceivingStatus Status { get; set; } = EquipmentReceivingStatus.Неизвестен;
+
+        public DateTime? DateImplement { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/BindingModels/OrderBindingModel.cs

@@ -0,0 +1,23 @@
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.BindingModels
+{
+    public class OrderBindingModel : IOrderModel
+    {
+        public int Id { get; set; }
+        public double Sum { get; set; }
+
+        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+
+        public DateTime DateCreate { get; set; }
+
+        public DateTime? DateImplement { get; set; } = DateTime.Now;
+
+    }
+}

ComputerShopProvider/ComputerShopContracts/BindingModels/SupplyBindingModel.cs

@@ -0,0 +1,24 @@
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.BindingModels
+{
+    public class SupplyBindingModel : ISupplyModel
+    {
+        public int Id { get; set; }
+        public SupplyStatus Status { get; set; } = SupplyStatus.Неизвестен;
+
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+
+        public DateTime? DateImplement { get; set; }
+
+        public int OrderId { get; set; }
+
+        public int ReceivingId { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/BusinessLogicContracts/IEquipmentReceivingLogic.cs

@@ -0,0 +1,20 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.BusinessLogicContracts
+{
+    public interface IEquipmentReceivingLogic
+    {
+        List<EquipmentReceivingViewModel>? ReadList(EquipmentReceivingSearchModel? model);
+        bool CreateOrder(EquipmentReceivingBindingModel model);
+        bool TakeOrderInWork(EquipmentReceivingBindingModel model);
+        bool FinishOrder(EquipmentReceivingBindingModel model);
+        bool DeliveryOrder(EquipmentReceivingBindingModel model);
+    }
+}

ComputerShopProvider/ComputerShopContracts/BusinessLogicContracts/IOrderLogic.cs

@@ -0,0 +1,23 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.BusinessLogicContracts
+{
+    public interface IOrderLogic
+    {
+        List<OrderViewModel>? ReadList(OrderSearchModel? model);
+        OrderViewModel? ReadElement(OrderSearchModel model);
+        bool CreateOrder(OrderBindingModel model);
+        bool Update(ComponentBindingModel model);
+        bool Delete(ComponentBindingModel model);
+        bool TakeOrderInWork(OrderBindingModel model);
+        bool FinishOrder(OrderBindingModel model);
+        bool DeliveryOrder(OrderBindingModel model);
+    }
+}

ComputerShopProvider/ComputerShopContracts/BusinessLogicContracts/ISupplyLogic.cs

@@ -0,0 +1,24 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.BusinessLogicContracts
+{
+    public interface ISupplyLogic
+    {
+        List<SupplyViewModel>? ReadList(SupplySearchModel? model);
+        SupplyViewModel? ReadElement(SupplySearchModel model);
+        bool Create(SupplyBindingModel model);
+        bool Update(SupplyBindingModel model);
+        bool Delete(SupplyBindingModel model);
+        bool CreateOrder(PurchaseBindingModel model);
+        bool TakeOrderInWork(PurchaseBindingModel model);
+        bool FinishOrder(PurchaseBindingModel model);
+        bool DeliveryOrder(PurchaseBindingModel model);
+    }
+}

ComputerShopProvider/ComputerShopContracts/SearchModels/EquipmentReceivingSearchModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.SearchModels
+{
+    public class EquipmentReceivingSearchModel
+    {
+        public int? Id { get; set; }
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/SearchModels/OrderSearchModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.SearchModels
+{
+    public class OrderSearchModel
+    {
+        public int? Id { get; set; }
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/SearchModels/SupplySearchModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.SearchModels
+{
+    public class SupplySearchModel
+    {
+        public int? Id { get; set; }
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/StorageContracts/IEquipmentReceivingStorage.cs

@@ -0,0 +1,21 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.StorageContracts
+{
+    public interface IEquipmentReceivingStorage 
+    {
+        List<EquipmentReceivingViewModel> GetFullList();
+        List<EquipmentReceivingViewModel> GetFilteredList(EquipmentReceivingSearchModel model);
+        EquipmentReceivingViewModel? GetElement(EquipmentReceivingSearchModel model);
+        EquipmentReceivingViewModel? Insert(EquipmentReceivingBindingModel model);
+        EquipmentReceivingViewModel? Update(EquipmentReceivingBindingModel model);
+        EquipmentReceivingViewModel? Delete(EquipmentReceivingBindingModel model);
+    }
+}

ComputerShopProvider/ComputerShopContracts/StorageContracts/IOrderStorage.cs

@@ -0,0 +1,21 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.StorageContracts
+{
+    public interface IOrderStorage
+    {
+        List<OrderViewModel> GetFullList();
+        List<OrderViewModel> GetFilteredList(OrderSearchModel model);
+        OrderViewModel? GetElement(OrderSearchModel model);
+        OrderViewModel? Insert(OrderBindingModel model);
+        OrderViewModel? Update(OrderBindingModel model);
+        OrderViewModel? Delete(OrderBindingModel model);
+    }
+}

ComputerShopProvider/ComputerShopContracts/StorageContracts/ISupplyStorage.cs

@@ -0,0 +1,21 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.StorageContracts
+{
+    public interface ISupplyStorage
+    {
+        List<SupplyViewModel> GetFullList();
+        List<SupplyViewModel> GetFilteredList(SupplySearchModel model);
+        SupplyViewModel? GetElement(SupplySearchModel model);
+        SupplyViewModel? Insert(SupplyBindingModel model);
+        SupplyViewModel? Update(SupplyBindingModel model);
+        SupplyViewModel? Delete(SupplyBindingModel model);
+    }
+}

ComputerShopProvider/ComputerShopContracts/ViewModels/EquipmentReceivingViewModel.cs

@@ -0,0 +1,23 @@
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.ViewModels
+{
+    public class EquipmentReceivingViewModel : IEquipmentReceivingModel
+    {
+        [DisplayName("Статус")]
+        public EquipmentReceivingStatus Status { get; set; } = EquipmentReceivingStatus.Неизвестен;
+
+        [DisplayName("Дата выполнения")]
+        public DateTime? DateImplement { get; set; }
+
+        [DisplayName("Номер")]
+        public int Id { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/ViewModels/OrderViewModel.cs

@@ -0,0 +1,30 @@
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.ViewModels
+{
+    public class OrderViewModel : IOrderModel
+    {
+        [DisplayName("Сумма")]
+        public double Sum { get; set; }
+
+        [DisplayName("Статус")]
+        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+
+        [DisplayName("Дата создания")]
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+
+
+        [DisplayName("Дата выполнения")]
+        public DateTime? DateImplement { get; set; }
+
+        [DisplayName("Номер")]
+        public int Id { get; set; }
+    }
+}

ComputerShopProvider/ComputerShopContracts/ViewModels/SupplyViewModel.cs

@@ -0,0 +1,43 @@
+using ComputerShopDataModels.Enums;
+using ComputerShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopContracts.ViewModels
+{
+    public class SupplyViewModel : ISupplyModel
+    {
+        [DisplayName("Статус")]
+        public SupplyStatus Status { get; set; } = SupplyStatus.Неизвестен;
+
+        [DisplayName("Дата создания")]
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+
+        [DisplayName("Дата выполнения")]
+        public DateTime? DateImplement { get; set; }
+
+        [DisplayName("Номер заказа")]
+        public int OrderId { get; set; }
+
+        [DisplayName("Номер получения")]
+        public int ReceivingId { get; set; }
+
+        [DisplayName("Номер")]
+        public int Id { get; set; }
+
+
+
+
+
+
+
+
+
+
+
+    }
+}

ComputerShopProvider/ComputerShopDataModels/Enums/EquipmentReceivingStatus.cs

@@ -0,0 +1,9 @@
+namespace ComputerShopDataModels.Enums
+{
+    public enum EquipmentReceivingStatus
+    {
+        Неизвестен = -1,
+        Ожидается = 0,
+        Получено = 1
+    }
+}

ComputerShopProvider/ComputerShopDataModels/Enums/OrderStatus.cs

@@ -0,0 +1,11 @@
+namespace ComputerShopDataModels.Enums
+{
+    public enum OrderStatus
+    {
+        Неизвестен = -1,
+        Принят = 0,
+        Выполняется = 1,
+        Готов = 2,
+        Выдан = 3
+    }
+}

ComputerShopProvider/ComputerShopDataModels/Enums/SupplyStatus.cs

@@ -0,0 +1,9 @@
+namespace ComputerShopDataModels.Enums
+{
+    public enum SupplyStatus
+    {
+        Неизвестен = -1,
+        Отправляется = 0,
+        Отправлено = 1
+    }
+}

ComputerShopProvider/ComputerShopDataModels/Models/IEquipmentReceivingModel.cs

@@ -0,0 +1,10 @@
+using ComputerShopDataModels.Enums;
+
+namespace ComputerShopDataModels.Models
+{
+    public interface IEquipmentReceivingModel : IId
+    {
+        EquipmentReceivingStatus Status { get; }
+        DateTime? DateImplement { get; }
+    }
+}

ComputerShopProvider/ComputerShopDataModels/Models/IOrderModel.cs

@@ -0,0 +1,12 @@
+using ComputerShopDataModels.Enums;
+
+namespace ComputerShopDataModels.Models
+{
+    public interface IOrderModel : IId
+    {
+        double Sum { get; }
+        OrderStatus Status { get; }
+        DateTime DateCreate { get; }
+        DateTime? DateImplement { get; }
+    }
+}

ComputerShopProvider/ComputerShopDataModels/Models/ISupplyModel.cs

@@ -0,0 +1,13 @@
+using ComputerShopDataModels.Enums;
+
+namespace ComputerShopDataModels.Models
+{
+    public interface ISupplyModel : IId
+    {
+        SupplyStatus Status { get; }
+        DateTime DateCreate { get; }
+        DateTime? DateImplement { get; }
+        int OrderId { get; }
+        int ReceivingId { get; }
+    }
+}

ComputerShopProvider/ComputerShopDatabaseImplement/ComputerShopDatabase.cs

@@ -23,5 +23,9 @@ namespace ComputerShopDatabaseImplement
         public virtual DbSet<Assembly> Assemblies { set; get; }
         public virtual DbSet<AssemblyComponent> AssemblyComponents { set; get; }
         public virtual DbSet<Purchase> Purchases { set; get; }
+        public virtual DbSet<Order> Orders { set; get; }
+        public virtual DbSet<Supply> Supplies { set; get; }
+        public virtual DbSet<SupplyOrder> SupplyOrders { set; get; }
+        public virtual DbSet<EquipmentReceiving> EquipmentReceivings { set; get; }
     }
 }

ComputerShopProvider/ComputerShopDatabaseImplement/Implements/OrderStorage.cs

@@ -0,0 +1,49 @@
+using ComputerShopContracts.BindingModels;
+using ComputerShopContracts.SearchModels;
+using ComputerShopContracts.StorageContracts;
+using ComputerShopContracts.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopDatabaseImplement.Implements
+{
+    internal class OrderStorage : IOrderStorage
+    {
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<OrderViewModel> GetFullList()
+        {
+            using var context = new ComputerShopDatabase();
+            return context.Orders
+            .Select(x => x.GetViewModel)
+            .ToList();
+        }
+
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ComputerShopProvider/ComputerShopDatabaseImplement/Models/Order.cs

@@ -0,0 +1,73 @@
+using ComputerShopContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using ComputerShopDataModels.Enums;
+using ComputerShopContracts.ViewModels;
+using ComputerShopDataModels.Models;
+
+namespace ComputerShopDatabaseImplement.Models
+{
+    internal class Order : IOrderModel
+    {
+        public int Id { get; private set; }
+        [Required]
+        public double Sum { get; private set; }
+        [Required]
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+        [Required]
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+
+        public DateTime? DateImplement { get; private set; }
+        [ForeignKey("OrderId")]
+        public virtual List<SupplyOrder> SupplyOrders { get; set; } =
+        new();
+        public static Order? Create(OrderBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
+        public static Order Create(OrderViewModel model)
+        {
+            return new Order
+            {
+                Id = model.Id,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
+        public void Update(OrderBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+        }
+        public OrderViewModel GetViewModel => new()
+        {
+            Id = Id,
+            Sum = Sum,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+        };
+    }
+}

ComputerShopProvider/ComputerShopDatabaseImplement/Models/SupplyOrder.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputerShopDatabaseImplement.Models
+{
+    internal class SupplyOrder
+    {
+        public int Id { get; set; }
+        [Required]
+        public int SupplyId { get; set; }
+        [Required]
+        public int OrderId { get; set; }
+        [Required]
+        public int Count { get; set; }
+        public virtual Order Order { get; set; } = new();
+        public virtual Supply Supply { get; set; } = new();
+    }
+}