From 4c31b73d05c2518723a4263c02344bfce3afc210 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 24 九月 2024 10:35:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/Position.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 1eb3e09..2ae001a 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -64,7 +64,7 @@
public WorkStep CurStep { get; set; }
public List<WorkStep> NextSteps { get; set; } = new();
public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished);
- public bool IsFinishAllSteps => !Steps.Any() || !Steps.Any(q => !q.IsFinished);
+ public bool IsFinishAllSteps => Steps.Any() && !Steps.Any(q => !q.IsFinished);
//public int CurStep => Steps.Where(q => !q.IsFinished).OrderBy(q => q.Sequence).FirstOrDefault()?.Sequence ?? 0;
private DbClient CommitDB;
/// <summary>
@@ -364,6 +364,11 @@
}
return result;
}
+ //宸ュ簭琚噸缃�
+ else if(Steps.IsNullOrEmpty())
+ {
+ return canBegin;
+ }
}
//娌℃湁鍙互鐩存帴寮�濮嬬殑鍚庣画宸ユ锛屾牴鎹悗缁伐姝ヨ繑鍥濧piAction
--
Gitblit v1.9.3