部分细节优化

kazelee

2025-06-05 f248d4a25fb196149c9add083e74252d7334b37d

 api/ApiHelper.cs

@@ -1,124 +1,139 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;

using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Tsp;

using SqlSugar;

using Swashbuckle.Swagger;

using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
using static HH.WCS.Mobox3.DSZSH.Config;


namespace HH.WCS.Mobox3.DSZSH.api {
    public class ApiHelper {
        /// <summary>
        /// 好运箱-满托下线入库(PDA)
        /// 好运箱-满箱下线入库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <remarks>
        /// 流程：人工将满箱从产线搬运到操作区后，使用PDA调用接口，呼叫AGV将满箱搬运到货架区（不指定终点货区）
        /// </remarks>
        /// <param name="model">包含：物料信息、起点货位</param>
        /// <returns></returns>
        public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

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

                // 如果找不到指定的物料，说明信息不一致，报错
                if (cgDetail == null) {
                    info = $"PDA扫码物料信息与贴标机传递的信息不一致：" + JsonConvert.SerializeObject(model);
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                    return NewSimpleResult(2, info);
                }

                // 起点货位绑定后，可以不立即设置N_CURRENT_NUM为1
                // 因为AGV取货后就会恢复0，而且货位上锁后不会被访问到
                // 查询起点货位，是否符合要求（初次下线要求货位无容器）
                // 注：起点货位绑定前没有货物，数量为 0
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位号
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                    .Where(l => Settings.AreaMap[AreaName.M满箱操作区].Contains(l.S_AREA_CODE))
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
                    info = $"在'{AreaName.M满箱操作区}'中没有找到起点货位'{model.StartLoc}'，或不具备取货要求：未上锁、绑定前无货物";
                    info = $"在'{startAreaName}'中没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、绑定前无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

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

                // 绑定货位和容器号（满箱下线到操作区，此时尚未绑定）
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = model.StartLoc,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    S_CNTR_TYPE = "好运箱",
                };

                // 每个新插入容器的逻辑，都需要查询这个表是否存在，如果不存在也加入，如果存在：暂不更新结果（待定）
                // 更详细的，是空箱入库，和满料下线这两个流程的容器可能是新的，其余容器一定是旧的，无需再判断
                // 严格来说，容器类型应该放在Container里面的，Loc_Container表只放关系，不过暂时先这样改吧
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                var insertContainerItemType = false;
                if (cntrItemRel == null) {
                    insertContainerItemType = true;
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = cgDetail.S_ITEM_CODE, // 物料类型对于好运箱而言其实不用，主要是类型
                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                    };
                }

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

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

                // 数据库操作部分
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                // TODO
                var record = new TN_Record_Table {
                    S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                    S_BATCH_NO= cgDetail.S_BATCH_NO,
                    S_ITEM_NAME= cgDetail.S_ITEM_NAME,
                    S_START_LOC = startLoc.S_CODE,
                    S_END_LOC = endLoc.S_CODE,
                    S_CNTR_CODE = cntId,
                    S_ITEM_SPEC = cgDetail.S_ITEM_SPEC,
                    S_NET_WEIGHT= cgDetail.S_NET_WEIGHT,
                    S_QUALITY_GRADE= cgDetail.S_QUALITY_GRADE,
                    S_STANDARD = cgDetail.S_STANDARD,
                    S_TASK_NO = task.S_CODE,
                };
                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                        }
                    }

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

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

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

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

                    tran.CommitTran();
@@ -153,158 +168,88 @@
            }
        }

        ///// <summary>
        ///// 空托盘绑定(PDA)
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //public static SimpleResult EmptyBindPallet(EmptyBindInfo model) {
        //    var db = DbHelper.GetDbClient();

        //    try {
        //        var loc = db.Queryable<TN_Location>()
        //            .Where(ExprHelper.LocCode(model.LocCode))
        //            .Where(ExprHelper.LocBelongsToArea(AreaName.空托盘接驳区))
        //            .Where(ExprHelper.LocIsFree)
        //            .Where(ExprHelper.LocIsEmpty).First();

        //        if (loc == null) {
        //            return BuildSimpleResult(2, $"当前货位 '{model.LocCode}' 无法再绑定容器");
        //        }

        //        var locCntrRel = db.Queryable<TN_Loc_Container>()
        //            .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();

        //        if (locCntrRel != null) {
        //            return BuildSimpleResult(3, $"当前容器 '{model.CntrCode}' 已经与 '{locCntrRel.S_LOC_CODE}' 绑定");
        //        }

        //        //loc.N_CURRENT_NUM = model.PalletCount;

        //        locCntrRel = new TN_Loc_Container {
        //            S_LOC_CODE = model.LocCode,
        //            S_CNTR_CODE = model.CntrCode
        //        };

        //        using (var tran = db.Ado.UseTran()) {
        //            if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0
        //                && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) {
        //                tran.CommitTran();
        //                return BuildSimpleResult(0, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 成功");
        //            }
        //            else {
        //                tran.RollbackTran();
        //                return BuildSimpleResult(4, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 失败");
        //            }
        //        }
        //    }
        //    catch (Exception ex) {
        //        return BuildSimpleEx(ex);
        //    }
        //}

        ///// <summary>
        ///// 空箱绑定(PDA)
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //public static SimpleResult EmptyBindGoodpack(EmptyBindInfo model) {
        //    var db = DbHelper.GetDbClient();

        //    try {
        //        var loc = db.Queryable<TN_Location>()
        //            .Where(ExprHelper.LocCode(model.LocCode))
        //            .Where(ExprHelper.LocBelongsToArea(AreaName.空箱接驳区))
        //            .Where(ExprHelper.LocIsFree)
        //            .Where(ExprHelper.LocIsEmpty).First();

        //        if (loc == null) {
        //            return BuildSimpleResult(2, $"当前货位 '{model.LocCode}' 无法再绑定容器");
        //        }

        //        var locCntrRel = db.Queryable<TN_Loc_Container>()
        //            .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();

        //        if (locCntrRel != null) {
        //            return BuildSimpleResult(3, $"当前容器 '{model.CntrCode}' 已经与 '{locCntrRel.S_LOC_CODE}' 绑定");
        //        }

        //        loc.N_CURRENT_NUM = 1; // 空箱绑定时容器数必然为 1

        //        locCntrRel = new TN_Loc_Container {
        //            S_LOC_CODE = model.LocCode,
        //            S_CNTR_CODE = model.CntrCode
        //        };

        //        using (var tran = db.Ado.UseTran()) {
        //            if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0
        //                && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) {
        //                tran.CommitTran();
        //                return BuildSimpleResult(0, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 成功");
        //            }
        //            else {
        //                tran.RollbackTran();
        //                return BuildSimpleResult(4, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 失败");
        //            }
        //        }
        //    }
        //    catch (Exception ex) {
        //        return BuildSimpleEx(ex);
        //    }
        //}

        /// <summary>
        /// 托盘-空托入库(PDA)
        /// </summary>
        /// <remarks>
        /// 人工将空托盘通过接驳位入库，需要新绑定容器货位<br/>
        /// 由于空托盘一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var taskName = TaskName.T托盘_空托入库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

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

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

                // 查看容器与起点货位是否绑定
                //var locCntrRel = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
                //    .First();
                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                var cgDetailOld = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();

                //if (locCntrRel == null) {
                //    info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}";
                //    LogHelper.Info(info);
                //    return NewSimpleResult(3, info);
                //}
                // 如果人工将出库后的托盘入库，此时容器仍然与旧的出库货位绑定，需要检查
                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == model.CntrCode).First();

                // 绑定货位和容器号
                TN_Location locOld = 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
                    }
                }

                // 绑定货位和容器号（PDA在接驳位绑定）
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = model.StartLoc,
                    S_CNTR_CODE = model.CntrCode,
                    S_CNTR_TYPE = "托盘",
                };

                // 每个新插入容器的逻辑，都需要查询这个表是否存在，如果不存在也加入，如果存在：暂不更新结果（待定）
                // 更详细的，是空箱入库，和满料下线这两个流程的容器可能是新的，其余容器一定是旧的，无需再判断
                // 严格来说，容器类型应该放在Container里面的，Loc_Container表只放关系，不过暂时先这样改吧
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                var insertContainerItemType = false;
                if (cntrItemRel == null) {
                    insertContainerItemType = true;
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = "", // 空托盘刚入库，没有物料类型，就默认先为空
                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                    };
                }

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

                if (endLoc == null) {
                    info = $"暂时没有符合条件的终点放货位";
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }
@@ -312,17 +257,53 @@
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                        }
                    }

                    if (cgDetailOld != null) {
                        if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                            info = $"删除旧物料信息失败：" + JsonConvert.SerializeObject(cgDetailOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                        }
                    }

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

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

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

                     
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
@@ -332,7 +313,7 @@
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(4, info);
                        return NewSimpleResult(5, info);
                    }

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

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

                    tran.CommitTran();
@@ -370,17 +351,25 @@
        /// <summary>
        /// 好运箱-空箱入库(PDA)
        /// </summary>
        /// <remarks>
        /// 人工将空箱通过接驳位入库，需要新绑定容器货位<br/>
        /// 由于空箱一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <returns></returns>
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
            var taskName = TaskName.H好运箱_空箱入库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

            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 == 0) // 绑定前货位为空
                    .Where(l => Settings.AreaMap[AreaName.K空箱入库接驳区].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
@@ -389,16 +378,23 @@
                    return NewSimpleResult(2, info);
                }

                // 查看容器与起点货位是否绑定
                //var locCntrRel = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
                //    .First();
                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                var cgDetailOld = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();

                //if (locCntrRel == null) {
                //    info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}";
                //    LogHelper.Info(info);
                //    return NewSimpleResult(3, info);
                //}
                // 如果人工将出库后的托盘入库，此时容器仍然与旧的出库货位绑定，需要检查
                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == model.CntrCode).First();

                TN_Location locOld = 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
                    }
                }

                // 绑定货位和容器号
                var locCntrRel = new TN_Loc_Container {
@@ -407,25 +403,78 @@
                    S_CNTR_TYPE = "好运箱",
                };

                // 每个新插入容器的逻辑，都需要查询这个表是否存在，如果不存在也加入，如果存在：暂不更新结果（待定）
                // 更详细的，是空箱入库，和满料下线这两个流程的容器可能是新的，其余容器一定是旧的，无需再判断
                // 严格来说，容器类型应该放在Container里面的，Loc_Container表只放关系，不过暂时先这样改吧
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                var insertContainerItemType = false;
                if (cntrItemRel == null) {
                    insertContainerItemType = true;
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = "", // 空托盘刚入库，没有物料类型，就默认先为空
                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                    };
                }

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

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

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

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

                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                        }
                    }

                    if (cgDetailOld != null) {
                        if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                            info = $"删除旧物料信息失败：" + JsonConvert.SerializeObject(cgDetailOld);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                        }
                    }

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

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

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
@@ -480,54 +529,38 @@
        /// <summary>
        /// 托盘-空托上线(PDA)
        /// </summary>
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var taskName = TaskName.T托盘_空托上线;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

            try {
                // 找符合物料信息的货位
                //var startLoc = db.Queryable<TN_Location>()
                //    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 联表：货位容器关系表
                //    .LeftJoin<TN_Container_Item>((l, c, i) => c.S_CNTR_CODE == i.S_CNTR_CODE) // 联表：容器与物料类型绑定表
                //    .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 限定在空托存放区中找容器货位
                //    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：没有锁状态
                //    .Where(l => l.N_CURRENT_NUM == 1) // 筛选：有货货位
                //    .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 找指定容器号
                //    .Where((l, c, i) => i.S_ITEM_CODE == model.ItemCode) // 确保容器编码绑定的物料编码与所需一致
                //    .First();

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

                //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
                //    a => a.S_LOC_CODE == startLoc.S_CODE
                //    && a.S_CNTR_CODE == model.CntId);

                //if (locCntrRel == null) {
                //    return NewSimpleResult(3, $"起点位置 '{startLoc.S_CODE}' 没有绑定容器 '{model.CntId}'");
                //}

                var cntrItemRel = db.Queryable<TN_Container_Item>()
                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_ITEM_CODE == model.ItemCode)
                // 查容器-物料类型表
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "托盘")
                    .First();

                if (cntrItemRel == null) {
                    info = $"容器{model.CntId}不符合物料{model.ItemCode}：没有在容器物料类型登记表中找到";
                // 如果表中存在这个托盘信息，且物料类型与上线所需物料不符，报错
                // 如果不存在，不作限制（视作第一次上线）
                if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
                    info = $"容器{model.CntId}已经与物料类型{cntrItemRel.S_ITEM_CODE}绑定，无法用于装载物料{model.ItemCode}";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

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

                if (startLoc == null) {
@@ -537,7 +570,7 @@
                }

                var endLoc = db.Queryable<TN_Location>()
                    //.Where(l => Settings.AreaMap[AreaName.B包装区].Contains(l.S_AREA_CODE))
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) 
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
                    .First();
@@ -551,8 +584,8 @@
                var cntId = model.CntId;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -605,47 +638,45 @@
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
            var taskName = TaskName.H好运箱_空箱上线;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

            try {
                var startLoc = db.Queryable<TN_Location>()
                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where(l => Settings.AreaMap[AreaName.K空箱货架区].Contains(l.S_AREA_CODE))
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
                    .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
                    .First();

                if (startLoc == null) {
                    info = $"在空箱存放区中，找不到编码为{model.CntId}的空好运箱";
                    info = $"在'{startAreaName}'中，找不到编码为{model.CntId}的空好运箱";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
                //    a => a.S_LOC_CODE == startLoc.S_CODE
                //    && a.S_CNTR_CODE == model.CntId);

                //if (locCntrRel == null) {
                //    return NewSimpleResult(3, $"起点位置 '{startLoc.S_CODE}' 没有绑定容器 '{model.CntId}'");
                //}

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

                if (endLoc == null) {
                    return NewSimpleResult(4, $"终点位置 不存在或不具备放货要求");
                    info = $"终点位置 不存在或不具备放货要求";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }

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

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -699,9 +730,12 @@
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var taskName = TaskName.C抽检_合格回库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

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

            try {
                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
@@ -715,21 +749,15 @@
                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                    .First();

                //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 == cgDetail.S_CNTR_CODE) // 指定容器号
                //    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                //    .First();

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

                if (startLoc == null) {
                    info = "没有找到合适的起点货位";
                    info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -753,9 +781,10 @@
                    return NewSimpleResult(2, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                }


                if (endLoc == null) {
                    return NewSimpleResult(3, "查询：没有找到合适的终点货位");
                    info = "查询：没有找到合适的终点货位";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                cgDetail.N_ITEM_STATE = 0;
@@ -764,8 +793,8 @@
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -819,10 +848,18 @@
                return NewSimpleResult(1, info);
            }
        }

        /// <summary>
        /// 抽检-不合格移库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var taskName = TaskName.C抽检_不合格移库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_不合格移库;

            try {

                if (!Settings.AreaMap[AreaName.C抽检异常区].Contains(model.EndArea)) {
@@ -843,12 +880,6 @@
                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                    .First();

                //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 == cgDetail.S_CNTR_CODE) // 指定容器号
                //    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                //    .First();

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -879,8 +910,8 @@
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -935,10 +966,17 @@
            }
        }

        /// <summary>
        /// 余料回库/尾箱回库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult RestBack(RestBackInfo model) {
            var taskName = TaskName.W尾箱回库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.W尾箱回库;
            
            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
@@ -946,15 +984,24 @@
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .First();

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

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

                if (locCntrRel == null) {
                    return NewSimpleResult(2, $"起点货位 {model.StartLoc}");
                    info = $"没有找到起点货位{model.StartLoc}所绑定的容器";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var endLoc = new TN_Location();
                //var endLoc = new TN_Location();
                TN_Location endLoc = null;
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
@@ -969,24 +1016,21 @@
                        .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                        .First();
                }
                else {
                    endLoc = null;
                }

                //var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                //    .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
                //    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                //    .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                //    .First();
                //else {
                //    endLoc = null;
                //}

                if (endLoc == null) {
                    return NewSimpleResult(3, $"不存在合适的终点货位可以回库");
                    info = "查询：没有找到合适的终点货位";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

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

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -1035,7 +1079,7 @@
        }

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

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

            try {
                if (string.IsNullOrEmpty(orderNo)) {
                    info = "出库单号不能为空";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }
                var orderNo = GenerateOrderNo("出库单号", "ON");

                var cgDetailList = SelectCgByTotalQty(model);

@@ -1066,7 +1108,6 @@
                    S_ITEM_CODE = model.ItemCode,
                    S_BATCH = model.BatchNo,
                    N_END_NUM = model.Qty,
                    //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                    S_END_AREA = model.EndArea
                };

@@ -1101,7 +1142,9 @@
                    tran.CommitTran();
                }

                return NewSimpleResult(0, "生成出库单成功");
                info = "生成出库单成功";
                LogHelper.Info(info);
                return NewSimpleResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
@@ -1116,54 +1159,63 @@
        /// <returns></returns>
        public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var orderNo = GenerateOrderNo("出库单号", "ON");
            var info = "";

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

            try {
                if (string.IsNullOrEmpty(orderNo)) {
                    return NewSimpleResult(2, "出库单号不能为空");
                var orderNo = GenerateOrderNo("出库单号", "ON");

                var cgDetailList = SelectCgByTotalQty(model);

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

                var order = new TN_Outbound_Order {
                    S_NO = orderNo,
                    S_ITEM_CODE = model.ItemCode,
                    S_BATCH = model.BatchNo,
                    N_END_NUM = model.Qty,
                    S_END_AREA = model.EndArea
                };

                var detailList = new List<TN_Outbound_Detail>();
                foreach (var cgDetail in cgDetailList) {
                    var detail = new TN_Outbound_Detail {
                        S_OO_NO = orderNo,
                        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                        S_BATCH_NO = cgDetail.S_BATCH_NO,
                        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                        N_COUNT = cgDetail.N_ITEM_NUM,
                        S_END_AREA = model.EndArea
                    };
                    detailList.Add(detail);
                }

                using (var tran = db.Ado.UseTran()) {

                    var cgDetailList = SelectCgByTotalQty(model);

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

                    foreach (var cgDetail in cgDetailList) {
                        var detail = new TN_Outbound_Detail {
                            S_OO_NO = orderNo,
                            S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                            S_BATCH_NO = cgDetail.S_BATCH_NO,
                            S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                            S_END_AREA = model.EndArea
                        };

                        if (db.Insertable<TN_Outbound_Detail>(detail).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            return NewSimpleResult(4, "生成出库单明细失败：" + JsonConvert.SerializeObject(detail));
                        }
                    }

                    var order = new TN_Outbound_Order {
                        S_NO = orderNo,
                        S_ITEM_CODE = model.ItemCode,
                        S_BATCH = model.BatchNo,
                        N_END_NUM = model.Qty,
                        //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                        S_END_AREA = model.EndArea
                    };

                    if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(5, "生成出库单失败：" + JsonConvert.SerializeObject(order));
                        info = "生成出库单失败：" + JsonConvert.SerializeObject(order);
                        LogHelper.Info(info);
                        return NewSimpleResult(2, info);
                    }

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

                    tran.CommitTran();
                }

                return NewSimpleResult(0, "生成出库单成功");
                info = "生成出库单成功";
                LogHelper.Info(info);
                return NewSimpleResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
@@ -1178,9 +1230,10 @@
            var targetNum = model.Qty;
            var info = "";
            try {
                var targetCg = db.Queryable<TN_CG_Detail>().Where(a => a.S_ITEM_CODE == model.ItemCode
                && a.N_ITEM_NUM > targetNum).
                OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
                var targetCg = db.Queryable<TN_CG_Detail>()
                    .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
                    .Where(a => a.N_ITEM_NUM > targetNum)
                    .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
                if (targetCg != null) //刚好有一行满足条件
                {
                    result.Add(targetCg);
@@ -1245,32 +1298,38 @@
        }

        /// <summary>
        /// 博实物料信息下发同步
        /// 博实物料信息下发同步（只针对好运箱）
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static MesResult CgInfoSync(CgInfoSyncInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var random = new Random();
            var info = "";

            try {
                // 将下发的信息先存储到CG表中（此时托盘没有与产线处的货位绑定）
                var detail = new TN_CG_Detail {
                    S_ITEM_CODE = model.ItemCode,
                    S_ITEM_NAME = model.ItemName,
                    S_CNTR_CODE = GenerateOrderNo("容器号", "CN"), // NOTE 容器号：目前随机（后期可能会指定，或者PDA绑定时再填入）
                    S_CNTR_CODE = model.CntrCode, // 料箱编号（待定，现在暂时设定为博实下发）
                    S_BATCH_NO = model.BatchNo,
                    S_STANDARD = model.Standard,
                    S_NET_WEIGHT = model.NetWeight,
                    S_QUALITY_GRADE = model.QualityGrade,
                    //N_PRODUCT_LINE = random.Next(0, 3), // NOTE 产线号：目前随机（后期可能会指定，或者PDA绑定时再填入）
                };

                //var locCntrRel = new TN_Loc_Container {
                //    //S_LOC_CODE = Settings.Config.ProductionLines[detail.N_PRODUCT_LINE].OffLoc[0], // 好运箱的位置是操作区，不是产线
                //    S_CNTR_CODE = detail.S_CNTR_CODE,
                //    S_CNTR_TYPE = "好运箱", // 贴标机只针对好运箱
                //};
                // 产线号的逻辑待定，现在设定为博实下发产线号，看后续需求变更
                // 好运箱起点为产线货位，人工将好运箱从产线上取下，搬运到满好运箱操作区
                //var startLocCode = "";
                //if (model.ProdLineId.Trim() == "3") {
                //    startLocCode = "";
                //}

                //if (model.ProdLineId.Trim() != "3" || model.ProdLineId.Trim() != "4") {
                //    info = $"不合法的产线号{model.ProdLineId}：好运箱产线号必须为 3 或 4";
                //    LogHelper.Info(info);
                //    return NewMesResult(2, info);
                //}

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

                    //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
                    //    return NewWmsResult(2, info);
                    //}

                    tran.CommitTran();
                }
@@ -1300,10 +1353,74 @@

        public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var orderNo = GenerateOrderNo("出库单号", "ON");
            var info = "";
            try {
                // TODO
                return NewErpResult(0, info);
                if (string.IsNullOrEmpty(orderNo)) {
                    info = "出库单号不能为空";
                    LogHelper.Info(info);
                    return NewErpResult(2, info);
                }

                var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
                    BatchNo = model.BatchNo,
                    CntrType= model.CntrType,
                    ItemCode= model.ItemCode,
                    EndArea= model.EndArea,
                    ForcedOut= model.ForcedOut,
                    Qty= model.Qty,
                    Spe = model.Spe
                });

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

                var order = new TN_Outbound_Order {
                    S_NO = orderNo,
                    S_ITEM_CODE = model.ItemCode,
                    S_BATCH = model.BatchNo,
                    N_END_NUM = model.Qty,
                    //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                    S_END_AREA = model.EndArea,
                    S_BS_NO = model.ErpNo,
                    S_BS_TYPE = "ERP",
                };

                var detailList = new List<TN_Outbound_Detail>();
                foreach (var cgDetail in cgDetailList) {
                    var detail = new TN_Outbound_Detail {
                        S_OO_NO = orderNo,
                        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                        S_BATCH_NO = cgDetail.S_BATCH_NO,
                        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                        N_COUNT = cgDetail.N_ITEM_NUM,
                        S_END_AREA = model.EndArea
                    };
                    detailList.Add(detail);
                }

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "生成出库单失败：" + JsonConvert.SerializeObject(order);
                        LogHelper.Info(info);
                        return NewErpResult(2, info);
                    }

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

                    tran.CommitTran();
                }

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