From 067c69928ce6d3d3ed5710fd9652af7b3380dcd5 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 20 五月 2025 14:10:38 +0800
Subject: [PATCH] cjs

---
 HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
index bbd72ea..66ed6d2 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
@@ -323,7 +323,6 @@
                             S_CNTR_CODE = task.S_CNTR_CODE,
                             S_BATCH_NO = item.S_BATCH_NO,
                             S_SERIAL_NO = item.S_SERIAL_NO,
-                            D_PRD_DATE = item.D_PRD_DATE,
                             F_QTY = item.F_QTY
                         };
                         db.Insertable(info).ExecuteCommand();
@@ -696,7 +695,6 @@
                 {
                     LogHelper.Info($"浣滀笟缁堢偣涓嶄负鎺ラ┏浣�鏌ユ壘搴撳尯{a.S_END_AREA} 鍙敤璐т綅");
 
-
                     //鍏朵粬搴撳尯
                     var endlist = db.Queryable<Location>()
                     .Where(it => it.S_AREA_CODE == a.S_END_AREA && it.N_CURRENT_NUM < it.N_CAPACITY)
@@ -720,13 +718,30 @@
                 else
                 {
                     LogHelper.Info($"鍏ュ簱浠诲姟 璁$畻缁堢偣锛屼换鍔$被鍨嬶細{a.S_OP_DEF_NAME}");
-                    if (a.S_OP_DEF_NAME == "鐡剁洊杞繍" || a.S_OP_DEF_NAME == "鎺ラ┏浣嶇Щ搴�)
+                    if (a.S_OP_DEF_NAME == "鐡剁洊杞繍")
                     {
-                        result = TaskProcess.BCPInOrOut(db, true, a.S_START_LOC,a.S_NOTE + "搴撳尯");
+                        var cntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_START_LOC).First();
+                        if(cntrInfo != null)
+                        {
+                            var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
+                            if(itemInfo != null)
+                            {
+                                result = TaskProcess.BCPInOrOut(db, true, a.S_NOTE + "搴撳尯",itemInfo.S_ITEM_CODE );
+                            }
+                        }
                     }
                     if (a.S_OP_DEF_NAME.Contains("娉ㄥ") && a.S_OP_DEF_NAME.Contains("婊℃墭涓嬬嚎锛堢摱鍧級"))
                     {
-                        result = TaskProcess.BCPFullOut(db,a.S_OP_DEF_NAME,a.S_START_LOC);
+                        var cntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_START_LOC).First();
+                        if (cntrInfo != null)
+                        {
+                            var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
+                            if (itemInfo != null)
+                            {
+                                result = TaskProcess.BCPFullOut(db, a.S_OP_DEF_NAME, itemInfo.S_ITEM_CODE);
+                            }
+                        }
+                        
                     }
                     if (a.S_OP_DEF_NAME.Contains("绌烘墭涓嬬嚎"))
                     {

--
Gitblit v1.9.1