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

kazelee

2025-06-27 d20ce230b49932d39ee4ce25e39fd78368c3b28a

 api/ApiHelper.cs

@@ -16,10 +16,12 @@
namespace HH.WCS.Mobox3.DSZSH.api {
    public class ApiHelper {
        /// <summary>
        /// 好运箱-满箱下线入库(PDA)
        /// 满箱下线入库
        /// </summary>
        /// <remarks>
        /// 流程：人工将满箱从产线搬运到操作区后，使用PDA调用接口，呼叫AGV将满箱搬运到货架区（不指定终点货区）
        /// 人工：产线==>满箱操作区<br/>
        /// PDA：调用接口，呼叫AGV<br/>
        /// AGV：满箱操作区==搬运==>货架区（不指定终点货区）
        /// </remarks>
        /// <param name="model">包含：物料信息、起点货位</param>
        /// <returns></returns>
@@ -27,120 +29,89 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息
            var startAreaName = AreaName.M满箱操作区; // 起点货区
            var endAreaName = AreaName.M满箱货架区; // 终点货区
            var taskInfo = Settings.GetTaskInfo(ETask.M满箱下线入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;

            var log = $"API：{taskName}：";

            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待检
                    .First(); // TODO model 中 数量、规格是否也参与比对 待后续要求
                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && 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)) // 起点货区符合任务要求
                    .First();

                var startLoc = LocationHelper.GetLocQuery(db, 0, startAreas, model.StartLoc).First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不具备取货要求：未上锁、绑定前无货物";
                    info = $"：没有找到起点货位'{model.StartLoc}'！要求：未上锁、数量=0、货区属于[{string.Join(", ", startAreas)}]";
                    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) // 筛选：空货位
                    .OrderBy(l => l.N_LAYER) // 按货架最低排序
                    .First();

                var endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).OrderBy(l => new { l.N_LAYER }).First();
                
                if (endLoc == null) {
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
                    info = $"没有找到合适的终点货位，需要满足：未上锁、当前容器数量=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);
                    }

                    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) {
                    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);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).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>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        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);
                }
@@ -153,7 +124,7 @@
        }

        /// <summary>
        /// 托盘-空托入库(PDA)
        /// 空托入库
        /// </summary>
        /// <remarks>
        /// 人工将空托盘通过接驳位入库，需要新绑定容器货位<br/>
@@ -165,39 +136,37 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.T托盘_空托入库;
            var startAreaName = AreaName.K空托入库接驳区;
            var endAreaName = AreaName.K空托存放区;
            var taskInfo = Settings.GetTaskInfo(ETask.K空托入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            var 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 => startAreas.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 = $"没有找到起点货位'{model.StartLoc}'，或不具备起点取货要求：未上锁、绑定前无货物";
                    LogHelper.Info(info);
                    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 +174,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,113 +196,97 @@
                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 暂定选择最低层按区位顺序入库，后面待修改
                startLoc.N_CURRENT_NUM = 1; // 绑定后

                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 => startAreas.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 = $"没有找到合适的终点货位！需要：未上锁、无货物";
                    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);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
                        }
                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧物料信息】失败：" + JsonConvert.SerializeObject(cgDetailOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

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

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

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        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,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).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}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        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);
            }
        }

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

            var taskName = TaskName.H好运箱_空箱入库;
            var startAreaName = AreaName.K空箱入库接驳区;
            var endAreaName = AreaName.K空箱货架区;
            var taskInfo = Settings.GetTaskInfo(ETask.K空箱入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            const string cntrType = "好运箱";

            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => startAreas.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 = $"没有找到起点货位'{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 +323,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,239 +351,83 @@
                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 暂定选择最低层顺序入库，后面待修改
                startLoc.N_CURRENT_NUM = 1; // 绑定后

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => endAreas.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) {
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
                    info = $"没有找到合适的终点货位！需要：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }

                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);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                        }
                    // 存在旧【物料明细】表时，删除旧表
                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧物料信息】失败：" + JsonConvert.SerializeObject(cgDetailOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }
                    // 存在旧【货位容器绑定】表时，删除旧表
                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRelOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

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

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

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(500, 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}锁状态失败";
                        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 {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, 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}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
            }
        }

        /// <summary>
        /// 托盘-空托上线(PDA)
        /// </summary>
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model">包含：容器号、物料编码</param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

            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}，不是'托盘'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                var needUpdateContainer = false;
                if (string.IsNullOrEmpty(cntr.S_SPEC)) {
                    // TEMP 目前流程：如果容器表中规格（物料编码）为空，根据流程的物料信息写入
                    // 待定：后面可能会更改流程，或者用其他信息（如物料类型/规格）作为容器的规格

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

                    cntr.S_SPEC = model.ItemCode;
                }
                else if (cntr.S_SPEC != model.ItemCode) {
                    info = $"容器'{model.CntId}'已经与物料类型'{cntr.S_SPEC}'绑定，无法用于装载物料'{model.ItemCode}'";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                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) // 筛选：有货货位
                    .First();

                if (startLoc == null) {
                    info = $"在空托存放区中，找不到符合{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) // 筛选：空货位
                    .First();

                if (endLoc == null) {
                    info = $"终点位置 不存在或不具备放货要求";
                    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); // 终点入库锁

                cntr.S_SOURCE = task.S_CODE; // 用任务号作为容器更新的依据
                cntr.T_MODIFY = DateTime.Now;

                using (var tran = db.Ado.UseTran()) {
                    if (needUpdateContainer) {
                        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}锁状态失败";
                            LogHelper.Info(info);
                            return NewSimpleResult(4, 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) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                    }

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

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

        /// <summary>
        /// 好运箱-空箱上线(PDA)
        /// 空托上线出库
        /// </summary>
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model">包含：容器号、物料编码</param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskInfo = Settings.GetTaskInfo(ETask.K空托上线出库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            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 != cntrType) { // 容器类型默认不会为空
                    info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'{cntrType}'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                var needUpdateContainer = false;
                if (string.IsNullOrEmpty(cntr.S_SPEC)) {
                    // TEMP 目前流程：如果容器表中规格（物料编码）为空，根据流程的物料信息写入
                    // 待定：后面可能会更改流程，或者用其他信息（如物料类型/规格）作为容器的规格

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

                    cntr.S_SPEC = model.ItemCode;
                }
                else if (cntr.S_SPEC != model.ItemCode) {
                    info = $"容器'{model.CntId}'已经与物料类型'{cntr.S_SPEC}'绑定，无法用于装载物料'{model.ItemCode}'";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                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 => startAreas.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}的空托盘";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => endAreas.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 (endLoc == null) {
                    info = $"找不到合适的终点货位，需要满足：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }

                var cntId = model.CntId;

                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;

                using (var tran = db.Ado.UseTran()) {
                    if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr)
                            .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"更新表容器表失败：" + JsonConvert.SerializeObject(cntr);
                            LogHelper.Info(info);
                            return NewSimpleResult(500, 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) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }

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

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

                    tran.CommitTran();
                    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);
            }
        }

        /// <summary>
        /// 空箱上线出库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -650,52 +579,50 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.H好运箱_空箱上线;
            var startAreaName = AreaName.K空箱货架区;
            var endAreaName = AreaName.K空箱操作区;
            var taskInfo = Settings.GetTaskInfo(ETask.K空箱上线出库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            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 => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "好运箱")
                    .Where(l => startAreas.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 = $"没有找到起点货位'{model.CntId}的空好运箱的【起点货位】，或不满足：未上锁、当前数量=1";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => endAreas.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 (endLoc == null) {
                    info = $"终点位置 不存在或不具备放货要求";
                    info = $"没有找到合适的终点货位！需要：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }
@@ -714,9 +641,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 +653,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,13 +674,12 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

        
        /// <summary>
        /// 抽检-合格回库(PDA)
        /// 抽检合格回库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -761,8 +687,10 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_合格回库;
            var startAreaName = AreaName.C抽检区;
            var taskInfo = Settings.GetTaskInfo(ETask.C抽检合格回库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;

            try {
                var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -789,42 +717,37 @@
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_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[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => startAreas.Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
                    info = $"没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }

                var endLoc = new TN_Location();
                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].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();
                    endAreas = taskInfo.EndAreas_Pallet;
                    endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满箱货架区].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();
                    endAreas = taskInfo.EndAreas_Goodpack;
                    endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
                }
                else {
                    return NewSimpleResult(-1, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                }

                if (endLoc == null) {
                    info = "查询：没有找到合适的终点货位";
                    info = $"没有找到合适的【终点货位】，或不满足要求：未上锁、当前容器数量为 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);
@@ -833,60 +756,49 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                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) {
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => 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 {
                        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 }).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 {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, 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);
            }
        }

        /// <summary>
        /// 抽检-不合格移库(PDA)
        /// 抽检不合格移库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -894,12 +806,14 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_不合格移库;
            const ETask eTask = ETask.C抽检不合格移库;
            var taskName = Settings.GetTaskInfo(eTask).TaskName;
            var startAreas = Settings.GetTaskInfo(eTask).StartAreas;
            var endAreas = Settings.GetTaskInfo(eTask).EndAreas;

            try {

                if (!Settings.AreaMap[AreaName.C抽检异常区].Contains(model.EndArea)) {
                    info = $"终点库区{model.EndArea}不属于{AreaName.C抽检异常区}";
                if (!startAreas.Contains(model.EndArea)) {
                    info = $"终点库区'{model.EndArea}'不满足条件！需要：货区属于[{string.Join(", ", startAreas)}]";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
@@ -909,8 +823,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 +833,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 => startAreas.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 = $"起点货位' {locCntrRel.S_LOC_CODE} '不满足条件！需要：货区属于[ {string.Join(", ", startAreas)} ]";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(2, info);
                }

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

                if (endLoc == null) {
                    info = "查询：没有找到合适的终点货位";
                    info = $"在终点货区'{model.EndArea}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
@@ -961,9 +876,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 +888,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,34 +899,34 @@
                        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);
            }
        }

        /// <summary>
        /// 余料回库/尾箱回库(PDA)
        /// 尾料回库/余料回库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -1019,7 +934,10 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.W尾箱回库;
            var taskInfo = Settings.GetTaskInfo(ETask.W尾料回库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            List<string> endAreas = null;
            
            try {
                var startLoc = db.Queryable<TN_Location>()
@@ -1044,25 +962,23 @@
                    return NewSimpleResult(3, info);
                }

                //var endLoc = new TN_Location();
                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreas = taskInfo.EndAreas_Pallet;
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
                        .Where(l => endAreas.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 == "好运箱"){
                    endAreas = taskInfo.EndAreas_Goodpack;
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
                        .Where(l => endAreas.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 +987,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 +1000,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 +1011,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 +1033,7 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

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

            var taskName = TaskName.C成品胶出库;
            var taskInfo = Settings.GetTaskInfo(ETask.C成品胶出库);
            var taskName = taskInfo.TaskName;

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

            var taskName = TaskName.C成品胶出库;
            var taskInfo = Settings.GetTaskInfo(ETask.C成品胶出库);
            var taskName = taskInfo.TaskName;

            try {
                var orderNo = GenerateOrderNo("出库单号", "CKD");
@@ -1345,7 +1262,7 @@
        private static string GenerateOrderNo(string snType, string prefix) {
            var id = SYSHelper.GetSerialNumber(snType, prefix);
            var date = DateTime.Now.ToString("yyMMdd");
            return $"{prefix}{date}{id.ToString().PadLeft(4, '0')}";
            return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
        }

        /// <summary>
@@ -1445,15 +1362,23 @@
            var info = "";
            try {
                // 参数合法性确认部分：错误编码：400
                if (model.pzsl <= 0) {
                    info = $"物料数量(pzsl){model.pzsl}不合法：物料数量应该大于 0";
                if (model.pzjs <= 0) {
                    info = $"物料数量(pzjs){model.pzjs}不合法：物料数量应该大于 0";
                    LogHelper.Info(info);
                    return NewErpResult(400, info);
                }

                var outboundPlan = new TN_Outbound_Plan {
                var outboundPlan = db.Queryable<TN_Outbound_Plan>()
                    .Where(p => p.JHDH == model.jhdh).First();
                if (outboundPlan != null) {
                    info = $"计划单号{model.jhdh}已在数据库中存在";
                    LogHelper.Info(info);
                    return NewErpResult(1, info);
                }

                outboundPlan = new TN_Outbound_Plan {
                    JHDH = model.jhdh, // 计划单号（唯一标识）
                    CKZT = model.ckzt, // 出库状态
                    CKZT = model.ckzt, // 出库状态（需要返回）
                    JHLB = model.jhlb, // 计划类别
                    CKDH = model.ckdh, // 参考单号
                    CPH = model.cph, // 车牌号
@@ -1464,9 +1389,9 @@
                    CPLB = model.cplb, // 产品类别
                    CPLBMX = model.cplbmx, // 产品类别明细
                    PP = model.pp, // 品牌
                    DJ = model.dj, // 等级
                    DJ = model.dj, // 等级（需要返回）
                    GH = model.gh, // 罐号
                    PH = model.ph, // 批号
                    PH = model.ph, // 批号（需要返回）
                    BZLX = model.bzlx, // 包装类型
                    PZDH = model.pzdh, // 派装单号
                    PZD_DW = model.pzd_dw, // 派装单单位
@@ -1479,15 +1404,15 @@
                    PZ_ZFRQ = model.pz_zfrq, // 派装作废日期
                    PZ_BZ = model.pz_bz, // 派装备注
                    CKDBH = model.ckdbh, // 出库单编号
                    SFJS = model.sfjs, // 实发件数
                    SFSL = model.sfsl, // 实发数量
                    SFCS = model.sfcs, // 实发车数
                    ZCSJ = model.zcsj, // 装车时间
                    JLDW = model.jldw, // 计量单位
                    FHRQ = model.fhrq, // 发货日期
                    CKDM = model.ckdm, // 仓库代码
                    FHR = model.fhr, // 发货人
                    CZYDM = model.czydm, // 操作员
                    SFJS = model.sfjs, // 实发件数（需要返回）
                    SFSL = model.sfsl, // 实发数量（需要返回）
                    SFCS = model.sfcs, // 实发车数（需要返回）
                    ZCSJ = model.zcsj, // 装车时间（需要返回）
                    JLDW = model.jldw, // 计量单位（需要返回）
                    FHRQ = model.fhrq, // 发货日期（需要返回）
                    CKDM = model.ckdm, // 仓库代码（需要返回）
                    FHR = model.fhr, // 发货人（需要返回）
                    CZYDM = model.czydm, // 操作员（需要返回）
                    SHR_USERNAME = model.shr_username, // 审核人
                    SHRQ = model.shrq, // 审核日期
                    ZFBJ = model.zfbj, // 作废标记
@@ -1496,67 +1421,88 @@
                    SHDW = model.shdw, // 收货单位
                    YSDW = model.ysdw, // 运输单位
                    LXR = model.lxr, // 联系人
                    RY_ZXG = model.ry_zxg, // 装卸工
                    RY_CCSJ = model.ry_ccsj, // 叉车司机
                    RY_ZXG = model.ry_zxg, // 装卸工（需要返回）
                    RY_CCSJ = model.ry_ccsj, // 叉车司机（需要返回）
                    ERPHX_JHDH = model.erphx_jhdh, // erp交货单号
                    ERPHX_WLBM = model.erphx_wlbm, // erp物料编码
                    ERPHX_WLMC = model.erphx_wlmc, // erp物料名称
                    ERPHX_CJRQ = model.erphx_cjrq, // erp创建日期
                    HW = model.hw, // 货位
                    HWZT = model.hwzt // 货位状态
                    HW = model.hw, // 货位（需要返回）
                    HWZT = model.hwzt // 货位状态（需要返回）
                };

                var cgDetailList = SelectCgByTotalQty(
                    qty: (int)model.pzsl,
                    itemCode: model.cpdm,
                    batchNo: model.ph
                    );
                //var cgDetailList = SelectCgByTotalQty(
                //    qty: (int)model.pzsl,
                //    itemCode: model.cpdm,
                //    batchNo: model.ph
                //    );

                if (cgDetailList.Count == 0) {
                    info = "没有合适的物料可以出库";
                //if (cgDetailList.Count == 0) {
                //    info = "没有合适的物料可以出库";
                //    LogHelper.Info(info);
                //    return NewErpResult(3, info);
                //}

                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_ITEM_CODE == model.cpdm && d.N_ITEM_NUM >= model.pzjs).First();
                if (cgDetail == null ) {
                    info = $"没有合适的物料可以满足：物料编码={model.cpdm}，物料数量>={model.pzjs}";
                    LogHelper.Info(info);
                    return NewErpResult(3, info);
                    return NewErpResult(2, info);
                }

                var order = new TN_Outbound_Order {
                    S_NO = orderNo,
                    //S_ITEM_CODE = model.cpdm,
                    //S_BATCH = model.ph,
                    //N_END_NUM = (int)model.pzsl,
                    S_ITEM_CODE = model.cpdm,
                    S_BATCH = model.ph,
                    N_END_NUM = (int)model.pzsl,
                    //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                    S_END_AREA = model.ysfs == "汽车" ? "QCCKQ" : "HCCKQ", // 暂时用运输方式（火车/汽车）来区分终点货区
                    S_BATCH = cgDetail.S_BATCH_NO,
                    N_END_NUM = (int)model.pzjs,
                    S_END_AREA = "QCCKQ", // ERP下发出库任务为汽车出库区
                    S_BS_NO = model.jhdh,
                    S_BS_TYPE = "ERP",
                };

                var detailList = new List<TN_Outbound_Detail>();
                foreach (var cgDetail in cgDetailList) {
                    var detail = new TN_Outbound_Detail {
                        S_OO_NO = orderNo,
                        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                        S_BATCH_NO = cgDetail.S_BATCH_NO,
                        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                        N_COUNT = cgDetail.N_ITEM_NUM,
                        S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
                        S_BS_NO = order.S_BS_NO,
                        S_BS_TYPE= order.S_BS_TYPE,
                    };
                    detailList.Add(detail);
                }
                //foreach (var cgDetail in cgDetailList) {
                //    var detail = new TN_Outbound_Detail {
                //        S_OO_NO = orderNo,
                //        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                //        S_BATCH_NO = cgDetail.S_BATCH_NO,
                //        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                //        N_COUNT = cgDetail.N_ITEM_NUM,
                //        S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
                //        S_BS_NO = order.S_BS_NO,
                //        S_BS_TYPE= order.S_BS_TYPE,
                //    };
                //    detailList.Add(detail);
                //}
                var detail = new TN_Outbound_Detail {
                    S_OO_NO = orderNo,
                    S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                    S_BATCH_NO = cgDetail.S_BATCH_NO,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    N_COUNT = cgDetail.N_ITEM_NUM,
                    S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
                    S_BS_NO = order.S_BS_NO,
                    S_BS_TYPE = order.S_BS_TYPE,
                };
                detailList.Add(detail);

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
                        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 +1515,9 @@
                    tran.CommitTran();
                }

                return NewErpResult(0, "生成出库单成功");
                info = $"生成出库单成功：" + JsonConvert.SerializeObject(order) + "\n出库单明细：" +JsonConvert.SerializeObject(detail);
                LogHelper.Info(info);
                return NewErpResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";