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/WorkTask/WorkTaskExportModel.cs | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs
index 6a6785a..6c6aa28 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkTask/WorkTaskExportModel.cs
@@ -23,6 +23,42 @@
public string TaskCode { get; set; }
/// <summary>
+ /// 绠℃缂栫爜
+ /// </summary>
+ [ExcelColumn(Name = "绠℃缂栫爜", Width = 25)]
+ public string PipeSpecCode { get; set; }
+
+ /// <summary>
+ /// 绠℃鍚嶇О
+ /// </summary>
+ [ExcelColumn(Name = "绠℃鍚嶇О", Width = 25)]
+ public string PipeSectionName { get; set; }
+
+ /// <summary>
+ /// 绠℃鍨嬪彿
+ /// </summary>
+ [ExcelColumn(Name = "绠℃鍨嬪彿", Width = 25)]
+ public string PipeSpecMode { get; set; }
+
+ /// <summary>
+ /// 宸ュ簭鍚嶇О
+ /// </summary>
+ [ExcelColumn(Name = "宸ュ簭鍚嶇О", Width = 25)]
+ public string ProcessName { get; set; }
+
+ /// <summary>
+ /// 鑸瑰彿
+ /// </summary>
+ [ExcelColumn(Name = "鑸瑰彿", Width = 25)]
+ public string ShipNumber { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍙�
+ /// </summary>
+ [ExcelColumn(Name = "椤圭洰鍙�", Width = 25)]
+ public string ProjectNumber { get; set; }
+
+ /// <summary>
/// 璁″垝鐘舵��
/// </summary>
[ExcelColumn(Name = "璁″垝鐘舵��", Width = 25)]
@@ -33,6 +69,12 @@
/// </summary>
[ExcelColumn(Name = "鍙枡鐘舵��", Width = 25)]
public CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓娴佸悜缂栧彿
+ /// </summary>
+ [ExcelColumn(Name = "宸ヨ壓娴佸悜缂栧彿", Width = 25)]
+ public string ProcessRouteNumber { get; set; }
/// <summary>
/// 鍘熸枡鏍囪瘑
@@ -143,24 +185,6 @@
public string ProdLineCode { get; set; }
/// <summary>
- /// 鑸瑰彿
- /// </summary>
- [ExcelColumn(Name = "鑸瑰彿", Width = 25)]
- public string ShipNumber { get; set; }
-
- /// <summary>
- /// 椤圭洰鍙�
- /// </summary>
- [ExcelColumn(Name = "椤圭洰鍙�", Width = 25)]
- public string ProjectNumber { get; set; }
-
- /// <summary>
- /// 宸ュ簭鍚嶇О
- /// </summary>
- [ExcelColumn(Name = "宸ュ簭鍚嶇О", Width = 25)]
- public string ProcessName { get; set; }
-
- /// <summary>
/// 绠′欢缂栫爜
/// </summary>
[ExcelColumn(Name = "绠′欢缂栫爜", Width = 25)]
@@ -171,18 +195,6 @@
/// </summary>
[ExcelColumn(Name = "椤哄簭鍙�", Width = 25)]
public string PreSerialNumber { get; set; }
-
- /// <summary>
- /// 绠℃缂栫爜
- /// </summary>
- [ExcelColumn(Name = "绠℃缂栫爜", Width = 25)]
- public string PipeSpecCode { get; set; }
-
- /// <summary>
- /// 绠℃鍚嶇О
- /// </summary>
- [ExcelColumn(Name = "绠℃鍚嶇О", Width = 25)]
- public string PipeSectionName { get; set; }
/// <summary>
/// 澶栧緞(mm)
@@ -201,12 +213,6 @@
/// </summary>
[ExcelColumn(Name = "鏉愯川", Width = 25)]
public string Material { get; set; }
-
- /// <summary>
- /// 宸ヨ壓娴佸悜缂栧彿
- /// </summary>
- [ExcelColumn(Name = "宸ヨ壓娴佸悜缂栧彿", Width = 25)]
- public string ProcessRouteNumber { get; set; }
/// <summary>
/// 璁″垝寮�濮嬫椂闂�
--
Gitblit v1.9.3