From 935722e71cc47d8c9f3b0e911de33c7eb0cbc693 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 28 八月 2024 22:55:55 +0800
Subject: [PATCH] 优化工步实体，增加名称，状态，消息
---
Tiger.Business.MES/Transaction/TestNode.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 3a9e2e2..f46b261 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -57,7 +57,7 @@
}
else if (!IsFinishAllSteps)
{
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
@@ -102,7 +102,7 @@
}
else if (!IsFinishAllSteps)
{
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
}
}
}
@@ -163,7 +163,7 @@
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
if (IsFinishAllSteps)
{
- result = DoIfFinishAllSteps(result);
+ result = DoIfFinishAllSteps(result, input.Locale);
}
else
{
@@ -452,7 +452,7 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
- curStep.IsFinished = true;
+ curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
else if (!IsFinishNodeSteps)
@@ -460,7 +460,7 @@
var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
- curStep.IsFinished = true;
+ curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -498,7 +498,7 @@
if (IsFinishAllSteps)
{
action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
- action = DoIfFinishAllSteps(action);
+ action = DoIfFinishAllSteps(action, input.Locale);
}
}
catch (Exception ex)
@@ -516,14 +516,14 @@
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
- public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
+ public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action, string locale)
{
//淇濆瓨鏁版嵁搴�
SaveStepsCommitActionToDB();
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count;
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], locale);
action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME, CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
--
Gitblit v1.9.3