From 7b34830bd86d3fa803c3d39977d96c7f14ab3e8f Mon Sep 17 00:00:00 2001 From: Ismailov_Rovshan Date: Sat, 8 Apr 2023 22:15:59 +0400 Subject: [PATCH] fix --- .../ViewModel/FurnitureViewModel.cs | 3 +++ .../ViewModel/HeadsetModuleViewModel.cs | 6 ++++++ .../HelperModels/ExcelInfoMaster.cs | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfoMaster.cs diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs index d3829e9..e5c20b5 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs @@ -28,5 +28,8 @@ namespace FurnitureContracts.ViewModel public int OrdersId { get; set; } public string OrdersName { get; set; } = string.Empty; + public Dictionary FurnitureMaterials { get; set; } + + public DateTime DateTo { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs index dbe904a..eff4854 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs @@ -22,5 +22,11 @@ namespace FurnitureContracts.ViewModel public Dictionary HeadsetModuleMaterial { get; set; } public string MasterName { get; set; } = string.Empty; + + public string Name { get; set; } = string.Empty; + + public DateTime DateIssue { get; set; } + + public DateTime DateDelivery { get; set; } } } diff --git a/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfoMaster.cs b/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfoMaster.cs new file mode 100644 index 0000000..17b34ae --- /dev/null +++ b/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfoMaster.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureFactoryBusinessLogic.OfficePackage.HelperModels +{ + internal class ExcelInfoMaster + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + //public List<> { get; set; } = new(); + } +}