From 3bdd686d50ae8c999924ac64101a5dbe4e271c71 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 04 七月 2025 17:27:19 +0800 Subject: [PATCH] 优化日志信息,删除冗余的工具类代码 --- wms/LocationHelper.cs | 119 ----------------------------------------------------------- 1 files changed, 0 insertions(+), 119 deletions(-) diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs index 714a1bc..ad88264 100644 --- a/wms/LocationHelper.cs +++ b/wms/LocationHelper.cs @@ -127,125 +127,6 @@ } /// <summary> - /// 璧风偣鍑哄簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級 - /// </summary> - /// <param name="loc"></param> - /// <param name="lockSource"></param> - /// <returns></returns> - public static bool LockStartLoc(ref TN_Location loc, string lockSource = "") { - if (loc == null) { - LogHelper.Info($"璧风偣鍑哄簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null"); - return false; - } - - if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "鏃�) { - LogHelper.Info($"璧风偣鍑哄簱閿侊細璐т綅褰撳墠宸叉湁閿�{loc.N_LOCK_STATE},{loc.S_LOCK_STATE})"); - return false; - } - - if (loc != null && loc.N_LOCK_STATE == 0) { - loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�- loc.S_LOCK_STATE = GetLockStateStr(2); // 璧风偣鍑哄簱閿�- loc.S_LOCK_OP = lockSource; - loc.T_MODIFY = System.DateTime.Now; - } - - return true; - } - - /// <summary> - /// 缁堢偣鍏ュ簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級 - /// </summary> - /// <param name="loc"></param> - /// <param name="lockSource"></param> - /// <returns></returns> - public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") { - if (loc == null) { - LogHelper.Info($"缁堢偣鍏ュ簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null"); - return false; - } - - if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "鏃�) { - LogHelper.Info($"缁堢偣鍏ュ簱閿侊細璐т綅褰撳墠宸叉湁閿�{loc.N_LOCK_STATE},{loc.S_LOCK_STATE})"); - return false; - } - - if (loc != null && loc.N_LOCK_STATE == 0) { - loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�- loc.S_LOCK_STATE = GetLockStateStr(1); // 缁堢偣鍑哄簱閿�- loc.S_LOCK_OP = lockSource; - loc.T_MODIFY = System.DateTime.Now; - } - - return true; - } - - 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">閿佺姸鎬侊紝榛樿涓�锛屽皬浜�鏃朵笉绛涢�</param> - /// <param name="curNum">褰撳墠鏁伴噺锛岄粯璁や负-1锛屽皬浜�鏃朵笉绛涢�</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); - } - - return query; - } - - /// <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> -- Gitblit v1.9.1