From a2448a582f2baeabf32c4f8dd8ab447feb2538e6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:21 +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/WorkPlanCreateOrUpdateDtoBase.cs | 269 ++++++++++++++++++++++++-----------------------------
1 files changed, 122 insertions(+), 147 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs
index 29d0c69..dfadd18 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanCreateOrUpdateDtoBase.cs
@@ -15,9 +15,79 @@
public string TaskCode { get; set; }
/// <summary>
- /// 鍘熸枡缂栧彿
+ /// 璁″垝鐘舵��
/// </summary>
- public string OrgMaterialCode { get; set; }
+ public WorkPlanStatusEnum WorkPlanStatus { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鏍囪瘑
+ /// </summary>
+ public string? DataIdentifier { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ public string? MaterialMode { get; set; }
+
+ /// <summary>
+ /// 闀垮害(mm)
+ /// </summary>
+ public decimal Length { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜鍐呭
+ /// </summary>
+ public string? MarkingContent { get; set; }
+
+ /// <summary>
+ /// 鎵撶爜浣嶇疆
+ /// </summary>
+ public decimal MarkingPosition { get; set; }
+
+ /// <summary>
+ /// 鍒囧壊浣嶇疆
+ /// </summary>
+ public decimal CuttingPosition { get; set; }
+
+ /// <summary>
+ /// 绠℃鏁伴噺
+ /// </summary>
+ public int Quantity { get; set; }
+
+ /// <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; }
/// <summary>
/// 宸ュ巶浠ｇ爜
@@ -40,9 +110,19 @@
public string? EquipmentCode { get; set; }
/// <summary>
- /// 宸ヤ欢鍚嶇О
+ /// 浜х嚎缂栫爜
/// </summary>
- public string? WorkpieceName { get; set; }
+ public string? ProdLineCode { get; set; }
+
+ /// <summary>
+ /// 鑸瑰彿
+ /// </summary>
+ public string? ShipNumber { get; set; }
+
+ /// <summary>
+ /// 椤圭洰鍙�
+ /// </summary>
+ public string? ProjectNumber { get; set; }
/// <summary>
/// 宸ュ簭鍚嶇О
@@ -60,12 +140,7 @@
public string? PreSerialNumber { get; set; }
/// <summary>
- /// 鍘熸枡鏍囪瘑
- /// </summary>
- public string? DataIdentifier { get; set; }
-
- /// <summary>
- /// 绠¤鏍肩爜
+ /// 绠℃缂栫爜
/// </summary>
public string? PipeSpecCode { get; set; }
@@ -75,14 +150,14 @@
public string? PipeSectionName { get; set; }
/// <summary>
- /// 澶栧緞
+ /// 澶栧緞(mm)
/// </summary>
- public string? OuterDiameter { get; set; }
+ public decimal OuterDiameter { get; set; }
/// <summary>
- /// 鍧″彛
+ /// 澹佸帤(mm)
/// </summary>
- public string? Bevel { get; set; }
+ public decimal Thickness { get; set; }
/// <summary>
/// 鏉愯川
@@ -90,127 +165,7 @@
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? 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; }
@@ -225,24 +180,39 @@
public DateTime? PlannedEndTime { get; set; }
/// <summary>
- /// 鏃堕棿淇℃伅
+ /// 鐝粍淇℃伅
/// </summary>
- public string? TimeInfo { get; set; }
+ public string? TeamInfo { get; set; }
/// <summary>
- ///
+ /// 鏃堕棿鎴�
/// </summary>
- public string? RedundantField1 { get; set; }
+ public string? Timestamp { get; set; }
/// <summary>
- ///
+ /// 鍒涘缓浜篒D
/// </summary>
- public string? RedundantField2 { get; set; }
+ public string? CreatorId { get; set; }
/// <summary>
- ///
+ /// 淇敼浜篒D
/// </summary>
- public string? RedundantField3 { get; set; }
+ public string? LastModifierId { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎鏃堕棿
+ /// </summary>
+ public DateTime? DeletionTime { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔澶囨敞
+ /// </summary>
+ public string? OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public string? DeleteRemark { get; set; }
/// <summary>
/// 鎺掑簭
@@ -260,14 +230,19 @@
public bool? IsDisabled { get; set; }
/// <summary>
- ///
+ /// 鎵╁睍瀛楁1
/// </summary>
- public string? CreatorId { get; set; }
+ public string? ExtraField1 { get; set; }
/// <summary>
- ///
+ /// 鎵╁睍瀛楁2
/// </summary>
- public string? LastModifierId { get; set; }
+ public string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public string? ExtraField3 { get; set; }
--
Gitblit v1.9.3