优化

lss

2025-06-10 b2c8747a85762bc32f310a31fe84cad69b61104a

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

@@ -202,7 +202,7 @@
        "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
        "U", "V", "W", "X", "Y", "Z"
    };
       

        /// <summary>
        /// 根据物料找托盘
        /// </summary>
@@ -212,15 +212,50 @@
        /// <returns></returns>
        internal static List<Location> GetLocByItemCode(string areaCode, string ItemCode, string lev)
        {
           

            List<Location> locs;

            
                var db = new SqlHelper<object>().GetInstance();
                var queryable = db.Queryable<Location>()
          .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
          .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
          .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode);

            var db = new SqlHelper<object>().GetInstance();
            var queryable = db.Queryable<Location>()
      .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
      .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
      .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode);
            //六位码匹配前六位，其他的全部配置
            if (ItemCode.Trim().Length == 6)
            {
                queryable = queryable.Where((a, b, c) => c.S_ITEM_CODE.StartsWith(ItemCode));

            }
            else
            {
                queryable = queryable.Where((a, b, c) => c.S_ITEM_CODE == ItemCode);
            }
            //int targetIndex = LevelOrder.IndexOf(lev);
            //// 获取所有低于或等于目标等级的等级
            //var validLevels = LevelOrder
            //.Skip(targetIndex)  // 跳过高于目标等级的等级
            //.ToList();

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

            //没有余料则寻找全部物料
            if (locs.Count == 0)
            {
                queryable = db.Queryable<Location>()
                    .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
                    .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
                    .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode);
                //六位码匹配前六位，其他的全部配置
                if (ItemCode.Trim().Length == 6)
                {
@@ -231,55 +266,20 @@
                {
                    queryable = queryable.Where((a, b, c) => c.S_ITEM_CODE == ItemCode);
                }
                //int targetIndex = LevelOrder.IndexOf(lev);
                //// 获取所有低于或等于目标等级的等级
                //var validLevels = LevelOrder
                //.Skip(targetIndex)  // 跳过高于目标等级的等级
                //.ToList();
                LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(queryable.ToList())}");

                LogHelper.Info($"GetLocByItemCode=>根据库区编码:{areaCode}，物料编码:{ItemCode},物料优先级:{lev}，物料等级计算出有托盘货位{JsonConvert.SerializeObject(queryable.ToList())}");
                //判断需不需要物料等级查找，并优先出库余料

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

                //没有余料则寻找全部物料
                if (locs.Count == 0)
                {
                    queryable = db.Queryable<Location>()
                        .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
                        .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
                        .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode);
                    //六位码匹配前六位，其他的全部配置
                    if (ItemCode.Trim().Length == 6)
                    {
                        queryable = queryable.Where((a, b, c) => c.S_ITEM_CODE.StartsWith(ItemCode));

                    }
                    else
                    {
                        queryable = queryable.Where((a, b, c) => c.S_ITEM_CODE == ItemCode);
                    }
                    LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(queryable.ToList())}");


                    if (string.IsNullOrEmpty(lev))
                    {
                        locs = queryable.ToList();
                    }
                    else
                    {
                        locs = queryable.Where((a, b, c) => c.LEV == lev).ToList();
                    }
                    LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(locs)}");
                }
            
            return locs;
        }

@@ -288,16 +288,16 @@
        /// </summary>
        /// <param name="areaCode">库区编码</param>
        /// <returns></returns>
        internal static Location GetLocByAreacode(string areaCode,string type)
        internal static Location GetLocByAreacode(string areaCode, string type)
        {
            Location loc = new Location();
            var db = new SqlHelper<object>().GetInstance();
            string CntrCodeWith = "";
            if (type == "PM ")
            if (type.Trim() == "PM")
            {
                CntrCodeWith = "MA";
            }
            else if (type == "PN ")
            else if (type.Trim() == "PN")
            {
                CntrCodeWith = "NA";
            }
@@ -305,16 +305,16 @@
            {
                LogHelper.Info($"托盘类型{type}不在规定范围");
            }
                var query = db.Queryable<Location>()
       .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
       .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.Contains(CntrCodeWith) && c.S_ITEM_CODE == null
                       );
                loc = query.First();
            
      
            var query = db.Queryable<Location>()
   .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
   .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.Contains(CntrCodeWith) && c.S_ITEM_CODE == null
                   );
            loc = query.First();


            return loc;
        }