From 3678120ac63c176b5f261ef12e67c4ce7f1b320f Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 25 七月 2024 21:44:25 +0800
Subject: [PATCH] 增加维修入站跟维修回流的判断
---
Tiger.Business.MES/Transaction/Position.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index dbcd9fd..435eb9f 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -178,7 +178,7 @@
/// <summary>
/// 娣诲姞鑺傜偣鐨勪笅涓�涓涓哄埌宸ユ鍒楄〃
/// </summary>
- /// <param name="curNode"></param>
+ /// <param name="parent"></param>
private void AddNextActToSteps(WorkStep parent)
{
var edges = CurBatch.Edges.Where(q => q.SRC_NODE == parent.NodeID && CurBatch.NodeActs.Any(a => a.NODE_ID == parent.Node.ID && a.ID == q.TGT_NODE)).ToList();
@@ -189,6 +189,7 @@
{
var next = Steps.First(q => q.NodeID == act.ID);
next.Sequence = next.Sequence > parent.Sequence ? next.Sequence : (parent.Sequence + 1);
+ next.PrepNodeIDs.Add(parent.NodeID);
next.PrepNodeIDs.AddRange(parent.PrepNodeIDs);
next.PrepNodeIDs = next.PrepNodeIDs.Distinct().ToList();
AddNextActToSteps(next);
@@ -203,6 +204,7 @@
NodeAct = act,
Setting = CurBatch.ActionSets.FirstOrDefault(q => q.ACT_ID == act.ID),
};
+ next.PrepNodeIDs.Add(parent.NodeID);
next.PrepNodeIDs.AddRange(parent.PrepNodeIDs);
next.PrepNodeIDs = next.PrepNodeIDs.Distinct().ToList();
Steps.Add(next);
@@ -304,7 +306,7 @@
}
return result;
}
-
+
#endregion Functions
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3