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 | 342 +++++++++++++++++++++++++++-----------------------------
1 files changed, 167 insertions(+), 175 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 40c8562..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,3 +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;
@@ -7,7 +9,7 @@
/// <summary>
/// 浣滀笟璁″垝琛�
/// </summary>
- public class WorkPlan : FullAuditedAggregateRoot<Guid>
+ public class WorkPlan : MyFullAuditedAggregateRoot<Guid>
{
/// <summary>
/// 浠诲姟缂栫爜
@@ -15,10 +17,142 @@
public string TaskCode { get; set; }
/// <summary>
- /// 鍘熸枡缂栧彿
+ /// 绠℃缂栫爜
/// </summary>
- public string OrgMaterialCode { get; set; }
+ 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 鍘熸枡绠′俊鎭�
+
+ ///// <summary>
+ ///// 鍘熸枡缂栧彿
+ ///// </summary>
+ //public string OrgMaterialCode { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鏍囪瘑
+ /// </summary>
+ public string DataIdentifier { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ public string MaterialMode { get; set; }
+
+
+ #endregion
+
+
+ #region 鎵撶爜
+
+ /// <summary>
+ /// 闀垮害(mm)
+ /// </summary>
+ public decimal Length { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜鍐呭
+ /// </summary>
+ public string MarkingContent { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜浣嶇疆
+ /// </summary>
+ public decimal MarkingPosition { get; set; }
+
+ #endregion
+
+ #region 鍒囧壊
+
+ ///// <summary>
+ ///// 鍒囧壊鏂囦欢
+ ///// </summary>
+ //public string CuttingFile { get; set; }
+
+ /// <summary>
+ /// 鍒囧壊浣嶇疆
+ /// </summary>
+ public decimal CuttingPosition { get; set; }
+
+ /// <summary>
+ /// 绠℃鏁伴噺
+ /// </summary>
+ public int Quantity { get; set; }
+
+ #endregion
+
+ #region 瑁呴厤銆佺剨鎺�
+
+ /// <summary>
+ /// 娉曞叞鍘氬害(mm)
+ /// </summary>
+ public decimal FlangeThickness { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鐩村緞(mm)
+ /// </summary>
+ public decimal FlangeInnerDiameter { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍏О鍘嬪姏
+ /// </summary>
+ public string WeldingHeatInput { get; set; }
+
+ /// <summary>
+ /// 娉曞叞鍐茬爜鍐呭
+ /// </summary>
+ public string PipeAllowableStress { get; set; }
+
+ /// <summary>
+ /// 濂楃闀垮害(mm)
+ /// </summary>
+ public decimal PipeDiameter { get; set; }
+
+ /// <summary>
+ /// 濂楃鐩村緞(mm)
+ /// </summary>
+ public decimal PipeWallThickness { get; set; }
+
+ #endregion
/// <summary>
/// 宸ュ巶浠ｇ爜
@@ -40,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>
/// 绠′欢缂栫爜
@@ -60,160 +198,42 @@
/// </summary>
public string PreSerialNumber { get; set; }
- /// <summary>
- /// 鍘熸枡鏍囪瘑
- /// </summary>
- public string DataIdentifier { get; set; }
+
+
+
/// <summary>
- /// 绠¤鏍肩爜
+ /// 澶栧緞(mm)
/// </summary>
- public string PipeSpecCode { get; set; }
+ public decimal OuterDiameter { get; set; }
/// <summary>
- /// 绠℃鍚嶇О
+ /// 澹佸帤(mm)
/// </summary>
- public string PipeSectionName { get; set; }
-
- /// <summary>
- /// 澶栧緞
- /// </summary>
- public string OuterDiameter { get; set; }
-
- /// <summary>
- /// 鍧″彛
- /// </summary>
- public string Bevel { get; set; }
+ public decimal Thickness { 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 bool HasMainSignature { 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 string FinishedProductScale { 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 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鏁版嵁
- /// </summary>
- public string VRData { get; set; }
-
- /// <summary>
- /// 宸ヨ壓璺嚎缂栧彿
- /// </summary>
- public string ProcessRouteNumber { get; set; }
+
/// <summary>
/// 璁″垝寮�濮嬫椂闂�
@@ -226,42 +246,14 @@
public DateTime? PlannedEndTime { get; set; }
/// <summary>
- /// 鏃堕棿淇℃伅
+ /// 鐝粍淇℃伅
/// </summary>
- public string TimeInfo { get; set; }
-
+ public string TeamInfo { get; set; }
/// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// 鏃堕棿鎴�
/// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
-
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
+ public string Timestamp { get; set; }
/// <summary>
/// Adjusts the sort.
--
Gitblit v1.9.3