合肥佳通修改

lss

2025-05-30 9b015b21e39bb427c8fcfdcbda795d3a3c450d52

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

@@ -37,7 +37,7 @@
                //初始化LocationExt加入到集合缓存
                LocationExts = new Dictionary<string, LocationExt>();
                var exts = GetAllLocExtList();
             //   LogHelper.Info($"获取货位扩展表信息：{JsonConvert.SerializeObject(exts)}");
                //   LogHelper.Info($"获取货位扩展表信息：{JsonConvert.SerializeObject(exts)}");
                if (exts.Count > 0)
                {
                    exts.ForEach(a =>
@@ -193,6 +193,13 @@
            return result;

        }
        // 定义等级顺序（从高到低）
        private static readonly List<string> LevelOrder = new List<string>
    {
        "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
        "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
        "U", "V", "W", "X", "Y", "Z"
    };
        /// <summary>
        /// 根据物料找托盘
        /// </summary>
@@ -204,12 +211,27 @@
        {
            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 && c.S_ITEM_CODE == ItemCode);
      .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))
            {
@@ -219,9 +241,28 @@
            {
                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)
                {
                    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();
@@ -230,11 +271,33 @@
                {
                    locs = queryable.Where((a, b, c) => c.LEV == lev).ToList();
                }
                LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(locs)}");
            }

            return locs;
        }

        /// <summary>
        /// 根据库区获取空托
        /// </summary>
        /// <param name="areaCode">库区编码</param>
        /// <param name="lev">物料等级</param>
        /// <param name="ItemCode">物料编码</param>
        /// <returns></returns>
        internal static Location GetLocByAreacode(string areaCode)
        {
            Location loc = new Location();
            var db = new SqlHelper<object>().GetInstance();
            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
                       );
            loc = query.First();
            return loc;
        }

        /// <summary>
        /// 根据物料编码，仓库编码获取托盘数量
@@ -521,6 +584,33 @@
            }
            return res;
        }

        /// <summary>
        /// 解锁货位
        /// </summary>
        /// <param name="loc"></param>
        /// <returns></returns>
        public static bool UnlockLoc(string loc)
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
            try
            {
                db.BeginTran();
                var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
                location.S_LOCK_STATE = "无";
                location.N_LOCK_STATE = 0;
                db.Updateable(location).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                db.CommitTran();
                res = true;
            }
            catch (Exception ex)
            {
                db.RollbackTran();
            }
            return res;
        }
        /// <summary>
        /// 货位绑定容器
        /// </summary>