From 4e7803e64656655103a96c4e426bf1bf2563e3f7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 24 十月 2024 11:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

---
 Tiger.Business.MES/WorkAction/Assembly.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index 9dc8ee7..e5b0ed7 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -86,6 +86,9 @@
 	                CurAssembly.Items.Add(item);
                 }
             }
+
+            CurStep.Message = Biz.L("鎵弿涓婃枡鐗╂枡");
+            CurStep.Status = StepStatus.Normal;
         }
 
         /// <summary>
@@ -349,6 +352,7 @@
                     ACT_SN = wipSn.SN,
                     ACT_VALUE_1 = CurAssembly.ToJson(),
                     ACT_RESULT = "Y",
+                    ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
                     TRACE_INFO = $"浠ヤ笅鐗╂枡涓婃枡瀹屾垚锛歿string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
                 };
                 wipActs.Add(wipAct);

--
Gitblit v1.9.3