From bed76502512bd0a7f39cfa7024b238d822746e67 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期五, 27 九月 2024 01:30:19 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Business.MES/WorkAction/PackingAction.cs | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs index 3a074e2..a299fc2 100644 --- a/Tiger.Business.MES/WorkAction/PackingAction.cs +++ b/Tiger.Business.MES/WorkAction/PackingAction.cs @@ -748,6 +748,27 @@ return list; } + public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent) + { + List<MES_WIP_PKG> list = new(); + if (parent.Items.Any()) + { + foreach (var item in parent.Items) + { + item.Package.PARENT_SN = parent.Package?.SN; + list.AddRange(GetMinPackageList(item)); + } + } + else + { + if (!parent.Package.IsNullOrEmpty()) + { + list.Add(parent.Package); + } + } + return list; + } + public ApiAction<SubmitOutput> CompletePkg() { var action = new ApiAction<SubmitOutput>(new SubmitOutput()); @@ -827,6 +848,7 @@ ACT_TYPE = NodeAct.ACT_TYPE, ACT_SN = wipSn.SN, ACT_RESULT = "Y", + ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(), TRACE_INFO = $"浜у搧鏉$爜[{string.Join("锛�", CurPosition.CurSN)}]鍖呰瀹屾垚", }; wipActs.Add(wipAct); -- Gitblit v1.9.3