修复细节错误，优化报错信息

kazelee

2025-06-12 48654bac6d758d6426a0e659a7d7bd08634acfc8

修复细节错误，优化报错信息

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/16cec1d3-204a-4803-a3d3-25bcd983bea9.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1912c2ce-d2a9-4b1c-82fe-620c78efc36f.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3b98bb07-94dd-4668-8e48-2d4c81bfe8f5.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/43738d2c-dc76-49d4-9704-65742496dac9.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/5c630563-0c2e-4c9a-b0ed-88f0f49d2377.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/af8508f5-ad22-43b1-b70b-0efaa94c3359.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bd3ccb48-a785-4e86-8285-4198f2483a17.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/d4ee5337-1afa-4e11-9fd2-caeaeefa2394.vsidx

Binary files differ

 api/ApiHelper.cs

@@ -19,7 +19,9 @@
        /// 好运箱-满箱下线入库(PDA)
        /// </summary>
        /// <remarks>
        /// 流程：人工将满箱从产线搬运到操作区后，使用PDA调用接口，呼叫AGV将满箱搬运到货架区（不指定终点货区）
        /// 人工：产线==>满箱操作区<br/>
        /// PDA：调用接口，呼叫AGV<br/>
        /// AGV：满箱操作区==搬运==>货架区（不指定终点货区）
        /// </remarks>
        /// <param name="model">包含：物料信息、起点货位</param>
        /// <returns></returns>
@@ -27,81 +29,70 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息
            var startAreaName = AreaName.M满箱操作区; // 起点货区
            var endAreaName = AreaName.M满箱货架区; // 终点货区
            const string taskName = TaskName.H好运箱_满箱下线入库;
            const string startAreaName = AreaName.M满箱操作区;
            const string endAreaName = AreaName.M满箱货架区;

            try {
                // 参数合法性确认部分：错误编码：400
                if (model.Num <= 0 ) {
                    info = $"物料数量{model.Num}不合法：物料数量应该大于 0";
                if (model.Num <= 0) {
                    info = $"物料数量'{model.Num}'不合法：物料数量应该大于0";
                    LogHelper.Info(info);
                    return NewSimpleResult(400, info);
                }

                // 贴标机会提前将物料信息写入CG_Detail表中
                // 将PDA提供的物料编码与贴标机的信息比对
                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 指定：物料编码、批次号
                    .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检") // 新增物料，故物料状态应该为 1待检
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo)
                    .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检")
                    .First(); // TODO model 中 数量、规格是否也参与比对 待后续要求

                // 如果找不到指定的物料，说明信息不一致，报错
                if (cgDetail == null) {
                    info = $"PDA扫码物料信息与贴标机传递的信息不一致：" + JsonConvert.SerializeObject(model);
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
                
                // 查询起点货位，是否符合要求（初次下线要求货位无容器）
                // 注：起点货位绑定前没有货物，数量为 0

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位号
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0) // 绑定前
                    .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不具备取货要求：未上锁、绑定前无货物";
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
                } 

                startLoc.N_CURRENT_NUM = 1; // 绑定后，修改起点货位数量为 1
                startLoc.N_CURRENT_NUM = 1; // 绑定后

                // 绑定货位和容器号（满箱下线到操作区，此时尚未绑定）
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLoc.S_CODE, // 已校验
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE, // 已校验
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    S_CNTR_TYPE = "好运箱",
                };
                // NOTE 不需要校验locCntrRel的容器是否存在，博实下发物料已经做过校验
                
                // TODO 满箱入库算法待优化

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .OrderBy(l => l.N_LAYER) // 按货架最低排序
                    .First();
                    .First();// TODO 满箱入库算法待优化

                if (endLoc == null) {
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
                } 

                var cntId = locCntrRel.S_CNTR_CODE;
                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                // 数据库操作事务部分：错误编码：500
                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                        info = $"插入【货位容器绑定】表失败：" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
@@ -131,16 +122,16 @@
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }
                    

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -165,17 +156,17 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.T托盘_空托入库;
            var startAreaName = AreaName.K空托入库接驳区;
            var endAreaName = AreaName.K空托存放区;
            const string taskName = TaskName.T托盘_空托入库;
            const string startAreaName = AreaName.K空托入库接驳区;
            const string endAreaName = AreaName.K空托存放区;
            const string cntrType = "托盘";

            try {
                // 现在PDA没有单独的绑定流程，绑定在入库时完成
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 绑定前货位为空
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .First();

                if (startLoc == null) {
@@ -184,20 +175,17 @@
                    return NewSimpleResult(1, info);
                }

                // TEMP 目前流程：容器必须先在系统中维护，否则报错
                // - 后台程序不可以生成Container，必须由前台维护
                // - 否则，工人随意输入一个容器/输入错容器号，都可以绑定
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
                    .First();

                if (cntr == null) {
                    info = $"容器'{model.CntrCode}'在容器表中不存在，请在前台页面中维护！";
                    info = $"容器'{model.CntrCode}'在【容器表】中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
                if (cntr.S_TYPE != "托盘") { // 空托入库
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与输入的容器类型'托盘'不同！";
                if (cntr.S_TYPE != cntrType) { // 空托入库
                    info = $"容器'{model.CntrCode}'在【容器表】中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
@@ -205,11 +193,13 @@
                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                var cgDetailOld = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                    .Where(d => d.S_CNTR_CODE == model.CntrCode)
                    .First();

                // 如果人工将出库后的托盘入库，此时容器仍然与旧的出库货位绑定，需要检查
                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
                    .Where(c => c.S_CNTR_CODE == model.CntrCode)
                    .First();

                TN_Location locOld = null;
                if (locCntrRelOld != null) { // 如果需要解绑容器货位，也需要修改货位信息
@@ -225,33 +215,31 @@
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntr.S_CODE,
                    S_CNTR_TYPE = "托盘", // 空托入库
                    S_CNTR_TYPE = cntrType, // 空托入库
                };

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL })
                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 暂定选择最低层按区位顺序入库，后面待修改
                    .First();

                if (endLoc == null) {
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
                    info = $"在【{endAreaName}】中没有找到合适的【终点货位】，需要满足：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }

                var cntId = locCntrRel.S_CNTR_CODE;
                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (cgDetailOld != null) {
                        if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                            info = $"删除旧物料信息失败：" + JsonConvert.SerializeObject(cgDetailOld);
                            info = $"删除【旧物料信息】失败：" + JsonConvert.SerializeObject(cgDetailOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
@@ -260,7 +248,7 @@

                    if (locCntrRelOld != null) {
                        if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                            info = $"删除旧货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRelOld);
                            info = $"删除【旧货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRelOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
@@ -269,7 +257,7 @@

                    if (locOld != null) {
                        if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                            info = $"更新旧货位容器数量失败：" + JsonConvert.SerializeObject(locOld);
                            info = $"更新旧货位【容器数量】失败：" + JsonConvert.SerializeObject(locOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
@@ -277,12 +265,12 @@
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }
                     

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
@@ -290,7 +278,7 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }
@@ -302,28 +290,28 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(0, info); 
                }
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -331,7 +319,7 @@
        /// 好运箱-空箱入库(PDA)
        /// </summary>
        /// <remarks>
        /// 人工将空箱通过接驳位入库，需要新绑定容器货位<br/>
        /// 人工：空箱==搬运==>入库接驳位，需要新绑定容器货位<br/>
        /// 由于空箱一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <returns></returns>
@@ -339,27 +327,25 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.H好运箱_空箱入库;
            var startAreaName = AreaName.K空箱入库接驳区;
            var endAreaName = AreaName.K空箱货架区;
            const string taskName = TaskName.H好运箱_空箱入库;
            const string startAreaName = AreaName.K空箱入库接驳区;
            const string endAreaName = AreaName.K空箱货架区;
            const string cntrType = "好运箱";

            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0) // 绑定前货位为空
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => l.N_CURRENT_NUM == 0) // 绑定前
                    .First();

                if (startLoc == null) {
                    info = $"起点位置{model.StartLoc}不存在或不具备取货要求";
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                // TEMP 目前流程：容器必须先在系统中维护，否则报错
                // - 后台程序不可以生成Container，必须由前台维护
                // - 否则，工人随意输入一个容器/输入错容器号，都可以绑定
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
                    .First();
@@ -369,8 +355,8 @@
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
                if (cntr.S_TYPE != "好运箱") { // 空箱入库
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与输入的容器类型'好运箱'不同！";
                if (cntr.S_TYPE != cntrType) {
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
@@ -397,15 +383,14 @@
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntr.S_CODE,
                    S_CNTR_TYPE = "好运箱",
                    S_CNTR_TYPE = cntrType,
                };

                // TODO 暂定选择最低层顺序入库，后面待修改
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .OrderBy(l => new { l.N_LAYER })
                    .OrderBy(l => new { l.N_LAYER }) // TODO 暂定选择最低层顺序入库，后面待修改
                    .First();

                if (endLoc == null) {
@@ -415,44 +400,45 @@
                }

                var cntId = locCntrRel.S_CNTR_CODE;

                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    // 存在旧【物料明细】表时，删除旧表
                    if (cgDetailOld != null) {
                        if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                            info = $"删除旧物料信息失败：" + JsonConvert.SerializeObject(cgDetailOld);
                            info = $"删除【旧物料信息】失败：" + JsonConvert.SerializeObject(cgDetailOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }

                    // 存在旧【货位容器绑定】表时，删除旧表
                    if (locCntrRelOld != null) {
                        if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                            info = $"删除旧货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRelOld);
                            info = $"删除【旧货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRelOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }

                    if (locOld != null) {
                        if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
                            info = $"更新旧货位容器数量失败：" + JsonConvert.SerializeObject(locOld);
                            info = $"更新旧货位【容器数量】失败：" + JsonConvert.SerializeObject(locOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -462,9 +448,9 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -474,20 +460,20 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -495,7 +481,7 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -511,25 +497,23 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.T托盘_空托上线;
            var startAreaName = AreaName.K空托存放区;
            var endAreaName = AreaName.B包装区;
            const string taskName = TaskName.T托盘_空托上线;
            const string startAreaName = AreaName.K空托存放区;
            const string endAreaName = AreaName.B包装区;
            const string cntrType = "托盘";

            try {
                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntId)
                    .First();

                // 如果容器在容器表中不存在，报错
                if (cntr == null) {
                    info = $"容器'{model.CntId}'在容器表中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
                // 如果存在容器号，但类型不是托盘，报错
                if (cntr.S_TYPE != "托盘") { // 容器类型默认不会为空
                    info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'托盘'！";
                if (cntr.S_TYPE != cntrType) { // 容器类型默认不会为空
                    info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'{cntrType}'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
@@ -540,7 +524,7 @@
                    // 待定：后面可能会更改流程，或者用其他信息（如物料类型/规格）作为容器的规格

                    needUpdateContainer = true;
                    info = $"容器'{model.CntId}'在容器表中规格（物料编码）为空，将物料编码'{model.ItemCode}'写入容器的规格";
                    info = $"容器'{model.CntId}'在容器表中 规格（物料编码）为空，将物料编码'{model.ItemCode}'写入容器的规格";
                    LogHelper.Info(info);

                    cntr.S_SPEC = model.ItemCode;
@@ -552,36 +536,36 @@
                }

                var startLoc = db.Queryable<TN_Location>()
                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 联表：货位容器关系表
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 找指定容器号
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 限定在空托存放区中找容器货位
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：没有锁状态
                    .Where(l => l.N_CURRENT_NUM == 1) // 筛选：有货货位
                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .First();

                if (startLoc == null) {
                    info = $"在空托存放区中，找不到符合{model.ItemCode}物料，且编码为{model.CntId}的空托盘";
                    info = $"在'{startAreaName}'中，找不到适用于{model.ItemCode}物料、且编码为{model.CntId}的空托盘";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) 
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .First();

                if (endLoc == null) {
                    info = $"终点位置 不存在或不具备放货要求";
                    info = $"在'{endAreaName}'中，找不到合适的【终点货位】，需要满足：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }

                var cntId = model.CntId;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                cntr.S_SOURCE = task.S_CODE; // 用任务号作为容器更新的依据
                cntr.T_MODIFY = DateTime.Now;
@@ -591,9 +575,9 @@
                        if (db.Updateable<TN_Container>(cntr)
                            .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"更新表'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            info = $"更新表容器表失败：" + JsonConvert.SerializeObject(cntr);
                            LogHelper.Info(info);
                            return NewSimpleResult(4, info);
                            return NewSimpleResult(500, info);
                        }
                    }

@@ -604,9 +588,9 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -616,20 +600,20 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -650,40 +634,37 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.H好运箱_空箱上线;
            var startAreaName = AreaName.K空箱货架区;
            var endAreaName = AreaName.K空箱操作区;
            const string taskName = TaskName.H好运箱_空箱上线;
            const string startAreaName = AreaName.K空箱货架区;
            const string endAreaName = AreaName.K空箱操作区;
            const string cntrType = "好运箱";

            try {
                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntId)
                    .First();

                // 如果容器在容器表中不存在，报错
                if (cntr == null) {
                    info = $"容器'{model.CntId}'在容器表中不存在，请在前台页面中维护！";
                    info = $"容器'{model.CntId}'在【容器表】中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
                // 如果存在容器号，但类型不是托盘，报错
                if (cntr.S_TYPE != "托盘") { // 容器类型默认不会为空
                    info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'好运箱'！";
                if (cntr.S_TYPE != cntrType) {
                    info = $"容器'{model.CntId}'在【容器表】中的类型={cntr.S_TYPE}，不是'{cntrType}'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
                // NOTE 好运箱只需要关注在不在，不需要关心其适用物料类型

                var startLoc = db.Queryable<TN_Location>()
                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "好运箱")
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中，找不到编码为{model.CntId}的空好运箱";
                    info = $"在'{startAreaName}'中，找不到存放容器编码={model.CntId}的空好运箱的【起点货位】，或不满足：未上锁、当前数量=1";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
@@ -695,7 +676,7 @@
                    .First();

                if (endLoc == null) {
                    info = $"终点位置 不存在或不具备放货要求";
                    info = $"在'{endAreaName}'中，找不到合适的【终点货位】，需要满足：未上锁、当前数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }
@@ -714,9 +695,9 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -726,20 +707,20 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -747,7 +728,7 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -761,8 +742,9 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_合格回库;
            var startAreaName = AreaName.C抽检区;
            const string taskName = TaskName.C抽检_合格回库;
            const string startAreaName = AreaName.C抽检区;
            var endAreaName = "";

            try {
                var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -798,17 +780,19 @@
                    return NewSimpleResult(4, info);
                }

                var endLoc = new TN_Location();
                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreaName = AreaName.M满托货架区;
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
                        .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
                        .First();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
                    endAreaName = AreaName.M满箱货架区;
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
                        .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0)
                        .First();
@@ -818,13 +802,14 @@
                }

                if (endLoc == null) {
                    info = "查询：没有找到合适的终点货位";
                    info = $"在【{endAreaName}】中没有找到合适的【终点货位】，或不满足要求：未上锁、当前容器数量为 0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                cgDetail.N_ITEM_STATE = 0;
                cgDetail.S_ITEM_STATE = "合格";
                cgDetail.T_MODIFY = DateTime.Now;

                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
@@ -834,11 +819,11 @@

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
                        new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
                        new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "修改物料状态为合格 失败";
                        info = $"生成'{taskName}'失败：修改物料状态为'合格'失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -848,9 +833,9 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -859,29 +844,29 @@
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {

                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    return NewSimpleResult(0,
                        $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -894,12 +879,14 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_不合格移库;
            const string taskName = TaskName.C抽检_不合格移库;
            const string startAreaName = AreaName.C抽检区;
            const string endAreaName = AreaName.C抽检异常区;

            try {

                if (!Settings.AreaMap[AreaName.C抽检异常区].Contains(model.EndArea)) {
                    info = $"终点库区{model.EndArea}不属于{AreaName.C抽检异常区}";
                if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) {
                    info = $"输入的终点库区'{model.EndArea}'不属于'{endAreaName}'!";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
@@ -909,8 +896,9 @@
                    .First();

                if (cgDetail == null) {

                    return NewSimpleResult(2, "没有找到待回库的抽检物料");
                    info = $"没有在物料明细表中，找到物料编码={model.ItemCode}、容器编码={model.CntrCode}的物料";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
@@ -918,22 +906,22 @@
                    .First();

                if (locCntrRel == null) {
                    info = $"容器{model.CntrCode}在货位容器关系表中不存在";
                    info = $"容器'{model.CntrCode}'在货位容器关系表中不存在";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .Where(l => Settings.AreaMap[AreaName.C抽检区].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
                    info = "待抽检物料在抽检区中没有找到！";
                    info = $"在'{startAreaName}'中没有找到起点货位'{locCntrRel.S_LOC_CODE}'，或不满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(2, info);
                }

                var endLoc = db.Queryable<TN_Location>()
@@ -943,7 +931,7 @@
                    .First();

                if (endLoc == null) {
                    info = "查询：没有找到合适的终点货位";
                    info = $"在终点货区'{model.EndArea}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
@@ -961,9 +949,9 @@
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
                        new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "修改物料状态为合格 失败";
                        info = $"生成任务'{taskName}'失败：修改物料状态为'不合格'失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -973,9 +961,9 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -984,29 +972,29 @@
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {

                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    return NewSimpleResult(0,
                        $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -1019,7 +1007,8 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.W尾箱回库;
            const string taskName = TaskName.W尾箱回库;
            var endAreaName = "";
            
            try {
                var startLoc = db.Queryable<TN_Location>()
@@ -1044,25 +1033,23 @@
                    return NewSimpleResult(3, info);
                }

                //var endLoc = new TN_Location();
                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreaName = AreaName.M满托货架区;
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
                        .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                        .Where(l => l.N_CURRENT_NUM == 0)
                        .First();
                }
                else if (locCntrRel.S_CNTR_TYPE =="好运箱"){
                else if (locCntrRel.S_CNTR_TYPE == "好运箱"){
                    endAreaName = AreaName.M满箱货架区;
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
                        .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                        .Where(l => l.N_CURRENT_NUM == 0)
                        .First();
                }
                //else {
                //    endLoc = null;
                //}

                if (endLoc == null) {
                    info = "查询：没有找到合适的终点货位";
@@ -1071,10 +1058,10 @@
                }

                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -1084,9 +1071,9 @@
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -1095,22 +1082,21 @@
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {

                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败：更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}";
                    info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -1118,7 +1104,7 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -1134,7 +1120,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C成品胶出库;
            const string taskName = TaskName.C成品胶出库;

            try {
                var orderNo = GenerateOrderNo("出库单号", "CKD");
@@ -1205,7 +1191,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C成品胶出库;
            const string taskName = TaskName.C成品胶出库;

            try {
                var orderNo = GenerateOrderNo("出库单号", "CKD");
@@ -1549,14 +1535,14 @@
                        tran.RollbackTran();
                        info = "生成出库单失败：" + JsonConvert.SerializeObject(order);
                        LogHelper.Info(info);
                        return NewErpResult(2, info);
                        return NewErpResult(500, info);
                    }

                    if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "生成出库单明细失败";
                        LogHelper.Info(info);
                        return NewErpResult(4, info);
                        return NewErpResult(500, info);
                    }

                    if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
@@ -1569,7 +1555,9 @@
                    tran.CommitTran();
                }

                return NewErpResult(0, "生成出库单成功");
                info = $"生成出库单成功";
                LogHelper.Info(info);
                return NewErpResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";

 api/ApiModel.cs

@@ -260,7 +260,17 @@
        /// <summary>
        /// 不合格移库数据类
        /// </summary>
        public class UnqualifiedShiftInfo : QualifiedBackInfo {
        public class UnqualifiedShiftInfo {
            /// <summary>
            /// 物料编码
            /// </summary>
            [JsonProperty("item_code")]
            public string ItemCode { get; set; }
            /// <summary>
            /// 容器编码
            /// </summary>
            [JsonProperty("cntr_code")]
            public string CntrCode { get; set; }
            /// <summary>
            /// 不合格移库终点库区（必须是 CJYCQ 抽检异常区）
            /// </summary>

 api/DebugController.cs

@@ -166,64 +166,6 @@
                    //typeof(TN_Container_Item),
                };

                //var areaNameList = new List<string>();
                //foreach (var area in Settings.Areas) {
                //    areaNameList.AddRange(area.Codes);
                //}

                //var locationList = new List<TN_Location>();
                //foreach (var area in areaNameList) {
                //    int i = 0;
                //    int j = 0;
                //    int k = 0;

                //    if (area == "KXHJQ" || area == "MTHJQ" || area == "MXHJQ") {
                //        for (i = 1; i <= 4; i++) {
                //            for (j = 1; j <= 5; j++) {
                //                for (k = 1; k <= 3; k++) {
                //                    locationList.Add(new TN_Location() {
                //                        N_ROW = i,
                //                        N_COL = j,
                //                        N_LAYER = k,
                //                        S_AREA_CODE = area,
                //                        S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" +
                //                        $"-{k.ToString().PadLeft(2, '0')}"
                //                    });
                //                }
                //            }
                //        }
                //        continue;
                //    }

                //    if (area == "BZQ") {
                //        for (i = 1; i <= 2; i++) {
                //            for (j = 1; j <= 2; j++) {
                //                locationList.Add(new TN_Location() {
                //                    N_ROW = i,
                //                    N_COL = j,
                //                    S_AREA_CODE = area,
                //                    S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
                //                });
                //            }
                //        }
                //        continue;
                //    }

                //    i = 1;
                //    for (j = 1; j <= 5; j++) {
                //        locationList.Add(new TN_Location() {
                //            N_ROW = i,
                //            N_COL = j,
                //            S_AREA_CODE = area,
                //            S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
                //        });
                //    }

                    
                //}



                //using (var tran = db.Ado.UseTran()) {
                //    //db.CodeFirst.InitTables(entityTypes);
                //    if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
@@ -245,89 +187,6 @@
        }

        /// <summary>
        /// DEBUG：插入货位、容器、货品信息
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [Route("InsertLocCntrCg")]
        public string InsertLocCntrCg(LocCntrCg locCntrCg) {
            var db = new SqlHelper<object>().GetInstance();

            try {

                using (var tran = db.UseTran()) {
                    LogHelper.Info("LogCntrCg：" + JsonConvert.SerializeObject(locCntrCg));
                    if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";

                    var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
                    if (loc == null) {
                        var newLoc = new TN_Location {
                            S_CODE = locCntrCg.LocCode,
                            S_AREA_CODE = locCntrCg.LocArea ?? ""
                        };

                        if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"插入位置{locCntrCg.LocCode}失败");
                            return "插入失败";
                        }

                        loc = newLoc;
                    }

                    if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
                        LogHelper.Info("容器号为空，不再读取后面的数据");
                        return "";
                    }

                    var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
                        && a.S_CNTR_CODE == locCntrCg.CntrCode);

                    if (locCntrRel == null) {
                        var newLocCntrRel = new TN_Loc_Container {
                            S_LOC_CODE = locCntrCg.LocCode,
                            S_CNTR_CODE = locCntrCg.CntrCode,
                            S_CNTR_TYPE = locCntrCg.CntrType ?? ""
                        };

                        loc.N_CURRENT_NUM = 1;

                        if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
                            && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"插入位置托盘关系{locCntrCg.LocCode}-{locCntrCg.CntrCode}失败");
                            return "插入失败";
                        }
                    }

                    if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
                        LogHelper.Info("物料号为空，不再读取后面的数据");
                        return "";
                    }

                    var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
                        && a.S_ITEM_CODE == locCntrCg.ItemCode);
                    if (cgDetail == null) {
                        var locList = new List<TN_CG_Detail>();
                        locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
                        if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"插入托盘物料关系{locCntrCg.CntrCode}-{locCntrCg}失败");
                            return "插入失败";
                        }
                    }
                    tran.CommitTran();
                }

                return "插入数据成功";

            }
            catch (Exception ex) {
                return $"Error reading CSV file: {ex.Message}";
            }
        }

        /// <summary>
        /// DEBUG：模拟输送线产线满托盘下线流程
        /// </summary>
        /// <param name="model"></param>
@@ -338,11 +197,11 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.T托盘_满托下线入库;
            var startAreaName = AreaName.B包装区;
            const string taskName = TaskName.T托盘_满托下线入库;
            const string startAreaName = AreaName.B包装区;
            const string endAreaName = AreaName.M满托货架区;

            try {

                var itemCode = model.ItemCode;
                var batchNo = model.BatchNo;
                var cntrCode = model.CntrCode;
@@ -384,14 +243,14 @@
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == startLocCode) // 指定：起点货位号
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => l.S_CODE == startLocCode)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0) // 绑定前
                    .First();

                if (startLoc == null) {
                    info = $"起点位置 '{startLocCode}' 不存在或不具备取货要求";
                    info = $"在'{startAreaName}'中没有找到起点货位'{startLocCode}'，或不满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return info;
                }
@@ -404,14 +263,14 @@
                };

                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[AreaName.M满托货架区].Contains(a.S_AREA_CODE))
                    .Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 0) // 筛选：空货位
                    .OrderBy(l => l.N_LAYER)
                    .First();

                if (endLoc == null) {
                    info = "空托入库暂时没有合适的货位可以入库";
                    info = $"在终点货区'{endAreaName}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return info;
                }

 core/Monitor.cs

@@ -20,10 +20,13 @@
            public string cntr_code { get; set; }
        }

        public static void CheckInbound() {
            var taskName = TaskName.T托盘_满托下线入库;
        public static void CheckInbound() {                
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.T托盘_满托下线入库;
            const string cntrType = "托盘";

            try {
                // 查产线是否有物料信息
                foreach (var prod in Settings.ProductionLines) {
@@ -80,7 +83,7 @@

                        cntr = new TN_Container {
                            S_CODE = cntrCode,
                            S_TYPE = "托盘",
                            S_TYPE = cntrType,
                            S_SPEC = itemCode,
                        };
                    }
@@ -105,14 +108,13 @@
                        info = $"起点位置 '{startLocCode}' 不存在或不具备取货要求";
                        LogHelper.Info(info);
                        continue;
                        //return;
                    }

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

                    var endLoc = db.Queryable<TN_Location>()
@@ -174,7 +176,8 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
@@ -186,7 +189,7 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
@@ -196,13 +199,13 @@

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                            info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -219,7 +222,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C成品胶出库;
            const string taskName = TaskName.C成品胶出库;

            try {
                var orderList = db.Queryable<TN_Outbound_Order>()
@@ -323,36 +326,36 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"轮询：{taskName}：生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }


                        if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"轮询：{taskName}：生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"轮询：{taskName}：生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                            info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        tran.CommitTran();
                        info = $"轮询：{taskName}：生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -400,7 +403,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_出库;
            const string taskName = TaskName.C抽检_出库;

            try {
                var orderList = db.Queryable<TN_Spot_Check>()
@@ -481,7 +484,8 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
@@ -493,7 +497,7 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
@@ -503,13 +507,13 @@

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                            info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -520,10 +524,12 @@
            }
        }

        public static void CheckShiftOrder() {
            var taskName = TaskName.Y移库;
        public static void CheckShiftOrder() {                
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.Y移库;

            try {
                var orderList = db.Queryable<TN_Relocation_List>()
                    .Where(c => c.N_B_STATE == 1)
@@ -541,7 +547,7 @@
                        .Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 执行中
                    var allCount = db.Queryable<TN_RelocationList_Detail>()
                        .Count(d => d.S_OO_NO == order.S_NO);
                    LogHelper.Info($"轮询：{taskName}：统计{taskName}单'{order.S_NO}'任务已下发：{doingCount}/{allCount}");
                    LogHelper.Info($"轮询：{taskName}：统计{taskName}单={order.S_NO}任务已下发：{doingCount}/{allCount}");

                    if (doingCount == allCount) {
                        order.N_B_STATE = 2; // 所有任务都已执行
@@ -572,7 +578,8 @@
                        .First();

                    if (startLoc == null) {
                        LogHelper.Info($"轮询：{taskName}：没有找到合适的起点货位！");
                        info = $"轮询：{taskName}：没有找到容器号={detail.S_CNTR_CODE}的起点货位！需要满足：未上锁、当前容器数量=1";
                        LogHelper.Info(info);
                        continue;
                    }

@@ -582,7 +589,8 @@
                        .Where(a => a.N_CURRENT_NUM == 0).First();

                    if (endLoc == null) {
                        LogHelper.Info($"轮询：{taskName}：没有找到合适的终点货位！");
                        info = $"轮询：{taskName}：没有找到终点货位={detail.S_END_AREA}的终点货位！需要满足：未上锁、当前容器数量=0";
                        LogHelper.Info(info);
                        continue;
                    }

@@ -605,7 +613,8 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
@@ -617,7 +626,7 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
@@ -627,13 +636,13 @@

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                            info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }
                        }   

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }

 core/WCSCore.cs

@@ -20,27 +20,15 @@
        public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) {
            var result = new ReturnResult();
            try {
                switch (model.state) {
                    case 1023:
                        break;
                    case 1025:
                        break;
                    case 1012:
                        break;
                    case 1004:
                        break;
                    case 1103:
                        break;
                    default:
                        // AGV 执行任务的逻辑处理
                        if (!AgvTaskProcessOk(model)) {
                            // 执行不OK，说明没有找到任务
                            result.ResultCode = 1;
                            result.ResultMsg = $"根据Model.No未找到对应的任务，{model.task_no}";
                            LogHelper.Info(result.ResultMsg, "API");
                            return result;
                        }
                        break;
                if (model.state > 0 && model.state < 1000) {
                    // AGV 执行任务的逻辑处理
                    if (!AgvTaskProcessOk(model)) {
                        // 执行不OK，说明没有找到任务
                        result.ResultCode = 1;
                        result.ResultMsg = $"根据Model.No未找到对应的任务，{model.task_no}";
                        LogHelper.Info(result.ResultMsg, "API");
                        return result;
                    }
                }

                result.ResultCode = 0;
@@ -181,7 +169,6 @@
                };

                // 数据库操作

                if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
                    info = "插入出入库记录表失败：" + JsonConvert.SerializeObject(record);
                    LogHelper.Info(info);
@@ -262,7 +249,6 @@
                    info = $"向输送线写入允许取货信号成功";
                    LogHelper.Info(info);
                    return NewReturnResult(0, info);

                }
                else if (model.apply_code == "1") { // 请求卸货
                    if (prodLineDevice.AllowAgvPlacePallet != 1) {
@@ -303,7 +289,7 @@
                .First(d => d.N_B_STATE == 2);

            if (detail == null) {
                LogHelper.Info($"{taskName}--AGV取货--查询明细单：当前没有执行中的明细单");
                LogHelper.Info($"{taskName}：AGV取货：查询明细单：当前没有执行中的明细单");
                return;
            }

@@ -311,14 +297,14 @@
                detail.N_B_STATE = spotStateCode;
                if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                    tran.RollbackTran();
                    LogHelper.Info($"{taskName}--AGV取货：修改明细单状态为3任务执行完成--失败！");
                    LogHelper.Info($"{taskName}：AGV取货：修改明细单状态为【3任务执行完成】失败！");
                    return;
                }

                var finishedCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO && d.N_B_STATE == 3);
                var allCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO);

                LogHelper.Info($"{taskName}--AGV取货--统计任务已完成：{finishedCount}/{allCount}");
                LogHelper.Info($"{taskName}：AGV取货：统计任务已完成：{finishedCount}/{allCount}");

                if (finishedCount == allCount) { // 当前出库单下的所有明细单，任务都已经完成

@@ -327,7 +313,7 @@
                        .ExecuteCommand() <= 0) {

                        tran.RollbackTran();
                        LogHelper.Info($"{taskName}--AGV取货--所有任务完成时：修改单据状态为3任务执行完成--失败！");
                        LogHelper.Info($"{taskName}：AGV取货：所有任务完成时：修改单据状态为3任务执行完成--失败！");
                        return;
                    }
                }

 util/LogHelper.cs

@@ -70,7 +70,7 @@
            }
        }

        #region DIY
        #region 自定义方法
        public static void InfoEx(Exception ex) {
            Info($"发生了异常：{ex.Message}\n{ex.StackTrace}");
        }

 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");

 wms/WCSHelper.cs

@@ -86,7 +86,6 @@
        /// <summary>
        /// 创建搬送任务
        /// </summary>
        /// <param name="no">编号</param>
        /// <param name="from">起点</param>
        /// <param name="to">终点</param>
        /// <param name="taskType">任务类型</param>