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)&&a.S_END_LOC==deviceInfo.TN_Location).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)
@@ -662,7 +662,7 @@
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            try
            {
                var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
@@ -681,7 +681,7 @@
                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;
@@ -708,7 +708,43 @@
            }
            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>