Шаг 8. Лаба сдана

PrecastConcretePlant/PrecastConcretePlant/FormCreateOrder.cs

@@ -12,7 +12,6 @@ using PrecastConcretePlantContracts.BusinessLogicsContracts;
 using PrecastConcretePlantContracts.SearchModels;
 using Microsoft.Extensions.Logging;
 
-
 namespace PrecastConcretePlantView
 {
     public partial class FormCreateOrder : Form
@@ -109,6 +108,7 @@ namespace PrecastConcretePlantView
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
                     ReinforcedId = Convert.ToInt32(ReinforcedComboBox.SelectedValue),
+                    ReinforcedName = ReinforcedComboBox.Text,
                     Count = Convert.ToInt32(CountTextBox.Text),
                     Sum = Convert.ToDouble(SumTextBox.Text)
                 });

PrecastConcretePlant/PrecastConcretePlant/FormMain.cs

@@ -99,6 +99,7 @@ namespace PrecastConcretePlantView
                     { 
                         Id = id,
                         ReinforcedId = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["ReinforcedId"].Value),
+                        ReinforcedName = DataGridView.SelectedRows[0].Cells["ReinforcedName"].Value.ToString(),
                         Status = Enum.Parse<OrderStatus>(DataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
                         Count = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Count"].Value),
                         Sum = double.Parse(DataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
@@ -133,6 +134,7 @@ namespace PrecastConcretePlantView
                     { 
                         Id = id,
                         ReinforcedId = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["ReinforcedId"].Value),
+                        ReinforcedName = DataGridView.SelectedRows[0].Cells["ReinforcedName"].Value.ToString(),
                         Status = Enum.Parse<OrderStatus>(DataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
                         Count = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Count"].Value),
                         Sum = double.Parse(DataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
@@ -167,6 +169,7 @@ namespace PrecastConcretePlantView
                     { 
                         Id = id,
                         ReinforcedId = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["ReinforcedId"].Value),
+                        ReinforcedName = DataGridView.SelectedRows[0].Cells["ReinforcedName"].Value.ToString(),
                         Status = Enum.Parse<OrderStatus>(DataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
                         Count = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Count"].Value),
                         Sum = double.Parse(DataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),

PrecastConcretePlant/PrecastConcretePlant/FormReinforced.cs

@@ -13,7 +13,6 @@ using PrecastConcretePlantContracts.SearchModels;
 using PrecastConcretePlantDataModels.Models;
 using Microsoft.Extensions.Logging;
 
-
 namespace PrecastConcretePlantView
 {
     public partial class FormReinforced : Form

PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ComponentLogic.cs

@@ -10,7 +10,6 @@ using PrecastConcretePlantContracts.StoragesContracts;
 using PrecastConcretePlantContracts.ViewModels;
 using Microsoft.Extensions.Logging;
 
-
 namespace PrecastConcretePlantBusinessLogic.BusinessLogic
 {
     public class ComponentLogic : IComponentLogic

PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -70,12 +70,10 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
 
             return true;
         }
-
         public bool TakeOrderInWork(OrderBindingModel model)
         {
             return StatusUpdate(model, OrderStatus.Выполняется);
         }
-
         public bool DeliveryOrder(OrderBindingModel model)
         {
             return StatusUpdate(model, OrderStatus.Готов);
@@ -85,7 +83,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
         {
             return StatusUpdate(model, OrderStatus.Выдан);
         }
-
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("Order. OrderId:{Id}", model?.Id);
@@ -101,7 +98,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
             _logger.LogInformation("ReadList. Count:{Count}", list.Count);
             return list;
         }
-
         private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
             if (model == null)

PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ReinforcedLogic.cs

@@ -39,7 +39,6 @@ namespace PrecastConcretePlantBusinessLogic
 
                 return true;
             }
-
             public bool Delete(ReinforcedBindingModel model)
             {
                 CheckModel(model, false);
@@ -54,7 +53,6 @@ namespace PrecastConcretePlantBusinessLogic
 
                 return true;
             }
-
             public ReinforcedViewModel? ReadElement(ReinforcedSearchModel model)
             {
                 if (model == null)

PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ComponentBindingModel.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using PrecastConcretePlantDataModels.Models;
 
-
 namespace PrecastConcretePlantContracts.BindingModels
 {
     public class ComponentBindingModel : IComponentModel

PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/OrderBindingModel.cs

@@ -12,6 +12,7 @@ namespace PrecastConcretePlantContracts.BindingModels
     {
         public int Id { get; set; }
         public int ReinforcedId { get; set; }
+        public string ReinforcedName { get; set; } = string.Empty;
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IComponentLogic.cs

@@ -7,7 +7,6 @@ using PrecastConcretePlantContracts.BindingModels;
 using PrecastConcretePlantContracts.SearchModels;
 using PrecastConcretePlantContracts.ViewModels;
 
-
 namespace PrecastConcretePlantContracts.BusinessLogicsContracts
 {
     public interface IComponentLogic

PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IReinforcedLogic.cs

@@ -7,7 +7,6 @@ using PrecastConcretePlantContracts.BindingModels;
 using PrecastConcretePlantContracts.SearchModels;
 using PrecastConcretePlantContracts.ViewModels;
 
-
 namespace PrecastConcretePlantContracts.BusinessLogicsContracts
 {
     public interface IReinforcedLogic

PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IComponentStorage.cs

@@ -7,7 +7,6 @@ using PrecastConcretePlantContracts.BindingModels;
 using PrecastConcretePlantContracts.SearchModels;
 using PrecastConcretePlantContracts.ViewModels;
 
-
 namespace PrecastConcretePlantContracts.StoragesContracts
 {
     public interface IComponentStorage

PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IReinforcedStorage.cs

@@ -9,7 +9,6 @@ using PrecastConcretePlantContracts.ViewModels;
 
 namespace PrecastConcretePlantContracts.StoragesContracts
 {
-
     public interface IReinforcedStorage
     {
         List<ReinforcedViewModel> GetFullList();

PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ComponentViewModel.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using PrecastConcretePlantDataModels.Models;
 using System.ComponentModel;
 
-
 namespace PrecastConcretePlantContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel

PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/OrderViewModel.cs

@@ -7,14 +7,13 @@ using PrecastConcretePlantDataModels.Enums;
 using PrecastConcretePlantDataModels.Models;
 using System.ComponentModel;
 
-
 namespace PrecastConcretePlantContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
+        public int ReinforcedId { get; set; }
         [DisplayName("Номер")]
         public int Id { get; set; }
-        public int ReinforcedId { get; set; }
         [DisplayName("Изделие")]
         public string ReinforcedName { get; set; } = string.Empty;
         [DisplayName("Количество")]
@@ -27,5 +26,7 @@ namespace PrecastConcretePlantContracts.ViewModels
         public DateTime DateCreate { get; set; } = DateTime.Now;
         [DisplayName("Дата выполнения")]
         public DateTime? DateImplement { get; set; }
+
+ 
     }
 }

PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ReinforcedViewModel.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using PrecastConcretePlantDataModels.Models;
 using System.ComponentModel;
 
-
 namespace PrecastConcretePlantContracts.ViewModels
 {
     public class ReinforcedViewModel : IReinforcedModel

PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IOrderModel.cs

@@ -10,6 +10,7 @@ namespace PrecastConcretePlantDataModels.Enums
     public interface IOrderModel : IId
     {
         int ReinforcedId { get; }
+        string ReinforcedName { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/IComponentStorage.cs

@@ -9,7 +9,6 @@ using PrecastConcretePlantContracts.StoragesContracts;
 using PrecastConcretePlantContracts.ViewModels;
 using PrecastConcretePlantListImplement.Models;
 
-
 namespace PrecastConcretePlantListImplement.Implements
 {
     public class ComponentStorage : IComponentStorage

PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Component.cs

@@ -7,7 +7,6 @@ using PrecastConcretePlantContracts.BindingModels;
 using PrecastConcretePlantContracts.ViewModels;
 using PrecastConcretePlantDataModels.Models;
 
-
 namespace PrecastConcretePlantListImplement.Models
 {
     public class Component : IComponentModel

PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Order.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using PrecastConcretePlantContracts.BindingModels;
@@ -13,6 +14,7 @@ namespace PrecastConcretePlantListImplement.Models
     public class Order : IOrderModel
     {
         public int ReinforcedId { get; private set; }
+        public string ReinforcedName { get; private set; }
 
         public int Count { get; private set; }
 
@@ -36,6 +38,7 @@ namespace PrecastConcretePlantListImplement.Models
             {
                 Id = model.Id,
                 ReinforcedId = model.ReinforcedId,
+                ReinforcedName = model.ReinforcedName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -51,6 +54,7 @@ namespace PrecastConcretePlantListImplement.Models
                 return;
             }
             ReinforcedId = model.ReinforcedId;
+            ReinforcedName = model.ReinforcedName;
             Count = model.Count;
             Sum = model.Sum;
             Status = model.Status;
@@ -62,6 +66,7 @@ namespace PrecastConcretePlantListImplement.Models
         {
             Id = Id,
             ReinforcedId = ReinforcedId,
+            ReinforcedName = ReinforcedName,
             Count = Count,
             Sum = Sum,
             Status = Status,

PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Reinforced.cs

@@ -7,7 +7,6 @@ using PrecastConcretePlantContracts.BindingModels;
 using PrecastConcretePlantContracts.ViewModels;
 using PrecastConcretePlantDataModels.Models;
 
-
 namespace PrecastConcretePlantListImplement.Models
 {
     public class Reinforced : IReinforcedModel