y优化

lss

2025-07-03 791be053ea908ab986dffeb2f4aef7b87b450d2d

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

@@ -332,7 +332,7 @@
            Dictionary<int, string> dics = new Dictionary<int, string>();
            foreach (var deviceInfo in devices)
            {
                int mst = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("电梯") && state.Contains(a.S_B_STATE)).Count();
                int mst = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("电梯") && state.Contains(a.S_B_STATE) && a.S_END_LOC == deviceInfo.TN_Location).Count();
                dics.Add(mst, deviceInfo.TN_Location);
            }
            if (dics.Count > 0)
@@ -619,19 +619,28 @@
            var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
            try
            {
                LogHelper.Info($"BindingLoc：开始解绑容器：{JsonConvert.SerializeObject(cntrs)}");
                db.BeginTran();
                var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
                if (!string.IsNullOrEmpty(location.S_NOTE.Trim()) && (location.S_NOTE.Trim() == "叠盘" || location.S_NOTE.Trim() == "片胶堆叠位"))
                //if (!string.IsNullOrEmpty(location.S_NOTE) && lcrList.Count > 0)
                //{
                //    if (location.S_NOTE == "叠盘" || location.S_NOTE.Trim() == "片胶堆叠位")
                //    {
                //        LogHelper.Info("叠盘货位删除托盘");
                //        cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();

                //    }
                //}
                if (lcrList.Count > 0)
                {
                    cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
                }
                LogHelper.Info($"BindingLoc：开始解绑容器：{cntrs}");
                var 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.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                LogHelper.Info($"BindingLoc：解绑容器：{cntrs}，成功");
                LogHelper.Info($"BindingLoc：解绑容器：{JsonConvert.SerializeObject(cntrs)}成功");
                db.CommitTran();
                res = true;
            }
@@ -644,6 +653,99 @@
        }

        /// <summary>
        /// 库位清空
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="cntrs"></param>
        /// <returns></returns>
        public static bool Clear(string loc, List<string> cntrs)
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();

            try
            {
                var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
                if (location == null)
                {
                    LogHelper.Info($"Clear：货位：{loc}货位表查询错误，请假查货位表");
                    return res;
                }
                LogHelper.Info($"Clear：开始解绑容器：{JsonConvert.SerializeObject(cntrs)}");
                db.BeginTran();
                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();
                }
                var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE.Trim()) && it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
                LogHelper.Info($"Clear：开始删除容器：{JsonConvert.SerializeObject(cntrs)}");
                db.Deleteable<Container>().Where(it => cntrs.Contains(it.S_CODE)).ExecuteCommand();

                location.N_CURRENT_NUM = lcrList.Count - count;
                location.S_LOCK_STATE = "无";
                location.N_LOCK_STATE = 0;
                db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                LogHelper.Info($"Clear：开始删除容器物料：{JsonConvert.SerializeObject(cntrs)}");
                var CntrItem = db.Queryable<CntrItemDetail>().Where(a => cntrs.Contains(a.S_CNTR_CODE.Trim())).First();
                if (CntrItem != null)
                {
                    db.Deleteable<CntrItemDetail>().Where(it => cntrs.Contains(it.S_CNTR_CODE)).ExecuteCommand();
                }
                else
                {
                    LogHelper.Info($"Clear=》托盘:{JsonConvert.SerializeObject(cntrs)}无物料数据");

                }
                LogHelper.Info($"BindingLoc：解绑容器：{JsonConvert.SerializeObject(cntrs)}成功");
                db.CommitTran();
                res = true;
            }
            catch (Exception ex)
            {
                LogHelper.Info($"BindingLoc Error:{ex}");
                db.RollbackTran();
            }
            return res;
        }
        /// <summary>
        /// 解锁货位，删除货位托盘
        /// </summary>
        /// <param name="loc"></param>
        /// <returns></returns>
        public static bool UnlockLocDeleteCntrs(string loc)
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            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();            
                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.CommitTran();
                res = true;
            }
            catch (Exception ex)
            {
                db.RollbackTran();
            }
            return res;
        }
        /// <summary>
        /// 解锁货位
        /// </summary>
        /// <param name="loc"></param>