优化日志信息，删除冗余的工具类代码

kazelee

2025-07-04 3bdd686d50ae8c999924ac64101a5dbe4e271c71

优化日志信息，删除冗余的工具类代码

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/32a96041-8c39-4fb6-a3b7-5622cb274494.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/ae79d810-1f3d-43c5-9dc6-b3aebb5cf931.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c0bdc83d-37b9-402c-9d38-5f67c7e45fb1.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f7a50a7a-1b25-4250-b1c5-b473ed7bc264.vsidx

Binary files differ

 HH.WCS.Mobox3.DSZSH.csproj

@@ -244,7 +244,6 @@
    <Compile Include="models\TN_SpotCheck_Detail.cs" />
    <Compile Include="models\TN_Spot_Check.cs" />
    <Compile Include="process\TaskProcess.cs" />
    <Compile Include="util\LogBuilder.cs" />
    <Compile Include="util\SqlHelper.cs" />
    <Compile Include="models\TN_Outbound_Order.cs" />
    <Compile Include="models\TN_Outbound_Detail.cs" />
@@ -271,7 +270,6 @@
    <Compile Include="api\WMSController.cs" />
    <Compile Include="dispatch\HostToAGV.cs" />
    <Compile Include="util\LogHelper.cs" />
    <Compile Include="wms\ContainerHelper.cs" />
    <Compile Include="wms\LocationHelper.cs" />
    <Compile Include="wms\SYSHelper.cs" />
    <Compile Include="Program.cs" />

 api/AgvController.cs

@@ -29,7 +29,7 @@
        [HttpPost]
        [Route("AGVCallbackState")]
        public ReturnResult AGVCallbackState(AgvTaskState model){
            LogHelper.Info("NDC HostToAGV 任务状态回报：" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            LogHelper.InfoHostToAGV("NDC任务状态回报", model);
            return WCSCore.OperateAgvTaskStatus(model);
        }

@@ -41,7 +41,7 @@
        [HttpPost]
        [Route("SafetyInteraction")]
        public ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
            LogHelper.Info("AGV与产线进行安全交互：" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            LogHelper.InfoHostToAGV("AGV与产线进行安全交互", model);
            return WCSCore.SafetyInteraction(model);
        }


 api/ApiHelper.cs

@@ -18,12 +18,7 @@
        /// <summary>
        /// 满箱下线入库
        /// </summary>
        /// <remarks>
        /// 人工：产线==>满箱操作区<br/>
        /// PDA：调用接口，呼叫AGV<br/>
        /// AGV：满箱操作区==搬运==>货架区（不指定终点货区）
        /// </remarks>
        /// <param name="model">包含：物料信息、起点货位</param>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            var db = new SqlHelper<object>().GetInstance();
@@ -36,107 +31,98 @@
                    return NewSimpleResult(400, preLog + $"物料数量'{model.Num}'不合法！要求：物料数量＞0");
                }

                // TODO model 中 数量、规格是否也参与比对 待后续要求
                // 检查货品容器表：是否已经存在贴标机传递的待入库物料信息
                // TODO：数量、规格是否也参与比对？
                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();
                if (cgDetail == null) {
                    return NewSimpleResult(1, preLog + $"没有在货品明细表中找到[物料编码='{model.ItemCode}',批次号='{model.BatchNo}']的物料！请检查：PDA扫码物料信息与贴标机传递的信息是否一致！要求：物料状态='待检'；");
                    return NewSimpleResult(1, preLog + $"没有在[货品明细表]中找到[物料编码='{model.ItemCode}',批次号='{model.BatchNo}']的物料！请检查：PDA扫码物料信息与贴标机传递的信息是否一致！要求：物料状态='待检'");
                }

                var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
                // 查询起点货位：数量=0
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (startLoc == null) {
                    return NewSimpleResult(2, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, preLog));
                    return NewSimpleResult(2, preLog + $"没有找到起点货位'{model.StartLoc}'！要求：锁状态='无'，当前容器数量=0，所在库区={JsonConvert.SerializeObject(taskInfo.StartAreas)}");
                }
                startLoc.N_CURRENT_NUM = 1; // 绑定后

                // 绑定货位容器，起点货位当前数量=1
                var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cgDetail.S_CNTR_CODE, S_CNTR_TYPE = cntrType,};
                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_CNTR_TYPE = cntrType,
                };

                // 查询终点货位
                // Order：按货位层数，从小到大排列
                var endLoc = LocationHelper.Query(db, 0, 0, taskInfo.EndAreas).OrderBy(l => new { l.N_LAYER }).First();
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER }).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, LogBuilder.EndLocNotFound(0, 0, taskInfo.EndAreas, pre: preLog));
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'，当前容器数量=0，所在库区={JsonConvert.SerializeObject(taskInfo.EndAreas)}");
                }

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

                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
                // 起点终点上锁，创建任务
                WCSHelper.LockStartLoc(ref startLoc);
                WCSHelper.LockEndLoc(ref endLoc);
                var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, preLog + $"插入[货位容器绑定表]失败！" + JsonConvert.SerializeObject(locCntrRel));
                        return NewSimpleResult(500, preLog + $"插入[容器货位绑定表]失败！数据：{JsonConvert.SerializeObject(locCntrRel)}");
                    }

                    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();
                        return NewSimpleResult(500, preLog + $"更新起点货位'{startLoc.S_CODE}'锁状态失败！");
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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();
                        return NewSimpleResult(500, preLog + $"更新终点货位'{endLoc.S_CODE}'锁状态失败！");
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, preLog + $"生成任务'{taskInfo.TaskName}'失败！任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}");
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

                    tran.CommitTran();
                    return NewSimpleResult(0, LogBuilder.CreateTaskSuccess(task, preLog));
                    return NewSimpleResult(0, preLog + $"生成任务'{task.S_TYPE}'成功！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
                return NewSimpleResult(-1, preLog + $"发生了异常：{ex.Message}", false);
                return NewSimpleResult(-1, preLog + $"发生了异常：{ex.Message}\n{ex.StackTrace}");
            }
        }

        /// <summary>
        /// 空托入库
        /// </summary>
        /// <remarks>
        /// 人工将空托盘通过接驳位入库，需要新绑定容器货位<br/>
        /// 由于空托盘一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <param name="model">包含：起点货位、容器号、容器类型、终点货区</param>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var taskInfo = ETask.K空托入库.Info();
            const string pre = "API：空托入库：";
            const string preLog = "API：空托入库：";
            const string cntrType = "托盘";

            try {
                var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
                // 查询起点货位：数量=0
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (startLoc == null) {
                    return NewSimpleResult(1, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, pre));
                    return NewSimpleResult(1, preLog + $"没有找到起点货位'{model.StartLoc}'！要求：锁状态='无'；当前容器数量=0；所在库区={JsonConvert.SerializeObject(taskInfo.StartAreas)}");
                }

                // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
                // 查询容器表：容器类型字段
                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
                if (cntr == null) {
                    return NewSimpleResult(2, pre + $"容器'{model.CntrCode}'在[容器表]中不存在，请在前台页面中维护！");
                    return NewSimpleResult(2, preLog + $"容器'{model.CntrCode}'在[容器表]中不存在，请在前台页面中维护！");
                }
                if (cntr.S_TYPE != cntrType) {
                    return NewSimpleResult(3, pre + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！");
                    return NewSimpleResult(3, preLog + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！");
                }

                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                // 空箱入库时，如果存在旧的绑定数据，删除
                var cgDetailOld = db.Queryable<TN_CG_Detail>().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();

                TN_Location locOld = null;
                if (locCntrRelOld != null) { // 如果需要解绑容器货位，也需要修改货位信息
                if (locCntrRelOld != null) {
                    locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                    if (locOld != null) {
                        locOld.N_CURRENT_NUM = 0; // 如果旧货位存在，将旧货位的数量设置为 0
@@ -144,106 +130,98 @@
                    }
                }

                // 绑定货位和容器号（PDA在接驳位绑定）
                // 绑定货位容器，起点货位当前数量=1
                var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntr.S_CODE, S_CNTR_TYPE = cntrType };
                startLoc.N_CURRENT_NUM = 1; // 绑定后
                startLoc.N_CURRENT_NUM = 1;


                // TODO 暂定选择最低层按区位顺序入库，后面待修改
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                // 查询终点货位
                // Order：层数从低到高、行、列
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                if (endLoc == null) {
                    return NewSimpleResult(4, pre + $"没有找到合适的终点货位！要求：(1)未上锁;(2)数量=0;(3)货区属于['{string.Join("','", taskInfo.EndAreas)}'];");
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'；当前容器数量=0；所在库区={JsonConvert.SerializeObject(taskInfo.EndAreas)}");
                }

                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
                // 起点终点上锁，创建任务
                WCSHelper.LockStartLoc(ref startLoc);
                WCSHelper.LockEndLoc(ref endLoc);
                var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                using (var tran = db.Ado.UseTran()) {
                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"删除[旧物料信息]失败！" + JsonConvert.SerializeObject(cgDetailOld));
                        return NewSimpleResult(500, preLog + $"删除[旧物料信息]失败！数据：{JsonConvert.SerializeObject(cgDetailOld)}");
                    }

                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"删除[旧货位容器关系]失败！" + JsonConvert.SerializeObject(locCntrRelOld));
                        return NewSimpleResult(500, preLog + $"删除[旧货位容器关系]失败！数据：{JsonConvert.SerializeObject(locCntrRelOld)}");
                    }

                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"更新[旧货位][容器数量]失败！" + JsonConvert.SerializeObject(locOld));
                        return NewSimpleResult(500, preLog + $"更新[旧货位|当前容器数量]失败！货位='{locOld.S_CODE}'，数量=>{locOld.N_CURRENT_NUM}");
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"插入[货位容器关系]失败：" + JsonConvert.SerializeObject(locCntrRel));
                        return NewSimpleResult(500, preLog + $"插入[货位容器绑定表]失败！数据：{JsonConvert.SerializeObject(locCntrRel)}");
                    }

                    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();
                        return NewSimpleResult(500, pre + $"更新起点货位'{startLoc.S_CODE}'锁状态失败！");
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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();
                        return NewSimpleResult(500, pre + $"更新终点货位'{endLoc.S_CODE}'锁状态失败！");
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"生成任务'{taskInfo.TaskName}'失败！任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}");
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

                    tran.CommitTran();
                    return NewSimpleResult(0, pre + $"生成任务'{taskInfo.TaskName}'成功！任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}");
                    return NewSimpleResult(0, preLog + $"生成任务'{task.S_TYPE}'成功！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
                return NewSimpleResult(-1, pre + $"发生了异常：{ex.Message}", false);
                return NewSimpleResult(-1, preLog + $"发生了异常：{ex.Message}\n{ex.StackTrace}");
            }
        }

        /// <summary>
        /// 空箱入库
        /// </summary>
        /// <remarks>
        /// 人工：空箱==搬运==>入库接驳位，需要新绑定容器货位<br/>
        /// 由于空箱一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <returns></returns>
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var taskInfo = ETask.K空箱入库.Info();
            const string pre = "API：空箱入库：";
            const string preLog = "API：空箱入库：";
            const string cntrType = "好运箱";

            try {
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                // 查询起点货位：数量=0
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (startLoc == null) {
                    return NewSimpleResult(1, pre + $"没有找到起点货位'{model.StartLoc}'！要求：(1)未上锁;(2)数量=0;(3)货区属于['{string.Join("','", taskInfo.StartAreas)}'];");
                    return NewSimpleResult(1, preLog + $"没有找到起点货位'{model.StartLoc}'！要求：锁状态='无'；当前容器数量=0；所在库区={JsonConvert.SerializeObject(taskInfo.StartAreas)}");
                }

                // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
                // 查询容器表：容器类型字段
                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
                if (cntr == null) {
                    return NewSimpleResult(2, pre + $"容器'{model.CntrCode}'在[容器表]中不存在，请在前台页面中维护！");
                    return NewSimpleResult(2, preLog + $"容器'{model.CntrCode}'在[容器表]中不存在，请在前台页面中维护！");
                }
                if (cntr.S_TYPE != cntrType) {
                    return NewSimpleResult(3, pre + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！");
                    return NewSimpleResult(3, preLog + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}'，与输入的容器类型'{cntrType}'不同！");
                }

                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                // 空箱入库时，如果存在旧的绑定数据，删除
                var cgDetailOld = db.Queryable<TN_CG_Detail>().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();

                TN_Location locOld = null;
                if (locCntrRelOld != null) { // 如果需要解绑容器货位，也需要修改货位信息
                if (locCntrRelOld != null) {
                    locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                    if (locOld != null) {
                        locOld.N_CURRENT_NUM = 0; // 如果旧货位存在，将旧货位的数量设置为 0
@@ -251,100 +229,85 @@
                    }
                }

                // 绑定货位和容器号（PDA在接驳位绑定）
                // 绑定货位容器，起点货位当前数量=1
                var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntr.S_CODE, S_CNTR_TYPE = cntrType };
                startLoc.N_CURRENT_NUM = 1; // 绑定后
                startLoc.N_CURRENT_NUM = 1;


                // TODO 暂定选择最低层按区位顺序入库，后面待修改
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                // 查询终点货位
                // Order：层数从低到高、行、列
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                if (endLoc == null) {
                    return NewSimpleResult(4, pre + $"没有找到合适的终点货位！要求：(1)未上锁;(2)数量=0;(3)货区属于['{string.Join("','", taskInfo.EndAreas)}'];");
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'；当前容器数量=0；所在库区={JsonConvert.SerializeObject(taskInfo.EndAreas)}");
                }

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

                using (var tran = db.Ado.UseTran()) {
                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"删除[旧物料信息]失败！" + JsonConvert.SerializeObject(cgDetailOld));
                        return NewSimpleResult(500, preLog + $"删除[旧物料信息]失败！数据：{JsonConvert.SerializeObject(cgDetailOld)}");
                    }

                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"删除[旧货位容器关系]失败！" + JsonConvert.SerializeObject(locCntrRelOld));
                        return NewSimpleResult(500, preLog + $"删除[旧货位容器关系]失败！" + JsonConvert.SerializeObject(locCntrRelOld));
                    }

                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"更新[旧货位][容器数量]失败！" + JsonConvert.SerializeObject(locOld));
                        return NewSimpleResult(500, preLog + $"更新[旧货位|容器数量]失败！" + JsonConvert.SerializeObject(locOld));
                    }

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

                    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();
                        return NewSimpleResult(500, pre + $"更新起点货位'{startLoc.S_CODE}'锁状态失败！");
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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();
                        return NewSimpleResult(500, pre + $"更新终点货位'{endLoc.S_CODE}'锁状态失败！");
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"生成任务'{taskInfo.TaskName}'失败！任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}");
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

                    tran.CommitTran();
                    return NewSimpleResult(0, pre + $"生成任务'{taskInfo.TaskName}'成功！任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}");
                    return NewSimpleResult(0, preLog + $"生成任务'{task.S_TYPE}'成功！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
                return NewSimpleResult(-1, pre + $"发生了异常：{ex.Message}", false);
                return NewSimpleResult(-1, preLog + $"发生了异常：{ex.Message}\n{ex.StackTrace}");
            }
        }

        /// <summary>
        /// 空托上线出库
        /// </summary>
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model">包含：容器号、物料编码</param>
        /// <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;
            var taskInfo = ETask.K空托上线出库.Info();
            const string preLog = "API：空托上线出库：";
            const string cntrType = "托盘";

            try {
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntId)
                    .First();

                // 查询容器表：容器类型字段
                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);
                    return NewSimpleResult(1, $"容器'{model.CntId}'在[容器表]中不存在，请在前台页面中维护！");
                }
                if (cntr.S_TYPE != cntrType) { // 容器类型默认不会为空
                    info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'{cntrType}'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                if (cntr.S_TYPE != cntrType) {
                    return NewSimpleResult(2, preLog + $"容器'{model.CntId}'在[容器表]中的类型是'{cntr.S_TYPE}，不是'{cntrType}'！");
                }

                var needUpdateContainer = false;
@@ -353,94 +316,57 @@
                    // 待定：后面可能会更改流程，或者用其他信息（如物料类型/规格）作为容器的规格

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

                    cntr.S_SPEC = model.ItemCode;
                    LogHelper.Info($"容器'{model.CntId}'在[容器表]中[规格(物料编码)]为空，将物料编码'{model.ItemCode}'写入容器的规格");
                }
                else if (cntr.S_SPEC != model.ItemCode) {
                    info = $"容器'{model.CntId}'已经与物料类型'{cntr.S_SPEC}'绑定，无法用于装载物料'{model.ItemCode}'";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, $"容器'{model.CntId}'已经与物料类型'{cntr.S_SPEC}'绑定，无法用于装载物料'{model.ItemCode}'！");
                }

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

                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where((l, c) => taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
                if (startLoc == null) {
                    info = $"找不到适用于{model.ItemCode}物料、且编码为{model.CntId}的空托盘";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, preLog + $"没有找到合适的起点货位！要求：锁状态='无'；当前容器数量=1；所在库区={JsonConvert.SerializeObject(taskInfo.StartAreas)}，绑定容器编码='{model.CntId}'，绑定容器类型='{cntrType}'");
                }

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

                // 查询终点货位
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (endLoc == null) {
                    info = $"找不到合适的终点货位，需要满足：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                    return NewSimpleResult(5, preLog + $"没有找到合适的终点货位！要求：锁状态='无'；当前容器数量=0；所在库区={JsonConvert.SerializeObject(taskInfo.EndAreas)}");
                }

                var cntId = model.CntId;

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                WCSHelper.LockStartLoc(ref startLoc);
                WCSHelper.LockEndLoc(ref endLoc);
                var task = WCSHelper.BuildTask(startLoc, endLoc, model.CntId, taskInfo.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 (needUpdateContainer && db.Updateable<TN_Container>(cntr).UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
                        return NewSimpleResult(500, preLog + $"更新[容器表]失败！数据：{JsonConvert.SerializeObject(cntr)}");
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

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

@@ -451,12 +377,8 @@
        /// <returns></returns>
        public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo 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;
            var taskInfo = ETask.K空箱上线出库.Info();
            const string preLog = "API：空箱上线出库：";
            const string cntrType = "好运箱";

            try {
@@ -465,90 +387,49 @@
                    .First();

                if (cntr == null) {
                    info = $"容器'{model.CntId}'在【容器表】中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                    return NewSimpleResult(1, preLog + $"容器'{model.CntId}'在[容器表]中不存在，请在前台页面中维护！");
                }
                if (cntr.S_TYPE != cntrType) {
                    info = $"容器'{model.CntId}'在【容器表】中的类型={cntr.S_TYPE}，不是'{cntrType}'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, preLog + $"容器'{model.CntId}'在[容器表]中的类型='{cntr.S_TYPE}'，不是'{cntrType}'！");
                }

                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 => 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();

                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where((l, c) => taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
                if (startLoc == null) {
                    info = $"没有找到起点货位'{model.CntId}的空好运箱的【起点货位】，或不满足：未上锁、当前数量=1";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, preLog + $"没有找到合适的起点货位！要求：锁状态='无'，当前容器数量=1，所在库区={JsonConvert.SerializeObject(taskInfo.EndAreas)}，绑定容器编码='{model.CntId}'，绑定容器类型='{cntrType}'");
                }

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

                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (endLoc == null) {
                    info = $"没有找到合适的终点货位！需要：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'，当前容器数量=0，所在库区={JsonConvert.SerializeObject(taskInfo.EndAreas)}");
                }

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

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

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

@@ -559,12 +440,10 @@
        /// <returns></returns>
        public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            var preLog = "API：抽检合格回库";

            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>()
@@ -572,9 +451,9 @@
                    .First();

                if (cgDetail == null) {
                    info = "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model);
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    preLog = "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model);
                    LogHelper.Info(preLog);
                    return NewSimpleResult(2, preLog);
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
@@ -582,44 +461,29 @@
                    .First();

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

                var startLoc = db.Queryable<TN_Location>()
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .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 => startAreas.Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .First();

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

                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreas = taskInfo.EndAreas_Pallet;
                    endLoc = db.Queryable<TN_Location>()
                    .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();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
                    endAreas = taskInfo.EndAreas_Goodpack;
                    endLoc = db.Queryable<TN_Location>().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();
                }
                else {
                    return NewSimpleResult(-1, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                }

                var endAreas = locCntrRel.S_CNTR_CODE == "托盘" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (endLoc == null) {
                    info = $"没有找到合适的【终点货位】，或不满足要求：未上锁、当前容器数量为 0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'，当前容器数量=0，所在库区={JsonConvert.SerializeObject(endAreas)}");
                }

                cgDetail.N_ITEM_STATE = 0;
@@ -629,48 +493,38 @@
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
                WCSHelper.LockStartLoc(ref startLoc);
                WCSHelper.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) {
                        tran.RollbackTran();
                        info = $"生成'{taskName}'失败：修改物料状态为'合格'失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        preLog = $"生成'{taskInfo.TaskName}'失败：修改物料状态为'合格'失败";
                        LogHelper.Info(preLog);
                        return NewSimpleResult(500, preLog);
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

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

@@ -681,124 +535,71 @@
        /// <returns></returns>
        public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const ETask eTask = ETask.C抽检不合格移库;
            var taskName = Settings.GetTaskInfo(eTask).TaskName;
            var startAreas = Settings.GetTaskInfo(eTask).StartAreas;
            var endAreas = Settings.GetTaskInfo(eTask).EndAreas;
            var taskInfo = ETask.C抽检不合格移库.Info();
            const string preLog = "API：抽检不合格移库：";

            try {
                if (!startAreas.Contains(model.EndArea)) {
                    info = $"终点库区'{model.EndArea}'不满足条件！需要：货区属于[{string.Join(", ", startAreas)}]";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                if (!taskInfo.StartAreas.Contains(model.EndArea)) {
                    return NewSimpleResult(1, $"终点库区'{model.EndArea}'不满足条件！需要：货区={JsonConvert.SerializeObject(model.EndArea)}");
                }

                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
                    .First();

                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode).First();
                if (cgDetail == null) {
                    info = $"没有在物料明细表中，找到物料编码={model.ItemCode}、容器编码={model.CntrCode}的物料";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, $"没有在[物料明细表]中找到物料！要求：物料编码='{model.ItemCode}'，容器编码='{model.CntrCode}'");
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                    .First();

                var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE).First();
                if (locCntrRel == null) {
                    info = $"容器'{model.CntrCode}'在货位容器关系表中不存在";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, $"在[货位容器关系表]中没有找到容器'{model.CntrCode}'！");
                }

                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)
                    .First();

                // 查询起点货位：数量=1
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y").Where(l => l.S_CODE == locCntrRel.S_LOC_CODE && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).First();
                if (startLoc == null) {
                    info = $"起点货位' {locCntrRel.S_LOC_CODE} '不满足条件！需要：货区属于[ {string.Join(", ", startAreas)} ]";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(1, preLog + $"没有找到起点货位'{locCntrRel.S_LOC_CODE}'！要求：锁状态='无'；当前容器数量=1；所在库区={JsonConvert.SerializeObject(taskInfo.StartAreas)}");
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_AREA_CODE == model.EndArea)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .First();

                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.S_AREA_CODE == model.EndArea && l.N_CURRENT_NUM == 0).First();
                if (endLoc == null) {
                    info = $"在终点货区'{model.EndArea}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'，当前容器数量=0，所在库区='{model.EndArea}'");
                }

                cgDetail.N_ITEM_STATE = 2;
                cgDetail.S_ITEM_STATE = "不合格";

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

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

                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 }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：修改物料状态为'不合格'失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新[货品明细表]失败！物料号='{cgDetail}'，物料状态=>'{cgDetail.S_ITEM_STATE}'");
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

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

@@ -811,123 +612,77 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskInfo = Settings.GetTaskInfo(ETask.W尾料回库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            List<string> endAreas = null;
            var taskInfo = ETask.W尾料回库.Info();
            const string preLog = "API：尾料回库";
            
            try {
                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 == 1)
                    .First();

                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1).First();
                if (startLoc == null) {
                    info = $"没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、有货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, $"没有找到起点货位'{model.StartLoc}'！要求：锁状态='无'；当前容器数量=1");
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_LOC_CODE == model.StartLoc)
                    .First();

                var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == model.StartLoc).First();
                if (locCntrRel == null) {
                    info = $"没有找到起点货位{model.StartLoc}所绑定的容器";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endAreas = taskInfo.EndAreas_Pallet;
                    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();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱"){
                    endAreas = taskInfo.EndAreas_Goodpack;
                    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();
                }

                var endAreas = locCntrRel.S_CNTR_CODE == "托盘" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (endLoc == null) {
                    info = "查询：没有找到合适的终点货位";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, preLog + $"没有找到合适的终点货位！要求：锁状态='无'，当前容器数量=0，所在库区={JsonConvert.SerializeObject(endAreas)}");
                }

                var cntId = locCntrRel.S_CNTR_CODE;

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

                using (var tran = db.Ado.UseTran()) {
                    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.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"插入[容器货位绑定表]失败！数据：{JsonConvert.SerializeObject(locCntrRel)}");
                    }

                    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}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新[起点货位锁状态]失败！起点='{startLoc.S_CODE}'，锁状态=>'出库锁'");
                    }

                    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();
                        return NewSimpleResult(500, preLog + $"更新[终点货位锁状态]失败！终点='{endLoc.S_CODE}'，锁状态=>'入库锁'");
                    }

                    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);
                        return NewSimpleResult(500, preLog + $"生成任务'{task.S_TYPE}'失败！任务号={task.S_CODE}，容器号={task.S_CNTR_CODE}，起点={task.S_START_LOC}，终点={task.S_END_LOC}");
                    }

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

        /// <summary>
        /// 成品胶出库(PDA) 待定，暂时不需要此功能
        /// </summary>
        /// <remarks>
        /// WMS提供出库的物料类型与数量，调用接口由WCS生成具体的出库任务，然后WCS后台轮询处理
        /// </remarks>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

            try {
                var orderNo = GenerateOrderNo("出库单号", "CKD");
@@ -984,9 +739,7 @@
                return NewSimpleResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, preLog + $"发生了异常：{ex.Message}\n{ex.StackTrace}");
            }
        }

@@ -1149,28 +902,21 @@
        /// <returns></returns>
        public static MesResult CgInfoSync(CgInfoSyncInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            const string preLog = "API：博实下发物料信息：";
            const string cntrType = "好运箱";

            try {
                if (string.IsNullOrEmpty(model.ItemCode)) {
                    info = $"博实下发物料信息：参数不合法：物料编码（itemCode）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                    return NewMesResult(400, preLog + $"物料编码'{model.ItemCode}'不能为空！");
                }
                if (string.IsNullOrEmpty(model.CntrCode)) {
                    info = $"博实下发物料信息：参数不合法：容器编码（CntrCode）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                    return NewMesResult(400, preLog + $"容器编码'{model.CntrCode}'不能为空！");
                }
                if (string.IsNullOrEmpty(model.BatchNo)) {
                    info = $"博实下发物料信息：参数不合法：批次号（BatchNo）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                    return NewMesResult(400, preLog + $"批次号'{model.BatchNo}'不能为空！");
                }
                if (model.ItemNum <= 0) {
                    info = $"博实下发物料信息：参数不合法：货品数量（ItemNum）应该大于 0";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                    return NewMesResult(400, preLog + $"物料数量'{model.ItemNum}'不合法！要求：物料数量＞0");
                }

                // TEMP 目前流程：对博实下发的信息也进行检查，未找到就报错，后面有需求再更改
@@ -1179,14 +925,10 @@
                    .First();

                if (cntr == null) {
                    info = $"容器'{model.CntrCode}'在容器表中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewMesResult(1, info);
                    return NewMesResult(1, preLog + $"容器'{model.CntrCode}'在[容器表]中不存在，请在前台页面中维护！");
                }
                if (cntr.S_TYPE != "好运箱") {
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与当前容器类型'好运箱'不同！";
                    LogHelper.Info(info);
                    return NewMesResult(2, info);
                if (cntr.S_TYPE != cntrType) {
                    return NewMesResult(2, preLog + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}'，与当前容器类型'{cntrType}'不同！");
                }

                // 将下发的信息先存储到CG表中（此时托盘没有与产线处的货位绑定）
@@ -1213,44 +955,30 @@
                //    return NewMesResult(2, info);
                //}

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
                        return NewMesResult(500, info);
                    }

                    tran.CommitTran();
                if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
                    return NewMesResult(500, preLog + $"插入[物料明细表]失败！数据：{JsonConvert.SerializeObject(detail)}");
                }

                info = "插入物料信息成功";
                return NewMesResult(0, info);
                return NewMesResult(500, preLog + $"插入[物料明细表]成功！数据：{JsonConvert.SerializeObject(detail)}");
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewMesResult(-1, info);
                return NewMesResult(-1, preLog + $"发生了异常：{ex.Message}\n{ex.StackTrace}");
            }
        }

        public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var orderNo = GenerateOrderNo("出库单号", "CKD");
            var info = "";
            const string preLog = "API：ERP下发出库计划单：";
            try {
                // 参数合法性确认部分：错误编码：400
                if (model.pzjs <= 0) {
                    info = $"物料数量(pzjs){model.pzjs}不合法：物料数量应该大于 0";
                    LogHelper.Info(info);
                    return NewErpResult(400, info);
                    return NewErpResult(400, preLog + $"物料数量(pzjs)'{model.pzjs}'不合法！要求：物料数量＞0");
                }

                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);
                    return NewErpResult(1, preLog + $"计划单号'{model.jhdh}'已在[出库计划单]中存在！");
                }

                outboundPlan = new TN_Outbound_Plan {
@@ -1323,9 +1051,7 @@
                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(2, info);
                    return NewErpResult(2, preLog + $"在[货品明细表]中没有找到合适的物料！要求：物料编码='{model.cpdm}'，物料数量>={model.pzjs}");
                }

                var order = new TN_Outbound_Order {
@@ -1370,36 +1096,25 @@
                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(500, info);
                        return NewErpResult(500, preLog + $"生成[出库单]失败！数据：{JsonConvert.SerializeObject(order)}");
                    }

                    if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "生成出库单明细失败";
                        LogHelper.Info(info);
                        return NewErpResult(500, info);
                        return NewErpResult(500, preLog + $"生成[出库单明细]失败！数据：{JsonConvert.SerializeObject(detailList)}");
                    }

                    if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "生成出库单计划记录表失败";
                        LogHelper.Info(info);
                        return NewErpResult(500, info);
                        return NewErpResult(500, preLog + $"生成[出库单计划记录表]失败！数据：{JsonConvert.SerializeObject(outboundPlan)}");
                    }

                    tran.CommitTran();
                    return NewErpResult(0, preLog + $"生成[出库单]成功！出库单：{JsonConvert.SerializeObject(order)}\n出库单明细：{JsonConvert.SerializeObject(detail)}");
                }

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

 api/ApiModel.cs

@@ -152,7 +152,7 @@

    public class OtherModel {
        /// <summary>
        /// 好运箱-满箱下线入库(PDA)数据类
        /// 满箱下线入库
        /// </summary>
        public class GoodpackOfflineInfo {
            /// <summary>
@@ -411,9 +411,10 @@
        /// </summary>
        /// <param name="code"></param>
        /// <param name="message"></param>
        /// <param name="printLog"></param>
        /// <param name="log"></param>
        /// <returns></returns>
        public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
        public static MesResult NewMesResult(int code, string message = "", bool log = true) {
            if (log) { LogHelper.Info(message); }
            return new MesResult {
                Result = code,
                Success = code == 0, // 仅当code=0时，success=true
@@ -431,7 +432,8 @@
            public string Message { get; set; }
        }

        public static ErpResult NewErpResult(int code, string message) {
        public static ErpResult NewErpResult(int code, string message, bool log = true) {
            if (log) { LogHelper.Info(message); }
            return new ErpResult { Code = code, Message = message };
        }


 api/ErpController.cs

@@ -10,18 +10,15 @@
    /// </summary>
    [RoutePrefix("api")]
    public class ErpController : ApiController {

        /// <summary>
        /// ERP下发出库任务
        /// ERP下发出库计划单
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("ErpSendOutboundPlan")]
        public ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
            var apiName = "ERP下发出库计划单";
            LogHelper.InfoApi(apiName, model);

            LogHelper.InfoApi("ERP下发出库计划单", model);
            return ApiHelper.ErpSendOutboundPlan(model);
        }
    }

 api/MoboxController.cs

@@ -42,7 +42,7 @@
                return ApiHelper.EmptyInboundGoodpack(model);
            }
            else { // PDA前端下拉选单限制，故理论上不会进入这个流程
                return NewSimpleResult(-1, $"容器类型 '{model.CntrType}' 不合法：应为 '空托盘' 或 '空好运箱'");
                return NewSimpleResult(-1, $"容器类型'{model.CntrType}'不合法！要求：类型=['空托盘','空好运箱']");
            }
        }
        
@@ -59,65 +59,60 @@
        }

        /// <summary>
        /// 好运箱-空箱上线(PDA)
        /// 空箱上线
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("empty-online-goodpack")]
        public SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
            var apiName = "好运箱-空箱上线(PDA)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("空箱上线", model);
            return ApiHelper.EmptyOnlineGoodpack(model);
        }

        /// <summary>
        /// 合格回库(PDA)
        /// 合格回库
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [Route("qualified-back")]
        public SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var apiName = "合格回库(PDA)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("合格回库", model);
            return ApiHelper.QualifiedBack(model);
        }

        /// <summary>   
        /// 不合格移库(PDA)
        /// 不合格移库
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [Route("unqualified-shift")]
        public SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var apiName = "不合格移库(PDA)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("不合格移库", model);
            return ApiHelper.UnqualifiedShift(model);
        }

        /// <summary>
        /// 余料尾箱回库(PDA)
        /// 余料尾箱回库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("rest-back")]
        public SimpleResult RestBack(RestBackInfo model) {
            var apiName = "余料尾箱回库(PDA)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("余料尾箱回库", model);
            return ApiHelper.RestBack(model);
        }

        /// <summary>
        /// 成品胶出库(PDA)
        /// 成品胶出库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("finished-outbound")]
        public SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
            var apiName = "成品胶出库(PDA)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("成品胶出库", model);

            if (model.ForcedOut) {
                return ApiHelper.FinishedOutboundForce(model);

 api/WMSController.cs

@@ -12,15 +12,13 @@
    [RoutePrefix("api")]
    public class WMSController : ApiController {
        /// <summary>
        /// 博实物料信息下发同步(MES)
        /// 博实下发物料信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        //[Route("WMS/CgInfoSync")]
        public MesResult CgInfoSync(CgInfoSyncInfo model) {
            var apiName = "博实物料信息下发同步(MES)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("博实下发物料信息", model);
            return ApiHelper.CgInfoSync(model);
        }
    }

 core/Monitor.cs

@@ -163,11 +163,15 @@

                    var cntId = detail.S_CNTR_CODE;

                    var erp_no = string.IsNullOrEmpty(detail.S_BS_NO) ? "" : detail.S_BS_NO;
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO, erp_no);
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                    task.S_OP_CODE = detail.S_OO_NO;
                    if (string.IsNullOrEmpty(detail.S_BS_NO)) {
                        task.S_BS_NO = detail.S_BS_NO;
                        task.S_BS_TYPE = "ERP";
                    }

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

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -302,10 +306,11 @@
                    detail.N_B_STATE = 2;

                    var cntId = detail.S_CNTR_CODE;
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                    task.S_OP_CODE = detail.S_OO_NO;

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

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -432,10 +437,11 @@
                    detail.N_B_STATE = 2;

                    var cntId = detail.S_CNTR_CODE;
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                    task.S_OP_CODE = detail.S_OO_NO;

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

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {

 core/WCSCore.cs

@@ -578,8 +578,8 @@
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

                using (var tran = db.Ado.UseTran()) {
                    if (locCntrRelOld != null) {
@@ -638,11 +638,15 @@
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
                return new Result<bool>(false, ex.Message);
                return NewResult(false, ex.Message);
            }
        }

        private static Result<bool> NewResult(bool res, string msg, bool log = true) {
            if (log) { LogHelper.Info(msg); }
            return new Result<bool>(res, msg);
        }

    }

    public class ProductCompletedMessage {

 models/TN_Task_Action.cs

@@ -12,7 +12,7 @@
        /// </summary>
        public string S_EQ_TYPE { get; set; }
        public string S_DATA { get; set; }
      

        public string S_TASK_CODE { get; set; }
        public string S_EQ_CODE { get; set; }
      

 util/LogBuilder.cs

File was deleted

 util/LogHelper.cs

@@ -77,7 +77,11 @@

        public static void InfoApi(string apiName, object model) {
            Info($"触发API：{apiName} " + JsonConvert.SerializeObject(model), "API");
        } 
        }

        public static void InfoHostToAGV(string taskName, object model) {
            Info($"AGV任务：" + JsonConvert.SerializeObject(model), "HosttoagvTask");
        }
        #endregion

    }

 wms/ContainerHelper.cs

File was deleted

 wms/LocationHelper.cs

@@ -127,125 +127,6 @@
        }

        /// <summary>
        /// 起点出库锁（只能对无锁货位上锁）
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="lockSource"></param>
        /// <returns></returns>
        public static bool LockStartLoc(ref TN_Location loc, string lockSource = "") {
            if (loc == null) {
                LogHelper.Info($"起点出库锁：传入的货位参数为null");
                return false;
            }

            if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "无") {
                LogHelper.Info($"起点出库锁：货位当前已有锁({loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
                return false;
            }

            if (loc != null && loc.N_LOCK_STATE == 0) {
                loc.N_LOCK_STATE = 2; // 起点出库锁
                loc.S_LOCK_STATE = GetLockStateStr(2); // 起点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }

            return true;
        }

        /// <summary>
        /// 终点入库锁（只能对无锁货位上锁）
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="lockSource"></param>
        /// <returns></returns>
        public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
            if (loc == null) {
                LogHelper.Info($"终点入库锁：传入的货位参数为null");
                return false;
            }

            if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "无") {
                LogHelper.Info($"终点入库锁：货位当前已有锁({loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
                return false;
            }

            if (loc != null && loc.N_LOCK_STATE == 0) {
                loc.N_LOCK_STATE = 1; // 终点出库锁
                loc.S_LOCK_STATE = GetLockStateStr(1); // 终点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }

            return true;
        }

        private static string GetLockStateStr(int lockState) {
            var str = "";
            switch (lockState) {
                case 0: str = "无"; break;
                case 1: str = "入库锁"; break;
                case 2: str = "出库锁"; break;
                case 3: str = "其它锁"; break;
            }
            return str;
        }

        /// <summary>
        /// 构建货位查询表达式：当前锁状态、数量、货区、名称（默认筛选已启用货位）
        /// </summary>
        /// <param name="db">调用区域的数据库Client</param>
        /// <param name="lockState">锁状态，默认为0，小于0时不筛选</param>
        /// <param name="curNum">当前数量，默认为-1，小于0时不筛选</param>
        /// <param name="areas">所在库区列表，默认为null，为null或为空时不筛选</param>
        /// <param name="name">货位名称，默认为null，为null或为空时不筛选</param>
        /// <returns></returns>
        public static ISugarQueryable<TN_Location> Query(SqlSugarClient db, int lockState = 0, int curNum = -1, List<string> areas = null, string name = null) {
            var query = db.Queryable<TN_Location>().Where(l => l.C_ENABLE == "Y"); // 已启用

            if (lockState >= 0) {
                query = query.Where(l => l.N_LOCK_STATE == lockState && l.S_LOCK_STATE == GetLockStateStr(lockState));
            }
            if (curNum >= 0) {
                query = query.Where(l => l.N_CURRENT_NUM == curNum);
            }
            if (areas != null && areas.Count == 0) {
                query = query.Where(l => areas.Contains(l.S_AREA_CODE));
            }
            if (!string.IsNullOrEmpty(name)) {
                query = query.Where(l => l.S_CODE == name);
            }

            return query;
        }

        /// <summary>
        /// 构建货位查询的要求信息
        /// </summary>
        /// <param name="lockState"></param>
        /// <param name="curNum"></param>
        /// <param name="areas"></param>
        /// <returns></returns>
        public static string Require(int lockState = 0, int curNum = -1, List<string> areas = null) {
            var res = "货位要求：";
            var index = 1;
            if (lockState >= 0) {
                res += $"({index})锁状态='{GetLockStateStr(lockState)}';";
                index++;
            }
            if (curNum >= 0) {
                res += $"({index})当前容器数量={curNum};";
                index++;
            }
            if (areas != null && areas.Count != 0) {
                res += $"({index})所在库区=['{string.Join("','", areas)}'];";
                index++;
            }

            return res;
        }

        /// <summary>
        /// 取货完解锁起点，卸货完解锁终点，可检验锁的来源，也可以不校验
        /// </summary>
        /// <param name="loc"></param>

 wms/WCSHelper.cs

@@ -46,118 +46,52 @@
            return task;
        }

        public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type) {
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = startLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = startLoc.S_CODE,
                S_END_LOC = endLoc.S_CODE,
                S_TYPE = type,
                N_PRIORITY = 3, // 初始优先级默认为：3
                N_SCHEDULE_TYPE = 1, // NDC
                N_B_STATE = 0,
                S_CNTR_CODE = cntId,
            };

            return TN_Task;
        }

        public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string op_no, string erp_no = "") {
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = startLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = startLoc.S_CODE,
                S_END_LOC = endLoc.S_CODE,
                S_TYPE = type,
                N_PRIORITY = 3, // 初始优先级默认为：3
                N_SCHEDULE_TYPE = 1, // NDC
                N_B_STATE = 0,
                S_CNTR_CODE = cntId,
                S_OP_CODE = op_no,
                S_BS_NO = erp_no,
                S_BS_TYPE = erp_no == "" ? "" : "ERP",
            };

            return TN_Task;
        public static string GetAgvSite(string locCode) {
            var db = new SqlHelper<object>().GetInstance();
            var loc = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCode).First();
            return loc == null ? "0" : loc.S_AGV_SITE;
        }

        /// <summary>
        /// 创建搬送任务
        /// 起点出库锁（强制赋值，不会检查loc!=null，锁状态=无，需要传参前确认）
        /// </summary>
        /// <param name="from">起点</param>
        /// <param name="to">终点</param>
        /// <param name="taskType">任务类型</param>
        /// <param name="pri">优先级</param>
        /// <param name="cntrInfo">容器编码</param>
        /// <returns></returns>
        internal static bool CreateTask(string from, string to, string taskType, int pri, string cntrInfo) {
            var fromLoc = LocationHelper.GetLocation(from);
            var endLoc = LocationHelper.GetLocation(to);
        /// <param name="loc"></param>
        /// <param name="lockSource"></param>
        public static void LockStartLoc(ref TN_Location loc, string lockSource = "") {
            loc.N_LOCK_STATE = 2; // 起点出库锁
            loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 起点出库锁
            loc.S_LOCK_OP = lockSource;
            loc.T_MODIFY = System.DateTime.Now;
        }

        /// <summary>
        /// 终点入库锁（强制赋值，不会检查loc!=null，锁状态=无，需要传参前确认）
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="lockSource"></param>
        public static void LockEndLoc(ref TN_Location loc, string lockSource = "") {
            loc.N_LOCK_STATE = 1; // 终点出库锁
            loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 终点出库锁
            loc.S_LOCK_OP = lockSource;
            loc.T_MODIFY = System.DateTime.Now;
        }

        public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, int pri = 3, int agvType = 1) {
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = fromLoc.S_AREA_CODE,
                S_START_AREA = startLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = from,
                S_END_LOC = to,
                S_TYPE = taskType,
                S_START_LOC = startLoc.S_CODE,
                S_END_LOC = endLoc.S_CODE,
                S_TYPE = type,
                N_PRIORITY = pri,
                N_SCHEDULE_TYPE = 1,
                N_B_STATE = 0,
                S_CNTR_CODE = cntrInfo,
                N_SCHEDULE_TYPE = agvType,
                N_B_STATE = 0, // 任务创建时，默认等待
                S_CNTR_CODE = cntId,
            };

            var log = JsonConvert.SerializeObject(TN_Task);
            var db = new SqlHelper<TN_Task>().GetInstance();
            var res = db.Insertable(TN_Task).ExecuteCommand() > 0;
            if (res) {
                LogHelper.Info($"插入任务成功，{log}");
            }
            else {
                LogHelper.Info($"插入任务失败，{log}");
            }
            return res;

            return TN_Task;
        }

        public static bool CreateTask(List<CreateTasks> modes) {
            if (modes != null && modes.Count > 0) {
                List<TN_Task> tN_Tasks = new List<TN_Task>();

                foreach (var item in modes) {

                    var fromLoc = LocationHelper.GetLocation(item.from);
                    var endLoc = LocationHelper.GetLocation(item.to);

                    tN_Tasks.Add(new TN_Task() {
                        S_CODE = GenerateTaskNo(),
                        S_START_AREA = fromLoc.S_AREA_CODE,
                        S_END_AREA = endLoc.S_AREA_CODE,
                        S_START_LOC = item.from,
                        S_END_LOC = item.to,
                        S_TYPE = item.taskType,
                        N_PRIORITY = item.pri,
                        N_SCHEDULE_TYPE = 1,
                        N_B_STATE = 0,
                        S_CNTR_CODE = item.cntrInfo,
                    });
                }
                var log = JsonConvert.SerializeObject(tN_Tasks);
                var db = new SqlHelper<object>().GetInstance();
                var res = db.Insertable<TN_Task>(tN_Tasks).ExecuteCommand() > 0;
                if (res) {
                    LogHelper.Info($"插入任务成功，{log}");
                }
                else {
                    LogHelper.Info($"插入任务失败，{log}");
                }
                return res;
            }

            return false;
        }


        internal static bool CheckActionRecordExist(string no, int code) {
            var db = new SqlHelper<TN_Task_Action>().GetInstance();
@@ -211,13 +145,5 @@
            var db = new SqlHelper<object>().GetInstance();
            return db.Queryable<TN_Task>().Where(a => a.N_B_STATE == 0 && (a.S_B_STATE == "等待" || a.S_B_STATE == "待推送")).ToList();
        }
    }

    public class CreateTasks {
        public string from { set; get; }
        public string to { set; get; }
        public string taskType { set; get; }
        public int pri { set; get; }
        public string cntrInfo { set; get; }
    }
}