From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben

---
 Tiger.Business.MES/WorkAction/PackageInputCheck.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Tiger.Business.MES/WorkAction/PackageInputCheck.cs b/Tiger.Business.MES/WorkAction/PackageInputCheck.cs
index c924b92..bb135d0 100644
--- a/Tiger.Business.MES/WorkAction/PackageInputCheck.cs
+++ b/Tiger.Business.MES/WorkAction/PackageInputCheck.cs
@@ -190,8 +190,8 @@
 
             //鏇存柊鍘傚唴娴佺▼鐮�
             FlowCSN.CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE;
-            FlowCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
-            FlowCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
+            FlowCSN.PKG_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
+            FlowCSN.PROD_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
 
             //璁板綍琛屼负鎿嶄綔璁板綍
             var wipActs = new List<MES_WIP_ACT>();
@@ -246,6 +246,7 @@
                     ACT_TYPE = NodeAct.ACT_TYPE,
                     ACT_SN = wipSn.SN,
                     ACT_RESULT = "Y",
+                    ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
                     TRACE_INFO = $"鏉$爜[{wipSn.SN}]鍙互鍦ㄥ伐鍗昜{wipSn.WORK_ORDER}]鎶曟枡鐢熶骇锛屽叾涓璘9妫�鏌ヨ�楁椂{U9Cost:0.0000}绉�",
                 };
                 wipActs.Add(wipAct);

--
Gitblit v1.9.3