From 4b3fd35893972bb05fd7ab89dc624ab805093ff3 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周日, 18 5月 2025 19:47:46 +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/WorkPlanExportModel.cs | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
index 56e8498..1e829f4 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanExportModel.cs
@@ -17,6 +17,18 @@
public string TaskCode { get; set; }
/// <summary>
+ /// 璁″垝鐘舵��
+ /// </summary>
+ [ExcelColumn(Name = "璁″垝鐘舵��", Width = 25)]
+ public WorkPlanStatusEnum WorkPlanStatus { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ [ExcelColumn(Name = "鍙枡鐘舵��", Width = 25)]
+ public CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+ /// <summary>
/// 鍘熸枡鏍囪瘑
/// </summary>
[ExcelColumn(Name = "鍘熸枡鏍囪瘑", Width = 25)]
@@ -119,10 +131,22 @@
public string EquipmentCode { get; set; }
/// <summary>
- /// 宸ヤ欢鍚嶇О
+ /// 浜х嚎缂栫爜
/// </summary>
- [ExcelColumn(Name = "宸ヤ欢鍚嶇О", Width = 25)]
- public string WorkpieceName { get; set; }
+ [ExcelColumn(Name = "浜х嚎缂栫爜", Width = 25)]
+ 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>
/// 宸ュ簭鍚嶇О
@@ -171,12 +195,6 @@
/// </summary>
[ExcelColumn(Name = "鏉愯川", Width = 25)]
public string Material { get; set; }
-
- /// <summary>
- /// 鏄惁涓绘敮绠�
- /// </summary>
- [ExcelColumn(Name = "鏄惁涓绘敮绠�", Width = 25)]
- public bool HasMainSignature { get; set; }
/// <summary>
/// 宸ヨ壓娴佸悜缂栧彿
--
Gitblit v1.9.3