From ba0b68c347de4c9214d128d0b51d3af75688d6b3 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 11 九月 2024 01:22:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business/MES/Biz.WorkStep.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business/MES/Biz.WorkStep.cs b/Tiger.Business/MES/Biz.WorkStep.cs
index 0771409..b64748e 100644
--- a/Tiger.Business/MES/Biz.WorkStep.cs
+++ b/Tiger.Business/MES/Biz.WorkStep.cs
@@ -110,6 +110,16 @@
}
/// <summary>
+ /// 璁剧疆宸ユ鐘舵�佸拰娑堟伅
+ /// </summary>
+ /// <returns></returns>
+ public void SetStatusMessage(StepStatus status, Locale msg)
+ {
+ Message = msg;
+ Status = status;
+ }
+
+ /// <summary>
/// 鑾峰彇褰撳墠宸ユ鐨勪俊鎭�
/// </summary>
/// <returns></returns>
@@ -117,6 +127,7 @@
{
return new WorkStepInfo() {
ID = ID,
+ Name = Name,
Sequence = Sequence,
NodeID = NodeID,
NodeType = NodeType.ToString(),
@@ -125,7 +136,7 @@
NodeAct = NodeAct,
ActSetting = ActSetting,
Status = Status.ToString(),
- Message = Biz.T(Message, locale),
+ Message = Message.IsNullOrEmpty() ? "" : Biz.T(Message, locale),
};
}
#endregion
--
Gitblit v1.9.3