From 6a7cec8384ebe5e971ba418906846472f5fe6b84 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 23 九月 2024 19:50:00 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/TestNode.cs | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 4fd4de0..133a83b 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -142,18 +142,18 @@
CurBatch?.Update();
var submitStep = Steps.Where(q => q.ID == input.CurStepID && !q.IsFinished).FirstOrDefault();
+ //濡傛灉瀹㈡埛绔繑鍥炵殑褰撳墠宸ユID鎵句笉鍒版湭瀹屾垚鐨勮涓哄伐姝ワ紝鍒欑洿鎺ュ紑濮嬩笅涓�涓涓哄伐姝�
if (submitStep.IsNullOrEmpty())
{
action = BeginNextActionStep(input);
- action.Data.OperInfo = CurOperInfo(input.Locale);
}
else
{
- var result = submitStep.Submit(input);
+ action = submitStep.Submit(input);
//濡傛灉褰撳墠宸ユ宸插畬鎴愶紝寮�濮嬫墽琛屼笅涓�宸ユ
- if (result.IsSuccessed && submitStep.IsFinished)
+ if (action.IsSuccessed && submitStep.IsFinished)
{
- result = BeginNextActionStep(input);
+ action = BeginNextActionStep(input);
}
//濡傛灉褰撳墠宸ユ鏈畬鎴�
else
@@ -161,23 +161,22 @@
//琛屼负鎵ц鍑洪敊锛屽伐姝ヨ閲嶇疆
if (Steps.IsNullOrEmpty())
{
- result.LocaleMsg = new(Biz.T(result.LocaleMsg, input.Locale) + Biz.T(Biz.L("MES.Transaction.Position.RescanSN"), input.Locale));
+ action.LocaleMsg = new(Biz.T(action.LocaleMsg, input.Locale) + Biz.T(Biz.L("MES.Transaction.Position.RescanSN"), input.Locale));
}
else
{
- result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+ action.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
}
}
- //濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
- if (IsFinishAllSteps)
- {
- result = DoIfFinishAllSteps(result, input.Locale);
- }
- else
- {
- result.Data.OperInfo = CurOperInfo(input.Locale);
- }
- return result;
+ }
+ //濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
+ if (IsFinishAllSteps)
+ {
+ action = DoIfFinishAllSteps(action, input.Locale);
+ }
+ else
+ {
+ action.Data.OperInfo = CurOperInfo(input.Locale);
}
}
//娌℃湁鍙墽琛岀殑宸ユ
@@ -462,6 +461,7 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -470,6 +470,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;
}
--
Gitblit v1.9.3