From 7d8dd82ad55ce51d6ec557d35467e6271f7ff681 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 27 十月 2024 17:34:06 +0800
Subject: [PATCH] 生产包装记录增加行为ID和Name
---
Tiger.Model.Net/Entitys/MES/MES_OPERATION.cs | 5 +++++
Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs | 14 ++++++++++++--
Tiger.Business.MES/WorkAction/PackingAction.cs | 2 ++
Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs | 12 ++++++++++--
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 885702d..87df59d 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -584,6 +584,7 @@
CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
CurPkgItem.Package.ACT_ID = NodeAct.ID;
+ CurPkgItem.Package.ACT_NAME = NodeAct.ACT_NAME;
CurPkgItem.Package.FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN;
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
@@ -647,6 +648,7 @@
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN,
};
FinishLevel++;
diff --git a/Tiger.Model.Net/Entitys/MES/MES_OPERATION.cs b/Tiger.Model.Net/Entitys/MES/MES_OPERATION.cs
index 7c5575a..1ea379d 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_OPERATION.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_OPERATION.cs
@@ -49,6 +49,11 @@
[DisplayName("宸ュ簭绫诲悕(FullName锛屽寘鎷懡鍚嶇┖闂�)")]
public string OPER_CLASS { get; set; }
/// <summary>
+ /// 宸ュ簭鍥炬爣
+ /// </summary>
+ [DisplayName("宸ュ簭鍥炬爣")]
+ public string OPER_ICON { get; set; }
+ /// <summary>
/// 鏄惁鍚敤(Y/N)
/// </summary>
[DisplayName("鏄惁鍚敤(Y/N)")]
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs
index b86910e..5703519 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs
@@ -34,9 +34,9 @@
[DisplayName("鐗╂枡鏉＄爜")]
public string SN { get; set; }
/// <summary>
- /// 浜у搧鏉＄爜(鍘傚唴娴佽浆鏉＄爜)
+ /// 浜у搧鏉＄爜
/// </summary>
- [DisplayName("浜у搧鏉＄爜(鍘傚唴娴佽浆鏉＄爜)")]
+ [DisplayName("浜у搧鏉＄爜")]
public string PROD_SN { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
@@ -79,6 +79,16 @@
[DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
public string NODE_NAME { get; set; }
/// <summary>
+ /// 宸ュ簭琛屼负ID
+ /// </summary>
+ [DisplayName("宸ュ簭琛屼负ID")]
+ public string ACT_ID { get; set; }
+ /// <summary>
+ /// 琛屼负鍚嶇О
+ /// </summary>
+ [DisplayName("琛屼负鍚嶇О")]
+ public string ACT_NAME { get; set; }
+ /// <summary>
/// 宸ュ巶缂栫爜
/// </summary>
[DisplayName("宸ュ巶缂栫爜")]
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
index 01dd037..7110e09 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
@@ -84,6 +84,16 @@
[DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
public string NODE_NAME { get; set; }
/// <summary>
+ /// 宸ュ簭琛屼负ID
+ /// </summary>
+ [DisplayName("宸ュ簭琛屼负ID")]
+ public string ACT_ID { get; set; }
+ /// <summary>
+ /// 琛屼负鍚嶇О
+ /// </summary>
+ [DisplayName("琛屼负鍚嶇О")]
+ public string ACT_NAME { get; set; }
+ /// <summary>
/// 宸ュ巶缂栫爜
/// </summary>
[DisplayName("宸ュ巶缂栫爜")]
@@ -140,8 +150,6 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- [SugarColumn(IsIgnore = true)]
- public string ACT_ID { get; set; }
[SugarColumn(IsIgnore = true)]
public string FLOW_SN { get; set; }
#endregion
--
Gitblit v1.9.3