kazelee
2025-06-12 48654bac6d758d6426a0e659a7d7bd08634acfc8
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");
@@ -249,7 +255,6 @@
                }
                cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
                var log = JsonConvert.SerializeObject(cntrs);
                var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
                if (location != null)
@@ -258,8 +263,30 @@
                    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,
                    //        });
                    //    }
                    //}
                    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 (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
                        {
                            LogHelper.Info($"删除货位容器关系表成功,{log}");
@@ -326,14 +353,16 @@
                foreach (var item in cntrs)
                {
                    // 针对容器类型添加的新逻辑
                    var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                        .Where(c => c.S_CNTR_CODE == item).First();
                    if (cntrItemRel == null) {
                        LogHelper.Info($"货位解绑时,容器{item}没有在容器物料信息关系表中查到");
                    var cntr = db.Queryable<TN_Container>()
                        .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 });
                    }
                    else {
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntrItemRel.S_CNTR_TYPE });
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntr.S_TYPE });
                    }
                }