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

kazelee

2025-06-27 d20ce230b49932d39ee4ce25e39fd78368c3b28a

 api/ApiHelper.cs

@@ -16,7 +16,7 @@
namespace HH.WCS.Mobox3.DSZSH.api {
    public class ApiHelper {
        /// <summary>
        /// 好运箱-满箱下线入库(PDA)
        /// 满箱下线入库
        /// </summary>
        /// <remarks>
        /// 人工：产线==>满箱操作区<br/>
@@ -29,9 +29,12 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.H好运箱_满箱下线入库;
            const string startAreaName = AreaName.M满箱操作区;
            const string 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 {
                if (model.Num <= 0) {
@@ -40,10 +43,7 @@
                    return NewSimpleResult(400, info);
                }

                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 == "待检")
                    .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);
@@ -51,18 +51,13 @@
                    return NewSimpleResult(1, info);
                }

                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) // 绑定前
                    .First();
                var startLoc = LocationHelper.GetLocQuery(db, 0, startAreas, model.StartLoc).First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
                    info = $"：没有找到起点货位'{model.StartLoc}'！要求：未上锁、数量=0、货区属于[{string.Join(", ", startAreas)}]";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                } 
                }

                startLoc.N_CURRENT_NUM = 1; // 绑定后

@@ -72,51 +67,36 @@
                    S_CNTR_TYPE = "好运箱",
                };

                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();// TODO 满箱入库算法待优化

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

                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);

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

                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);
@@ -144,7 +124,7 @@
        }

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

            const string taskName = TaskName.T托盘_空托入库;
            const string startAreaName = AreaName.K空托入库接驳区;
            const string endAreaName = AreaName.K空托存放区;
            const string cntrType = "托盘";
            var taskInfo = Settings.GetTaskInfo(ETask.K空托入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            var 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 => 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);
                }
@@ -221,14 +202,14 @@
                startLoc.N_CURRENT_NUM = 1; // 绑定后

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_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 == 0)
                    .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);
                }
@@ -239,59 +220,42 @@
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                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 (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 (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 (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                    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 (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 (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 && 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) {
                        tran.RollbackTran();
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                        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) {
                        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);
@@ -319,7 +283,7 @@
        }

        /// <summary>
        /// 好运箱-空箱入库(PDA)
        /// 空箱入库(好运箱)
        /// </summary>
        /// <remarks>
        /// 人工：空箱==搬运==>入库接驳位，需要新绑定容器货位<br/>
@@ -330,21 +294,22 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.H好运箱_空箱入库;
            const string startAreaName = AreaName.K空箱入库接驳区;
            const string 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 => Settings.AreaMap[startAreaName].Contains(l.S_AREA_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 == 0) // 绑定前
                    .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
                    info = $"没有找到起点货位'{model.StartLoc}'，或不满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
@@ -392,14 +357,14 @@
                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 }) // TODO 暂定选择最低层顺序入库，后面待修改
                    .First();

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

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

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                    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 (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 (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) {
                        tran.RollbackTran();
                        info = $"插入【货位容器关系】失败：" + JsonConvert.SerializeObject(locCntrRel);
                        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) {
                        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);
@@ -492,7 +440,7 @@
        }

        /// <summary>
        /// 托盘-空托上线(PDA)
        /// 空托上线出库
        /// </summary>
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
@@ -503,9 +451,10 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.T托盘_空托上线;
            const string startAreaName = AreaName.K空托存放区;
            const string endAreaName = AreaName.B包装区;
            var taskInfo = Settings.GetTaskInfo(ETask.K空托上线出库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            const string cntrType = "托盘";

            try {
@@ -544,25 +493,25 @@
                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 => 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.ItemCode}物料、且编码为{model.CntId}的空托盘";
                    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 => 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 = $"在'{endAreaName}'中，找不到合适的【终点货位】，需要满足：未上锁、当前容器数量=0";
                    info = $"找不到合适的终点货位，需要满足：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }
@@ -587,24 +536,14 @@
                        }
                    }

                    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}'失败：更新起点货位'{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);
@@ -632,7 +571,7 @@
        }

        /// <summary>
        /// 好运箱-空箱上线(PDA)
        /// 空箱上线出库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -640,9 +579,10 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.H好运箱_空箱上线;
            const string startAreaName = AreaName.K空箱货架区;
            const string 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 {
@@ -664,25 +604,25 @@
                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 && c.S_CNTR_TYPE == "好运箱")
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_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)
                    .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中，找不到存放容器编码={model.CntId}的空好运箱的【起点货位】，或不满足：未上锁、当前数量=1";
                    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 = $"在'{endAreaName}'中，找不到合适的【终点货位】，需要满足：未上锁、当前数量=0";
                    info = $"没有找到合适的终点货位！需要：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }
@@ -738,9 +678,8 @@
            }
        }

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

            const string taskName = TaskName.C抽检_合格回库;
            const string startAreaName = AreaName.C抽检区;
            var endAreaName = "";
            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>()
@@ -777,38 +717,30 @@
                    .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);
                }

                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreaName = AreaName.M满托货架区;
                    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();
                    endAreas = taskInfo.EndAreas_Pallet;
                    endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
                    endAreaName = AreaName.M满箱货架区;
                    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();
                    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 = $"在【{endAreaName}】中没有找到合适的【终点货位】，或不满足要求：未上锁、当前容器数量为 0";
                    info = $"没有找到合适的【终点货位】，或不满足要求：未上锁、当前容器数量为 0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
@@ -824,32 +756,21 @@
                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, it.T_MODIFY }).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 = $"生成'{taskName}'失败：修改物料状态为'合格'失败";
                        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) {
                    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) {
                    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);
@@ -877,7 +798,7 @@
        }

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

            const string taskName = TaskName.C抽检_不合格移库;
            const string startAreaName = AreaName.C抽检区;
            const string endAreaName = AreaName.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[endAreaName].Contains(model.EndArea)) {
                    info = $"输入的终点库区'{model.EndArea}'不属于'{endAreaName}'!";
                if (!startAreas.Contains(model.EndArea)) {
                    info = $"终点库区'{model.EndArea}'不满足条件！需要：货区属于[{string.Join(", ", startAreas)}]";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
@@ -919,13 +840,13 @@

                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 => 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}'中没有找到起点货位'{locCntrRel.S_LOC_CODE}'，或不满足要求：未上锁、当前容器数量=0";
                    info = $"起点货位' {locCntrRel.S_LOC_CODE} '不满足条件！需要：货区属于[ {string.Join(", ", startAreas)} ]";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
@@ -1005,7 +926,7 @@
        }

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

            const string taskName = TaskName.W尾箱回库;
            var endAreaName = "";
            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>()
@@ -1041,17 +964,17 @@

                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreaName = AreaName.M满托货架区;
                    endAreas = taskInfo.EndAreas_Pallet;
                    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();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱"){
                    endAreaName = AreaName.M满箱货架区;
                    endAreas = taskInfo.EndAreas_Goodpack;
                    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();
@@ -1126,7 +1049,8 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

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

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

            try {
                var orderNo = GenerateOrderNo("出库单号", "CKD");
@@ -1337,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>
@@ -1437,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, // 车牌号
@@ -1456,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, // 派装单单位
@@ -1471,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, // 作废标记
@@ -1488,53 +1421,74 @@
                    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) {
@@ -1561,7 +1515,7 @@
                    tran.CommitTran();
                }

                info = $"生成出库单成功";
                info = $"生成出库单成功：" + JsonConvert.SerializeObject(order) + "\n出库单明细：" +JsonConvert.SerializeObject(detail);
                LogHelper.Info(info);
                return NewErpResult(0, info);
            }