优化配置文件和部分日志打印信息

kazelee

2025-06-27 d20ce230b49932d39ee4ce25e39fd78368c3b28a

 wms/LocationHelper.cs

@@ -153,6 +153,12 @@
            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");
@@ -175,32 +181,26 @@
        }

        /// <summary>
        /// 入库锁定终点，出库锁定起点
        /// 
        /// </summary>
        /// <remarks>
        /// 创建任务锁定货位的时候，把锁的来源就是任务号也写上去（加锁的方法加个参数，可空的参数），解锁的时候把来源置空
        /// </remarks>
        /// <param name="loc"></param>
        /// <param name="lockState">1:入库锁、2:出库锁、3:其它锁</param>
        /// <param name="lockSource">锁的来源=任务号</param>
        /// <param name="db"></param>
        /// <param name="nCurrentNum"></param>
        /// <param name="areas"></param>
        /// <param name="name"></param>
        /// <returns></returns>
        private static bool LockLoc(string loc, int lockState, string lockSource = "")
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            var model = db.Queryable<TN_Location>().Where(a => a.S_CODE == loc).First();
            LogHelper.Info($"锁货位{loc},状态{lockState},信息" + JsonConvert.SerializeObject(model));
            if (model != null && model.N_LOCK_STATE == 0)
            {
                model.N_LOCK_STATE = lockState;
                model.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState);
                model.S_LOCK_OP = lockSource;
                model.T_MODIFY = System.DateTime.Now;
                res = db.Updateable<TN_Location>(model).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() > 0;
            }
            LogHelper.Info($"锁货位{loc}返回{res}");
        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);

            return res;
            if (areas != null && !areas.Any()) {
                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>
@@ -257,29 +257,29 @@
                    location.S_LOCK_STATE = "无";
                    location.N_LOCK_STATE = 0;

                    var containerList = new List<TN_Container>();
                    foreach (var item in lcrList) {
                        // 针对容器类型添加的新逻辑
                        var cntr = db.Queryable<TN_Container>()
                            .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
                        if (cntr == null) {
                            LogHelper.Info($"货位解绑时，容器{item.S_CNTR_CODE}没有在容器信息表中查到，这里根据货位容器关系添加");
                            containerList.Add(new TN_Container {
                                S_CODE = item.S_CNTR_CODE,
                                S_TYPE = item.S_CNTR_TYPE,
                            });
                        }
                    }
                    //var containerList = new List<TN_Container>();
                    //foreach (var item in lcrList) {
                    //    // 针对容器类型添加的新逻辑
                    //    var cntr = db.Queryable<TN_Container>()
                    //        .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
                    //    if (cntr == null) {
                    //        LogHelper.Info($"货位解绑时，容器{item.S_CNTR_CODE}没有在容器信息表中查到，这里根据货位容器关系添加");
                    //        containerList.Add(new TN_Container {
                    //            S_CODE = item.S_CNTR_CODE,
                    //            S_TYPE = item.S_CNTR_TYPE,
                    //        });
                    //    }
                    //}

                    using (var tran = db.Ado.UseTran())
                    {
                        if (containerList.Count > 0) {
                            if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
                                LogHelper.Info($"插入容器信息表失败" + JsonConvert.SerializeObject(containerList));
                                tran.RollbackTran();
                                return "货位解绑容器失败，" + logs;
                            }
                        }
                        //if (containerList.Count > 0) {
                        //    if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
                        //        LogHelper.Info($"插入容器信息表失败" + JsonConvert.SerializeObject(containerList));
                        //        tran.RollbackTran();
                        //        return "货位解绑容器失败，" + logs;
                        //    }
                        //}

                        if (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
                        {
@@ -348,7 +348,9 @@
                {
                    // 针对容器类型添加的新逻辑
                    var cntr = db.Queryable<TN_Container>()
                        .Where(c => c.S_CODE == item).First();
                        .Where(c => c.S_CODE == item)
                        .First();

                    if (cntr == null) {
                        LogHelper.Info($"货位解绑时，容器{item}没有在容器信息表中查到，不记录容器类型");
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });