合肥佳通优化

lss

2025-05-27 59f836bf0eb00b7707c74fe8edb8fa7662c871ab

 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 =>
@@ -204,12 +204,23 @@
        {
            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.Count() == 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=>根据库区编码:{areaCode}，物料编码:{ItemCode},物料优先级，物料等级计算出有托盘货位{JsonConvert.SerializeObject(queryable.ToList())}");
            //判断需不需要物料等级查找，并优先出库余料
            if (string.IsNullOrEmpty(lev))
            {
@@ -219,9 +230,26 @@
            {
                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.Count() == 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);
                }
                //判断等级
                if (string.IsNullOrEmpty(lev))
                {
                    locs = queryable.ToList();
@@ -230,6 +258,7 @@
                {
                    locs = queryable.Where((a, b, c) => c.LEV == lev).ToList();
                }
                // LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(locs)}");
            }

            return locs;
@@ -521,6 +550,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>