合肥佳通优化

lss

2025-06-05 e1a97fc8b29f063e96e3ebbae2f07ee95b276069

 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs

@@ -7,6 +7,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using static HH.WCS.JiaTong.dispatch.NDC;

@@ -232,7 +233,7 @@
            //.Skip(targetIndex)  // 跳过高于目标等级的等级
            //.ToList();

            LogHelper.Info($"GetLocByItemCode=>根据库区编码:{areaCode}，物料编码:{ItemCode},物料优先级:{lev}，物料等级计算出有托盘货位{JsonConvert.SerializeObject(queryable.ToList())}");
            // LogHelper.Info($"GetLocByItemCode=>根据库区编码:{areaCode}，物料编码:{ItemCode},物料优先级:{lev}，物料等级计算出有托盘货位{JsonConvert.SerializeObject(queryable.ToList())}");
            //判断需不需要物料等级查找，并优先出库余料
            if (string.IsNullOrEmpty(lev))
            {
@@ -242,7 +243,7 @@
            {
                locs = queryable.Where((a, b, c) => c.LEV == lev && c.S_BS_TYPE == "余料").ToList();
            }
            LogHelper.Info($"GetLocByItemCode=>查找余料,{JsonConvert.SerializeObject(locs)}");
            //   LogHelper.Info($"GetLocByItemCode=>查找余料,{JsonConvert.SerializeObject(locs)}");

            //没有余料则寻找全部物料
            if (locs.Count == 0)
@@ -261,7 +262,7 @@
                {
                    queryable = queryable.Where((a, b, c) => c.S_ITEM_CODE == ItemCode);
                }
                LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(queryable.ToList())}");
                //   LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(queryable.ToList())}");


                if (string.IsNullOrEmpty(lev))
@@ -272,7 +273,7 @@
                {
                    locs = queryable.Where((a, b, c) => c.LEV == lev).ToList();
                }
                LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(locs)}");
                //  LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(locs)}");
            }

            return locs;
@@ -282,8 +283,6 @@
        /// 根据库区获取空托
        /// </summary>
        /// <param name="areaCode">库区编码</param>
        /// <param name="lev">物料等级</param>
        /// <param name="ItemCode">物料编码</param>
        /// <returns></returns>
        internal static Location GetLocByAreacode(string areaCode)
        {
@@ -294,7 +293,7 @@
       .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
       .Where((a, b, c) => a.S_AREA_CODE == areaCode && a.N_CURRENT_NUM == 1
                       && a.N_LOCK_STATE == 0
                       && b.S_CNTR_CODE != null
                       && b.S_CNTR_CODE != null && c.S_ITEM_CODE == null
                       );
            loc = query.First();
            return loc;
@@ -546,7 +545,11 @@
                }
                else
                {
                    LogHelper.Info($"锁定货位{loc}成功");
                    LogHelper.Info($"锁定货位{loc}失败,重新锁");
                    Task.Run(() =>
                    {
                        LockLoc(loc, lockState);
                    });
                }
                return res;
            }