优化空托空箱入库兼容出库容器回库场景，修复货位容器绑定的类型丢失问题

kazelee

2025-06-04 d944fda9f2fbf27d83e8fdf880e8fe5267e1f541

 wms/LocationHelper.cs

@@ -127,21 +127,46 @@
        }

        /// <summary>
        /// 入库锁定终点，出库锁定起点
        /// 你创建任务锁定货位的时候，把锁的来源就是任务号也写上去（加锁的方法加个参数，可空的参数），解锁的时候把来源置空。
        /// 起点出库锁（只能对无锁货位上锁）
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="lockState">1:入库锁、2:出库锁、3:其它锁</param>
        /// <param name="lockSource">锁的来源=任务号</param>
        /// <param name="lockSource"></param>
        /// <returns></returns>
        public static bool LockLoc(ref TN_Location loc, int lockState, string lockSource = "") {
            if (loc == null || loc.N_LOCK_STATE != 0) {
        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 = lockState;
                loc.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState);
                loc.N_LOCK_STATE = 2; // 起点出库锁
                loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 起点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }

            return true;
        }

        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 = TN_Location.GetLockStateStr(1); // 终点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }
@@ -159,7 +184,7 @@
        /// <param name="lockState">1:入库锁、2:出库锁、3:其它锁</param>
        /// <param name="lockSource">锁的来源=任务号</param>
        /// <returns></returns>
        public static bool LockLoc(string loc, int lockState, string lockSource = "")
        private static bool LockLoc(string loc, int lockState, string lockSource = "")
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
@@ -300,9 +325,17 @@
                var bindLocCntList = new List<TN_Loc_Container>();
                foreach (var item in cntrs)
                {
                    bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
                    // 针对容器类型添加的新逻辑
                    var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                        .Where(c => c.S_CNTR_CODE == item).First();
                    if (cntrItemRel == null) {
                        LogHelper.Info($"货位解绑时，容器{item}没有在容器物料信息关系表中查到");
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
                    }
                    else {
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntrItemRel.S_CNTR_TYPE });
                    }
                }


                var log = JsonConvert.SerializeObject(bindLocCntList);