From 8cb4f66c6cf5639280a27e0ef28360cd46842197 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 17 六月 2025 17:34:06 +0800
Subject: [PATCH] 111

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

diff --git a/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
index 842580e..fb3b590 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
@@ -699,39 +699,23 @@
                     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)
-                    //.OrderBy(it => it.N_COL)
-                    //.PartitionBy(it => it.N_ROW)
-                    //.Take(1)
-                    //.ToList();
-                    //LogHelper.Info($"绗﹀悎鏉′欢鐨勬暟閲弡endlist.Count}");
-                    //foreach (var item in endlist)
-                    //{
-                    //    var lockinfo = db.Queryable<Location>().Where(it => it.N_LOCK_STATE != 0 && it.S_AREA_CODE == item.S_AREA_CODE && it.N_ROW == item.N_ROW).First();
-                    //    if (lockinfo == null)
-                    //    {
-                    //        result = item;
-                    //        a.S_END_LOC = item.S_CODE;
-                    //        break;
-                    //    }
-                    //    else LogHelper.Info($"璐т綅{lockinfo.S_CODE} 鏈夐攣 褰撳墠鎺掍笉鍙娇鐢�);
-                    //}
                 }
                 else
                 {
                     LogHelper.Info($"鍏ュ簱浠诲姟 璁$畻缁堢偣锛屼换鍔$被鍨嬶細{a.S_OP_DEF_NAME}");
-                    if (a.S_OP_DEF_NAME == "鐡剁洊杞繍")
+                    if (a.S_OP_DEF_NAME == "鎺ラ┏浣嶅叆搴� || a.S_OP_DEF_NAME == "鐡剁洊绌烘墭鍏ュ簱")
                     {
+                        string itemCode = "";
                         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 );
+                                itemCode = itemInfo.S_ITEM_CODE;
                             }
                         }
+                        result = TaskProcess.BCPInOrOut(db, true, a.S_NOTE + "搴撳尯", itemCode);
                     }
                     if (a.S_OP_DEF_NAME.Contains("娉ㄥ") && a.S_OP_DEF_NAME.Contains("婊℃墭涓嬬嚎锛堢摱鍧級"))
                     {

--
Gitblit v1.9.1