From a3a2b238a2626ef8744e7a135f9ca2e2fbb5184c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 21 5月 2025 10:17:36 +0800
Subject: [PATCH] 优化
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs | 214 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 132 insertions(+), 82 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 bf43676..334a0e4 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,10 +10,11 @@
/// <summary>
/// 浣滀笟璁″垝杈撳叆鍙傛暟妯″瀷
/// </summary>
+ [Serializable]
public class WorkPlanInput
{
/// <summary>
- /// 浠诲姟缂栫爜锛堝敮涓�鏍囪瘑浠诲姟锛�
+ /// 浠诲姟缂栫爜
/// </summary>
public string TaskCode { get; set; }
@@ -21,215 +23,263 @@
/// </summary>
public string OrgMaterialCode { get; set; }
-
/// <summary>
- /// 宸ュ巶浠ｇ爜锛堢敓浜у伐鍘傛爣璇嗭級
+ /// 宸ュ巶浠ｇ爜
/// </summary>
public string FactoryCode { get; set; }
/// <summary>
- /// 浜у搧浠ｇ爜锛堢敓浜т骇鍝佹爣璇嗭級
+ /// 浜у搧浠ｇ爜
/// </summary>
public string ProductCode { get; set; }
/// <summary>
- /// 宸ヤ綅浠ｇ爜锛堢敓浜у伐浣嶆爣璇嗭級
+ /// 宸ヤ綅浠ｇ爜
/// </summary>
public string WorkstationCode { get; set; }
/// <summary>
- /// 璁惧浠ｇ爜锛堢敓浜ц澶囨爣璇嗭級
+ /// 璁惧浠ｇ爜
/// </summary>
public string EquipmentCode { get; set; }
/// <summary>
- /// 宸ヤ欢鍚嶇О锛堝姞宸ュ伐浠跺悕绉帮級
+ /// 宸ヤ欢鍚嶇О
/// </summary>
public string WorkpieceName { get; set; }
/// <summary>
- /// 宸ュ簭鍚嶇О锛堝綋鍓嶅伐搴忓悕绉帮級
+ /// 宸ュ簭鍚嶇О
/// </summary>
public string ProcessName { get; set; }
/// <summary>
- /// 绠′欢缂栫爜锛堢閬撻儴浠剁紪鐮侊級
+ /// 绠′欢缂栫爜
/// </summary>
public string PipeFittingCode { get; set; }
/// <summary>
- /// 椤哄簭鍙凤紙棰勫鐞嗗簭鍒楀彿锛�
+ /// 椤哄簭鍙�
/// </summary>
public string PreSerialNumber { get; set; }
/// <summary>
- /// 鍘熸枡鏍囪瘑锛堟暟鎹尯鍒嗘爣璇嗭級
+ /// 鍘熸枡鏍囪瘑
/// </summary>
public string DataIdentifier { get; set; }
/// <summary>
- /// 绠¤鏍肩爜锛堢鏉愯鏍肩紪鐮侊級
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ public string MaterialMode { 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 OuterDiameter { get; set; }
/// <summary>
- /// 鍧″彛锛堝潯鍙ｅ姞宸ヨ姹傦級
+ /// 鍧″彛
/// </summary>
public string Bevel { get; set; }
/// <summary>
- /// 鏉愯川锛堟潗鏂欑被鍨嬫爣璇嗭級
+ /// 鏉愯川
/// </summary>
public string Material { get; set; }
/// <summary>
- /// 闀垮害锛堝伐浠堕暱搴﹀昂瀵革級
+ /// 闀垮害
/// </summary>
public string Length { get; set; }
/// <summary>
- /// 鎵撳瓟浣嶏紙閽诲瓟浣嶇疆鏍囪瘑锛�
+ /// 鎵撳瓟浣�
/// </summary>
public string DrillingPosition { get; set; }
/// <summary>
- /// 鐩歌疮锛堢浉璐嚎鍔犲伐瑕佹眰锛�
+ /// 鐩歌疮
/// </summary>
public string Intersecting { get; set; }
/// <summary>
- /// 鎺ュ彛瑕佹眰锛堣繛鎺ユ帴鍙ｆ爣鍑嗭級
+ /// 鎺ュ彛瑕佹眰
/// </summary>
public string InterfaceRequirement { get; set; }
/// <summary>
- /// 鏄惁鏈変富绛撅紙鏄惁闇�瑕佷富绛惧悕锛�
+ /// 鏄惁鏈変富绛�
/// </summary>
public bool HasMainSignature { get; set; }
/// <summary>
- /// 鍖呮嫭鏁伴噺锛堝寘鍚暟閲忔爣璇嗭級
+ /// 鍖呮嫭鏁伴噺
/// </summary>
public int Quantity { get; set; }
/// <summary>
- /// 鎵撶爜鍐呭锛堟爣璁板唴瀹硅姹傦級
+ /// 鎵撶爜鍐呭
/// </summary>
public string MarkingContent { get; set; }
/// <summary>
- /// 鍒囧壊鏂囦欢锛堝垏鍓茬▼搴忔枃浠讹級
+ /// 鍒囧壊鏂囦欢
/// </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 BranchMaterial { get; set; }
+
+ ///// <summary>
+ ///// 鏀绔彛鏇茬巼鍗婂緞
+ ///// </summary>
+ //public string BranchPortRadius { get; set; }
+
+ ///// <summary>
+ ///// 鏀绔彛瑙掑害
+ ///// </summary>
+ //public string BranchPortAngle { get; set; }
+
+ ///// <summary>
+ ///// 鏀绔彛瑕佹眰
+ ///// </summary>
+ //public string BranchPortRequirement { get; set; }
+
+ ///// <summary>
+ ///// 鐩歌疮绾跨被鍨�
+ ///// </summary>
+ //public string IntersectingLineType { get; set; }
+
+ ///// <summary>
+ ///// 鐩歌疮绾跨被鍒�
+ ///// </summary>
+ //public string IntersectingLineCategory { get; set; }
+
+ ///// <summary>
+ ///// 鎴愬搧鍥惧箙
+ ///// </summary>
+ //public string FinishedProductScale { get; set; }
/// <summary>
- /// 鏀澹佸帤锛堟敮绠″鍘氬昂瀵革級
- /// </summary>
- public string BranchWallThickness { get; set; }
-
- /// <summary>
- /// 鏀鏉愯川锛堟敮绠℃潗鏂欑被鍨嬶級
- /// </summary>
- public string BranchMaterial { get; set; }
-
- /// <summary>
- /// 鏀绔彛鏇茬巼鍗婂緞锛堟敮绠＄鍙ｅ姬搴︼級
- /// </summary>
- public string BranchPortRadius { get; set; }
-
- /// <summary>
- /// 鏀绔彛瑙掑害锛堟敮绠＄鍙ｈ搴︼級
- /// </summary>
- public string BranchPortAngle { get; set; }
-
- /// <summary>
- /// 鏀绔彛瑕佹眰锛堟敮绠＄鍙ｆ爣鍑嗭級
- /// </summary>
- public string BranchPortRequirement { get; set; }
-
- /// <summary>
- /// 鐩歌疮绾跨被鍨嬶紙鐩歌疮绾垮姞宸ョ被鍨嬶級
- /// </summary>
- public string IntersectingLineType { get; set; }
-
- /// <summary>
- /// 鐩歌疮绾跨被鍒紙鐩歌疮绾垮垎绫伙級
- /// </summary>
- public string IntersectingLineCategory { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍥惧箙锛堟垚鍝佸浘绾告瘮渚嬶級
- /// </summary>
- public string FinishedProductScale { get; set; }
-
- /// <summary>
- /// 娉曞叞鍘氬害锛堟硶鍏扮洏鍘氬害锛�
+ /// 娉曞叞鍘氬害
/// </summary>
public string FlangeThickness { get; set; }
/// <summary>
- /// 娉曞叞鍐呭緞锛堟硶鍏板唴瀛旂洿寰勶級
+ /// 娉曞叞鍐呭緞
/// </summary>
public string FlangeInnerDiameter { get; set; }
/// <summary>
- /// 鐒婃帴鐑緭鍏ワ紙鐒婃帴鐑噺鍙傛暟锛�
+ /// 鐒婃帴鐑緭鍏�
/// </summary>
public string WeldingHeatInput { get; set; }
/// <summary>
- /// 绠￠亾鍏佽搴斿姏锛堢閬撴壙鍘嬫爣鍑嗭級
+ /// 绠￠亾鍏佽搴斿姏
/// </summary>
public string PipeAllowableStress { get; set; }
/// <summary>
- /// 绠″緞锛堢閬撶洿寰勫昂瀵革級
+ /// 绠″緞
/// </summary>
public string PipeDiameter { get; set; }
/// <summary>
- /// 绠￠亾澹佸帤锛堢閬撳鍘氬昂瀵革級
+ /// 绠￠亾澹佸帤
/// </summary>
public string PipeWallThickness { get; set; }
/// <summary>
- /// VR鏁版嵁锛堣櫄鎷熺幇瀹炴暟鎹級
+ /// VR鏁版嵁
/// </summary>
public string VRData { get; set; }
/// <summary>
- /// 宸ヨ壓璺嚎缂栧彿锛堝伐鑹烘祦绋嬬紪鍙凤級
+ /// 宸ヨ壓璺嚎缂栧彿
/// </summary>
public string ProcessRouteNumber { get; set; }
/// <summary>
- /// 璁″垝寮�濮嬫椂闂达紙璁″垝鍚姩鏃堕棿锛�
+ /// 璁″垝寮�濮嬫椂闂�
/// </summary>
public DateTime? PlannedStartTime { get; set; }
/// <summary>
- /// 璁″垝瀹屾垚鏃堕棿锛堣鍒掔粨鏉熸椂闂达級
+ /// 璁″垝瀹屾垚鏃堕棿
/// </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