完善部分日志内容，优化查询语句和日志打印代码

kazelee

2025-07-03 736fb5782d375908a9097780743913193ffde494

 wms/LocationHelper.cs

@@ -145,7 +145,7 @@

            if (loc != null && loc.N_LOCK_STATE == 0) {
                loc.N_LOCK_STATE = 2; // 起点出库锁
                loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 起点出库锁
                loc.S_LOCK_STATE = GetLockStateStr(2); // 起点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }
@@ -172,7 +172,7 @@

            if (loc != null && loc.N_LOCK_STATE == 0) {
                loc.N_LOCK_STATE = 1; // 终点出库锁
                loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 终点出库锁
                loc.S_LOCK_STATE = GetLockStateStr(1); // 终点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }
@@ -180,22 +180,38 @@
            return true;
        }

        /// <summary>
        /// 构建货位查询表达式：当前数量、货区、名称
        /// </summary>
        /// <param name="db"></param>
        /// <param name="nCurrentNum"></param>
        /// <param name="areas"></param>
        /// <param name="name"></param>
        /// <returns></returns>
        public static ISugarQueryable<TN_Location> GetLocQuery(SqlSugarClient db, int nCurrentNum = 0, List<string> areas = null, string name = null) {
            var query = db.Queryable<TN_Location>()
                .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == nCurrentNum);

            if (areas != null && !areas.Any()) {
                query = query.Where(l => areas.Contains(l.S_AREA_CODE));
        private static string GetLockStateStr(int lockState) {
            var str = "";
            switch (lockState) {
                case 0: str = "无"; break;
                case 1: str = "入库锁"; break;
                case 2: str = "出库锁"; break;
                case 3: str = "其它锁"; break;
            }
            return str;
            }

        /// <summary>
        /// 构建货位查询表达式：当前锁状态、数量、货区、名称（默认筛选已启用货位）
        /// </summary>
        /// <param name="db">调用区域的数据库Client</param>
        /// <param name="lockState">锁状态，默认为0，小于0时不筛选</param>
        /// <param name="curNum">当前数量，默认为-1，小于0时不筛选</param>
        /// <param name="areas">所在库区列表，默认为null，为null或为空时不筛选</param>
        /// <param name="name">货位名称，默认为null，为null或为空时不筛选</param>
        /// <returns></returns>
        public static ISugarQueryable<TN_Location> Query(SqlSugarClient db, int lockState = 0, int curNum = -1, List<string> areas = null, string name = null) {
            var query = db.Queryable<TN_Location>().Where(l => l.C_ENABLE == "Y"); // 已启用

            if (lockState >= 0) {
                query = query.Where(l => l.N_LOCK_STATE == lockState && l.S_LOCK_STATE == GetLockStateStr(lockState));
            }
            if (curNum >= 0) {
                query = query.Where(l => l.N_CURRENT_NUM == curNum);
            }
            if (areas != null && areas.Count == 0) {
                query = query.Where(l => areas.Contains(l.S_AREA_CODE));
            }
            if (!string.IsNullOrEmpty(name)) {
                query = query.Where(l => l.S_CODE == name);
            }
@@ -204,6 +220,32 @@
        }

        /// <summary>
        /// 构建货位查询的要求信息
        /// </summary>
        /// <param name="lockState"></param>
        /// <param name="curNum"></param>
        /// <param name="areas"></param>
        /// <returns></returns>
        public static string Require(int lockState = 0, int curNum = -1, List<string> areas = null) {
            var res = "货位要求：";
            var index = 1;
            if (lockState >= 0) {
                res += $"({index})锁状态='{GetLockStateStr(lockState)}';";
                index++;
            }
            if (curNum >= 0) {
                res += $"({index})当前容器数量={curNum};";
                index++;
            }
            if (areas != null && areas.Count != 0) {
                res += $"({index})所在库区=['{string.Join("','", areas)}'];";
                index++;
            }

            return res;
        }

        /// <summary>
        /// 取货完解锁起点，卸货完解锁终点，可检验锁的来源，也可以不校验
        /// </summary>
        /// <param name="loc"></param>