From e050767314ff74ac13727f33398ad16c1e183945 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 12:49:21 +0800
Subject: [PATCH] 优化高级查询

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs |  126 ++++++++++++++++++++++++++++-------------
 1 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
index 72bfbe3..dfe7280 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing MiniExcelLibs.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,6 +10,7 @@
     /// <summary>
     /// 浣滀笟璁″垝杈撳叆鍙傛暟妯″瀷
     /// </summary>
+    [Serializable]
     public class WorkPlanInput
     {
         /// <summary>
@@ -67,7 +69,12 @@
         public string DataIdentifier { get; set; }
 
         /// <summary>
-        /// 绠¤鏍肩爜
+        /// 鍘熸枡鍨嬪彿
+        /// </summary>
+        public string MaterialMode { get; set; }
+
+        /// <summary>
+        /// 绠℃缂栫爜
         /// </summary>
         public string PipeSpecCode { get; set; }
 
@@ -131,50 +138,50 @@
         /// </summary>
         public string CuttingFile { get; set; }
 
-        /// <summary>
-        /// 鏀寰�
-        /// </summary>
-        public string BranchOuterDiameter { get; set; }
+        ///// <summary>
+        ///// 鏀寰�
+        ///// </summary>
+        //public string BranchOuterDiameter { get; set; }
 
-        /// <summary>
-        /// 鏀澹佸帤
-        /// </summary>
-        public string BranchWallThickness { get; set; }
+        ///// <summary>
+        ///// 鏀澹佸帤
+        ///// </summary>
+        //public string BranchWallThickness { get; set; }
 
-        /// <summary>
-        /// 鏀鏉愯川
-        /// </summary>
-        public string BranchMaterial { get; set; }
+        ///// <summary>
+        ///// 鏀鏉愯川
+        ///// </summary>
+        //public string BranchMaterial { get; set; }
 
-        /// <summary>
-        /// 鏀绔彛鏇茬巼鍗婂緞
-        /// </summary>
-        public string BranchPortRadius { get; set; }
+        ///// <summary>
+        ///// 鏀绔彛鏇茬巼鍗婂緞
+        ///// </summary>
+        //public string BranchPortRadius { get; set; }
 
-        /// <summary>
-        /// 鏀绔彛瑙掑害
-        /// </summary>
-        public string BranchPortAngle { get; set; }
+        ///// <summary>
+        ///// 鏀绔彛瑙掑害
+        ///// </summary>
+        //public string BranchPortAngle { get; set; }
 
-        /// <summary>
-        /// 鏀绔彛瑕佹眰
-        /// </summary>
-        public string BranchPortRequirement { get; set; }
+        ///// <summary>
+        ///// 鏀绔彛瑕佹眰
+        ///// </summary>
+        //public string BranchPortRequirement { get; set; }
 
-        /// <summary>
-        /// 鐩歌疮绾跨被鍨�
-        /// </summary>
-        public string IntersectingLineType { get; set; }
+        ///// <summary>
+        ///// 鐩歌疮绾跨被鍨�
+        ///// </summary>
+        //public string IntersectingLineType { get; set; }
 
-        /// <summary>
-        /// 鐩歌疮绾跨被鍒�
-        /// </summary>
-        public string IntersectingLineCategory { get; set; }
+        ///// <summary>
+        ///// 鐩歌疮绾跨被鍒�
+        ///// </summary>
+        //public string IntersectingLineCategory { get; set; }
 
-        /// <summary>
-        /// 鎴愬搧鍥惧箙
-        /// </summary>
-        public string FinishedProductScale { get; set; }
+        ///// <summary>
+        ///// 鎴愬搧鍥惧箙
+        ///// </summary>
+        //public string FinishedProductScale { get; set; }
 
         /// <summary>
         /// 娉曞叞鍘氬害
@@ -226,9 +233,48 @@
         /// </summary>
         public DateTime? PlannedEndTime { get; set; }
 
+
         /// <summary>
-        /// 鏃堕棿淇℃伅
+        /// 鐝粍淇℃伅
         /// </summary>
-        public string TimeInfo { get; set; }
+        public string TeamInfo { get; set; }
+
+        /// <summary>
+        /// 鏃堕棿鎴�
+        /// </summary>
+        public string Timestamp { get; set; }
+
+
+        /// <summary>
+        /// 浜х嚎缂栫爜
+        /// </summary>
+        public string ProdLineCode { get; set; }
+
+        /// <summary>
+        /// 鑸瑰彿
+        /// </summary>
+        public string ShipNumber { get; set; }
+
+        /// <summary>
+        /// 椤圭洰鍙�
+        /// </summary>
+        public string ProjectNumber { get; set; }
+
+
+
+        /// <summary>
+        /// 鎵撶爜浣嶇疆
+        /// </summary>
+        public decimal MarkingPosition { get; set; }
+
+        /// <summary>
+        /// 鍒囧壊浣嶇疆
+        /// </summary>
+        public decimal CuttingPosition { get; set; }
+
+        /// <summary>
+        /// 澹佸帤(mm)
+        /// </summary>
+        public decimal Thickness { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3