From 2c188371ed9e91ba58c452dbf27150de8eca208a Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 15 七月 2024 10:52:14 +0800
Subject: [PATCH] 增加IWorkStep，行为要保存数据，对接工步DBSubmitAction
---
Tiger.Business.MES/Transaction/CollectNode.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index f5fe74c..39339a5 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -79,16 +79,16 @@
if (CurBatch.IsNullOrEmpty())
{
action.IsSuccessed = false;
- action.LocaleMsg = new($"鏈�夋嫨宸ュ崟锛岃鍏堥�夋嫨瑕佺敓浜х殑宸ュ崟");
- //action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotSelectOrderException");
+ //action.LocaleMsg = new($"鏈�夋嫨宸ュ崟锛岃鍏堥�夋嫨瑕佺敓浜х殑宸ュ崟");
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotSelectOrderException");
return action;
}
//鏈夊綋鍓嶅伐鍗曚笖涓嶆槸鎶曞叆锛屽垯鎻愮ず鏉＄爜鏈姇鍏ョ敓浜э紝璇峰厛鍘婚绔欐壂鎻�
else
{
action.IsSuccessed = false;
- action.LocaleMsg = new($"鏉＄爜[{input.SN}]灏氭湭鎶曞叆鐢熶骇锛岃鍏堝幓棣栫珯鎵弿", input.SN);
- //action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotInputException", input.SN);
+ //action.LocaleMsg = new($"鏉＄爜[{input.SN}]灏氭湭鎶曞叆鐢熶骇锛岃鍏堝幓棣栫珯鎵弿", input.SN);
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.NotInputException", input.SN);
return action;
}
}
@@ -115,8 +115,8 @@
//娌℃湁鍙墽琛岀殑宸ユ
ResetSteps();
action.IsSuccessed = false;
- action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
- //action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.WorkStepException", CurPosition.POST_CODE);
+ //action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.WorkStepException", CurPosition.POST_CODE);
}
catch (Exception ex)
{
@@ -208,7 +208,7 @@
//鍒濆鍖栧伐姝ュ垪琛�
Steps.Clear();
- var curStep = new Biz.WorkStep(curNode.ID, Biz.WorkStep.Types.Node)
+ var curStep = new Biz.WorkStep(curNode.ID, IWorkStep.Types.Node)
{
Sequence = Steps.Count + 1,
Node = curNode,
@@ -226,7 +226,7 @@
var acts = CurBatch.NodeActs.Where(q => q.NODE_ID == curNode.ID).ToList();
foreach (var act in acts)
{
- Steps.Add(new Biz.WorkStep(act.ID, Biz.WorkStep.Types.Action)
+ Steps.Add(new Biz.WorkStep(act.ID, IWorkStep.Types.Action)
{
Sequence = Steps.Count + 1,
Node = curNode,
@@ -235,6 +235,8 @@
});
}
+ //瀹屾垚褰撳墠宸ュ簭鑺傜偣
+ curStep.IsFinished = true;
//鏈畬鎴愭墍鏈夊伐姝�
if (!IsFinishAllSteps)
{
@@ -280,8 +282,8 @@
throw dbTran.ErrorException;
}
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
- action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", 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", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ //action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", 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", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
return action;
}
#endregion Functions
--
Gitblit v1.9.3