lss
2025-07-04 3865194441f1e1da34c0be9034d86c8d0d68706c
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
@@ -210,7 +210,7 @@
        /// <param name="lev">物料等级</param>
        /// <param name="ItemCode">物料编码</param>
        /// <returns></returns>
        internal static List<Location> GetLocByItemCode(string areaCode, string ItemCode, string lev)
        internal static List<Location> GetLocByItemCode(string areaCode, string ItemCode, string lev, string powderType)
        {
            List<Location> locs;
@@ -237,7 +237,7 @@
            //.Skip(targetIndex)  // 跳过高于目标等级的等级
            //.ToList();
            LogHelper.Info($"GetLocByItemCode=>根据库区编码:{areaCode},物料编码:{ItemCode},物料优先级:{lev},物料等级计算出有托盘货位{JsonConvert.SerializeObject(queryable.ToList())}");
            LogHelper.Info($"GetLocByItemCode=>根据库区编码:{areaCode},物料编码:{ItemCode},物料优先级:{lev},机台型号:{powderType},物料等级计算出有托盘货位{JsonConvert.SerializeObject(queryable.ToList())}");
            //判断需不需要物料等级查找,并优先出库余料
            if (string.IsNullOrEmpty(lev))
            {
@@ -247,7 +247,14 @@
            {
                locs = queryable.Where((a, b, c) => c.LEV == lev && c.S_BS_TYPE == "余料").ToList();
            }
            //   LogHelper.Info($"GetLocByItemCode=>查找余料,{JsonConvert.SerializeObject(locs)}");
            if (string.IsNullOrEmpty(powderType))
            {
                locs = queryable.Where((a, b, c) => c.S_BS_TYPE == "余料").ToList();
            }
            else
            {
                locs = queryable.Where((a, b, c) => c.S_FLTYPE == powderType && c.S_BS_TYPE == "余料").ToList();
            }
            //没有余料则寻找全部物料
            if (locs.Count == 0)
@@ -255,7 +262,7 @@
                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);
                    .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode && c.S_FLTYPE == powderType);
                //六位码匹配前六位,其他的全部配置
                if (ItemCode.Trim().Length == 6)
                {
@@ -276,6 +283,14 @@
                else
                {
                    locs = queryable.Where((a, b, c) => c.LEV == lev).ToList();
                }
                if (string.IsNullOrEmpty(powderType))
                {
                    locs = queryable.ToList();
                }
                else
                {
                    locs = queryable.Where((a, b, c) => c.S_FLTYPE == powderType ).ToList();
                }
                LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(locs)}");
            }
@@ -717,25 +732,25 @@
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            List<string> cntrs = null;int count = 0;
            List<string> cntrs = null; int count = 0;
            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();
                var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
                if (lcrList.Count > 0)
                {
                    cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
                    LogHelper.Info($"UnlockLocDeleteCntrs:货位{loc}:查询绑定托盘{cntrs}");
                    LogHelper.Info($"UnlockLocDeleteCntrs:开始删除容器:{JsonConvert.SerializeObject(cntrs)}");
                    count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE.Trim()) && it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
                }
                location.N_CURRENT_NUM = lcrList.Count - count;
                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.Updateable(location).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE, it.N_CURRENT_NUM }).ExecuteCommand();
                db.CommitTran();
                res = true;
            }