From a2448a582f2baeabf32c4f8dd8ab447feb2538e6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:21 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
index a39d6de..55d440c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/GetWorkPlanInput.cs
@@ -245,14 +245,34 @@
         public SearchFilterModeEnum EquipmentCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
 
         /// <summary>
-        /// 宸ヤ欢鍚嶇О
+        /// 浜х嚎缂栫爜
         /// </summary>
-        public string WorkpieceName { get; set; }
+        public string ProdLineCode { get; set; }
 
         /// <summary>
-        /// 宸ヤ欢鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// 浜х嚎缂栫爜-鏌ヨ鍏崇郴杩愮畻绗� 
         /// </summary>
-        public SearchFilterModeEnum WorkpieceName_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+        public SearchFilterModeEnum ProdLineCode_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+
+        /// <summary>
+        /// 鑸瑰彿
+        /// </summary>
+        public string ShipNumber { get; set; }
+
+        /// <summary>
+        /// 鑸瑰彿-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum ShipNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
+
+        /// <summary>
+        /// 椤圭洰鍙�
+        /// </summary>
+        public string ProjectNumber { get; set; }
+
+        /// <summary>
+        /// 椤圭洰鍙�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum ProjectNumber_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ;
 
         /// <summary>
         /// 宸ュ簭鍚嶇О
@@ -349,7 +369,7 @@
         /// </summary>
         //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
         [HighSearchRangeAttribute]
-        public List<string> PlannedStartTime { get; set; }
+        public string PlannedStartTime { get; set; }
 
 
         /// <summary>
@@ -357,7 +377,7 @@
         /// </summary>
         //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
         [HighSearchRangeAttribute]
-        public List<string> PlannedEndTime { get; set; }
+        public string PlannedEndTime { get; set; }
 
 
         /// <summary>
@@ -385,7 +405,7 @@
         /// </summary>
         //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
         [HighSearchRangeAttribute]
-        public List<string> CreationTime { get; set; }
+        public string CreationTime { get; set; }
 
 
         /// <summary>
@@ -403,7 +423,7 @@
         /// </summary>
         //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
         [HighSearchRangeAttribute]
-        public List<string> LastModificationTime { get; set; }
+        public string LastModificationTime { get; set; }
 
 
         /// <summary>
@@ -441,7 +461,7 @@
         /// </summary>
         //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
         [HighSearchRangeAttribute]
-        public List<string> DeletionTime { get; set; }
+        public string DeletionTime { get; set; }
 
 
         /// <summary>

--
Gitblit v1.9.3