From 660ccfc01c7c25cfab09e8798ca18ee2ac4a8b1d Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 20 九月 2024 23:22:17 +0800
Subject: [PATCH] 优化工步执行逻辑

---
 Tiger.Business.MES/Transaction/Position.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 700e73a..1eb3e09 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -351,10 +351,17 @@
                     CurStep = step;
                     //鏇存柊鍚庣画鍙墽琛岀殑宸ユ鍒楄〃
                     NextSteps = GetNextSteps(CurStep);
-                    //杩斿洖缁撴灉鍒板鎴风
-                    result = canBegin;
-                    result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
-
+                    //濡傛灉褰撳墠鎵ц宸ユ灏濊瘯鎵ц鍚庡氨宸茬粡瀹屾垚锛屼笉闇�瑕佸悗缁氦浜掞紝涓旓紝鍒欑户缁紑濮嬩笅涓�宸ユ
+                    if (CurStep.IsFinished && NextSteps.Any())
+                    {
+                        result = BeginNextActionStep(input);
+                    } 
+                    else
+                    {
+	                    //杩斿洖缁撴灉鍒板鎴风
+	                    result = canBegin;
+	                    result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+                    }
                     return result;
                 }
             }

--
Gitblit v1.9.3