From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +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/WorkPlanDto.cs |   94 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs
index ad1517d..00573e9 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanDto.cs
@@ -18,6 +18,71 @@
         public string TaskCode { get; set; }
 
         /// <summary>
+        /// 绠℃缂栫爜
+        /// </summary>
+        public string? PipeSpecCode { get; set; }
+
+        /// <summary>
+        /// 绠℃鍚嶇О
+        /// </summary>
+        public string? PipeSectionName { get; set; }
+
+        /// <summary>
+        /// 绠℃鍨嬪彿
+        /// </summary>
+        public string? PipeSpecMode { get; set; }
+
+        /// <summary>
+        /// 宸ュ簭鍚嶇О
+        /// </summary>
+        public string? ProcessName { get; set; }
+
+        /// <summary>
+        /// 鑸瑰彿
+        /// </summary>
+        public string? ShipNumber { get; set; }
+
+        /// <summary>
+        /// 椤圭洰鍙�
+        /// </summary>
+        public string? ProjectNumber { get; set; }
+
+        /// <summary>
+        /// 璁″垝鐘舵��
+        /// </summary>
+        public WorkPlanStatusEnum WorkPlanStatus { get; set; }
+
+        /// <summary>
+        /// 璁″垝鐘舵��
+        /// </summary>
+        public string WorkPlanStatusDesc
+        { 
+            get 
+            { 
+                return GetEnumDescriptionUtil.GetEnumDescription(WorkPlanStatus); 
+            } 
+        } 
+        /// <summary>
+        /// 鍙枡鐘舵��
+        /// </summary>
+        public CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+        /// <summary>
+        /// 鍙枡鐘舵��
+        /// </summary>
+        public string CallMaterialStatusDesc
+        { 
+            get 
+            { 
+                return GetEnumDescriptionUtil.GetEnumDescription(CallMaterialStatus); 
+            } 
+        } 
+        /// <summary>
+        /// 宸ヨ壓娴佸悜缂栧彿
+        /// </summary>
+        public string? ProcessRouteNumber { get; set; }
+
+        /// <summary>
         /// 鍘熸枡鏍囪瘑
         /// </summary>
         public string? DataIdentifier { get; set; }
@@ -103,14 +168,9 @@
         public string? EquipmentCode { get; set; }
 
         /// <summary>
-        /// 宸ヤ欢鍚嶇О
+        /// 浜х嚎缂栫爜
         /// </summary>
-        public string? WorkpieceName { get; set; }
-
-        /// <summary>
-        /// 宸ュ簭鍚嶇О
-        /// </summary>
-        public string? ProcessName { get; set; }
+        public string? ProdLineCode { get; set; }
 
         /// <summary>
         /// 绠′欢缂栫爜
@@ -121,16 +181,6 @@
         /// 椤哄簭鍙�
         /// </summary>
         public string? PreSerialNumber { get; set; }
-
-        /// <summary>
-        /// 绠℃缂栫爜
-        /// </summary>
-        public string? PipeSpecCode { get; set; }
-
-        /// <summary>
-        /// 绠℃鍚嶇О
-        /// </summary>
-        public string? PipeSectionName { get; set; }
 
         /// <summary>
         /// 澶栧緞(mm)
@@ -146,16 +196,6 @@
         /// 鏉愯川
         /// </summary>
         public string? Material { get; set; }
-
-        /// <summary>
-        /// 鏄惁涓绘敮绠�
-        /// </summary>
-        public bool HasMainSignature { get; set; }
-
-        /// <summary>
-        /// 宸ヨ壓娴佸悜缂栧彿
-        /// </summary>
-        public string? ProcessRouteNumber { get; set; }
 
         /// <summary>
         /// 璁″垝寮�濮嬫椂闂�

--
Gitblit v1.9.3