From 19686a600d06d4a29e60a49addadab930034f4fa Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 07 八月 2024 00:17:02 +0800
Subject: [PATCH] Position增加条码生成

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

diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 58008e4..0beec16 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -62,6 +62,7 @@
                 var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
                 LabelDic.Add(code.PKG_LEVEL, label);
             }
+            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
             //濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈夊垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
             if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
             {
@@ -511,6 +512,20 @@
 
             var pkgList = GetPackageList(CurPkg.Item);
 
+            //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
+            foreach (var wipSN in CurPosition.CurWipSNs)
+            {
+                wipSN.TRAY_SN = CurPkg.Item.Package.SN;
+                wipSN.CARTON_SN = CurPkg.Item.Package.SN;
+            }
+            //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
+            var woSNs = CurPosition.WorkBatch.WoSNs.Where(q => CurPosition.CurWipSNs.Any(w => q.SN == w.SN)).ToList();
+            foreach (var woSN in woSNs)
+            {
+                woSN.TRAY_SN = CurPkg.Item.Package.SN;
+                woSN.OUTER_SN = CurPkg.Item.Package.SN;
+            }
+
             //淇濆瓨鏁版嵁搴�
             var db = Biz.Db;
             var dbTran = db.UseTran(() =>
@@ -584,12 +599,15 @@
                 };
                 wipActs.Add(wipAct);
             }
+            //var woSNs = CurPosition.WorkBatch.WoSNs.Where(q => CurPosition.CurWipSNs.Any(w => q.SN == w.SN)).ToList();
 
             //淇濆瓨鏁版嵁
             CurStep.DBSubmitAction = () =>
             {
                 var db = CurPosition.GetCommitDB();
                 db.Storageable(wipActs, CurPosition.UserCode).ExecuteCommand();
+                //db.Storageable(CurPosition.CurWipSNs, CurPosition.UserCode).ExecuteCommand();
+                //db.Storageable(woSNs, CurPosition.UserCode).ExecuteCommand();
             };
 
             if (CurPkg.IsFinished)

--
Gitblit v1.9.3