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.Domain/WorkPlan/WorkPlan.cs | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
index 3d22889..a42e676 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
@@ -1,4 +1,5 @@
using CMS.Plugin.MyExtension.Domain;
+using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;
using Volo.Abp.Domain.Entities.Auditing;
@@ -14,6 +15,51 @@
/// 浠诲姟缂栫爜
/// </summary>
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 CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓娴佸悜缂栧彿
+ /// </summary>
+ public string ProcessRouteNumber { get; set; }
#region 鍘熸枡绠′俊鎭�
@@ -128,15 +174,19 @@
/// </summary>
public string EquipmentCode { get; set; }
- /// <summary>
- /// 宸ヤ欢鍚嶇О
- /// </summary>
- public string WorkpieceName { get; set; }
+ ///// <summary>
+ ///// 宸ヤ欢鍚嶇О
+ ///// </summary>
+ //public string WorkpieceName { get; set; }
/// <summary>
- /// 宸ュ簭鍚嶇О
+ /// 浜х嚎缂栫爜
/// </summary>
- public string ProcessName { get; set; }
+ public string ProdLineCode { get; set; }
+
+
+
+
/// <summary>
/// 绠′欢缂栫爜
@@ -150,15 +200,7 @@
- /// <summary>
- /// 绠℃缂栫爜
- /// </summary>
- public string PipeSpecCode { get; set; }
-
- /// <summary>
- /// 绠℃鍚嶇О
- /// </summary>
- public string PipeSectionName { get; set; }
+
/// <summary>
/// 澶栧緞(mm)
@@ -176,10 +218,10 @@
public string Material { get; set; }
- /// <summary>
- /// 鏄惁涓绘敮绠�
- /// </summary>
- public bool HasMainSignature { get; set; }
+ ///// <summary>
+ ///// 鏄惁涓绘敮绠�
+ ///// </summary>
+ //public bool HasMainSignature { get; set; }
@@ -191,10 +233,7 @@
- /// <summary>
- /// 宸ヨ壓娴佸悜缂栧彿
- /// </summary>
- public string ProcessRouteNumber { get; set; }
+
/// <summary>
/// 璁″垝寮�濮嬫椂闂�
--
Gitblit v1.9.3