From e3e60e858b0d8d2196b6cbb6dff04f9fde65d3df Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 18 八月 2024 18:01:04 +0800
Subject: [PATCH] 增加客户端条码验证方法

---
 Tiger.Business.MES/WorkAction/IPQC.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index 2468326..199d8d4 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -60,6 +60,7 @@
 
             //濡傛灉鏍规嵁杈撳叆鍙互寮�濮嬫墽琛屽綋鍓嶈涓哄垯鏍囪涓烘垚鍔燂紝鍚﹀垯澶辫触
             action.IsSuccessed = false;
+            action.Data.ShortMsg = new("鎵撳嵃寮�濮�", ShortMessage.Types.Success);
             return action;
         }
         /// <summary>
@@ -85,6 +86,7 @@
             //鎻愪氦鏁版嵁鎵ц澶辫触
             else
             {
+                action.Data.ShortMsg = new("娴嬭瘯澶辫触", ShortMessage.Types.Failed);
                 action.IsSuccessed = false;
                 //action.LocaleMsg = new($"鎵ц澶辫触");
                 action.LocaleMsg = new("MES.WorkAction.IPQC.Fail");
@@ -113,6 +115,7 @@
                 {
                     AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                     AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+                    WIP_ID = wipSn.ID,
                     HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                     SN = wipSn.SN,
                     STATUS = wipSn.STATUS,
@@ -130,7 +133,11 @@
                     POST_CODE = wipSn.POST_CODE,
                     OPER_CODE = wipSn.OPER_CODE,
                     SEGMENT = wipSn.SEGMENT,
+                    FLOW_SN = wipSn.FLOW_SN,
                     TRAY_SN = wipSn.TRAY_SN,
+                    INNER_SN = wipSn.INNER_SN,
+                    CARTON_SN = wipSn.CARTON_SN,
+                    PALLET_SN = wipSn.PALLET_SN,
                     OPERATION_TIME = DateTime.Now,
                     SFTS_CODE = wipSn.SFTS_CODE,
                     SFT_CODE = wipSn.SFT_CODE,
@@ -148,15 +155,18 @@
                 wipActs.Add(wipAct);
             }
 
+            //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+            var _wipActs = wipActs.Clone();
             //淇濆瓨鏁版嵁
             CurStep.DBSubmitAction = () =>
             {
                 var db = CurPosition.GetCommitDB();
-                db.Storageable(wipActs, CurPosition.UserCode).ExecuteCommand();
+                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
             };
 
             IsFinished = true;
-            action.LocaleMsg = new($"琛屼负缁撴潫");
+            action.Data.ShortMsg = new("娴嬭瘯瀹屾垚", ShortMessage.Types.Success);
+            action.LocaleMsg = new($"娴嬭瘯缁撴潫");
             //action.LocaleMsg = new("MES.WorkAction.IPQC.Finish");
             return action;
         }

--
Gitblit v1.9.3