修复空托上线与满托下线联调的逻辑错误

kazelee

2025-06-13 99d001bbf2a0371373e15c97d3c6c7dcf45e97e3

 api/DebugController.cs

@@ -200,47 +200,48 @@
            const string taskName = TaskName.T托盘_满托下线入库;
            const string startAreaName = AreaName.B包装区;
            const string endAreaName = AreaName.M满托货架区;
            const string cntrType = "托盘";

            try {
                var itemCode = model.ItemCode;
                var batchNo = model.BatchNo;
                //var itemCode = model.ItemCode;
                //var batchNo = model.BatchNo;
                var cntrCode = model.CntrCode;
                var startLocCode = model.StartLoc;

                var cgDetail = new TN_CG_Detail {
                    S_ITEM_CODE = itemCode,
                    S_BATCH_NO = batchNo,
                    S_CNTR_CODE = cntrCode,
                };
                //var cgDetail = new TN_CG_Detail {
                //    S_ITEM_CODE = itemCode,
                //    S_BATCH_NO = batchNo,
                //    S_CNTR_CODE = cntrCode,
                //};

                var needInsertContainer = false;
                var needUpdateContainer = false;
                //var needInsertContainer = false;
                //var needUpdateContainer = false;
                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == cntrCode).First();
                //var cntr = db.Queryable<TN_Container>()
                //    .Where(c => c.S_CODE == cntrCode).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"轮询：{taskName}：容器：{cntrCode}，在容器表中没有登记，登记并设置容器来源为：{taskName}");
                //if (cntr == null) {
                //    needInsertContainer = true;
                //    LogHelper.Info($"轮询：{taskName}：容器：{cntrCode}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = cntrCode,
                        S_TYPE = "托盘",
                        S_SPEC = itemCode,
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果找到该容器，但容器物料类型与下线物料不符，记录并直接覆盖（待定）
                    if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
                        needUpdateContainer = true;
                        LogHelper.Info($"轮询：{taskName}：容器表中容器{cntrCode}对应的物料信息：{cntr.S_SPEC}，" +
                            $"与所需要的物料信息{itemCode}不符，直接覆盖结果");
                //    cntr = new TN_Container {
                //        S_CODE = cntrCode,
                //        S_TYPE = "托盘",
                //        S_SPEC = itemCode,
                //        S_SOURCE = taskName,
                //    };
                //}
                //else {
                //    // 如果找到该容器，但容器物料类型与下线物料不符，记录并直接覆盖（待定）
                //    if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
                //        needUpdateContainer = true;
                //        LogHelper.Info($"轮询：{taskName}：容器表中容器{cntrCode}对应的物料信息：{cntr.S_SPEC}，" +
                //            $"与所需要的物料信息{itemCode}不符，直接覆盖结果");

                        cntr.S_SPEC = itemCode;
                        cntr.S_SOURCE = taskName;
                    }
                }
                //        cntr.S_SPEC = itemCode;
                //        cntr.S_SOURCE = taskName;
                //    }
                //}

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == startLocCode)
@@ -255,12 +256,17 @@
                    return info;
                }

                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == cntrCode).First();

                // 绑定货位和容器号
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLocCode,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    S_CNTR_TYPE = "托盘",
                    S_CNTR_CODE = cntrCode,
                    S_CNTR_TYPE = cntrType,
                };

                startLoc.N_CURRENT_NUM = 1; // 绑定后

                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE))
@@ -282,29 +288,38 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"插入容器货品信息表失败：物料编码{cgDetail.S_ITEM_CODE}，容器编码{cgDetail.S_CNTR_CODE}";
                        LogHelper.Info(info);
                        return info;
                    if (locCntrRelOld != null) {
                        if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0 &&
                            db.Updateable<TN_Location>().SetColumns(l => l.N_CURRENT_NUM == 0).Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"删除旧货位容器关系表失败：货位编码{locCntrRelOld.S_LOC_CODE}，容器编码{locCntrRelOld.S_CNTR_CODE}";
                            LogHelper.Info(info);
                            return info;
                        }
                    }
                    //if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    info = $"插入容器货品信息表失败：物料编码{cgDetail.S_ITEM_CODE}，容器编码{cgDetail.S_CNTR_CODE}";
                    //    LogHelper.Info(info);
                    //    return info;
                    //}

                    if (needInsertContainer) {
                        if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return info;
                        }
                    }
                    else if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return info;
                        }
                    }
                    //if (needInsertContainer) {
                    //    if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                    //        info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                    //        tran.RollbackTran();
                    //        LogHelper.Info(info);
                    //        return info;
                    //    }
                    //}
                    //else if (needUpdateContainer) {
                    //    if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                    //        info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                    //        tran.RollbackTran();
                    //        LogHelper.Info(info);
                    //        return info;
                    //    }
                    //}

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -313,12 +328,7 @@
                        return info;
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
@@ -360,11 +370,11 @@

    public class AddInboundTaskInfo {
        /// <summary>
        /// 物料编码
        /// 物料编码（暂时没用）
        /// </summary>
        public string ItemCode { get; set; }
        /// <summary>
        /// 批次号
        /// 批次号（暂时没用）
        /// </summary>
        public string BatchNo { get; set; }
        /// <summary>