更新容器必须检查前台是否维护的功能

kazelee

2025-06-11 9fa293298c53429e8ac5148de8328933c0a80ff4

 api/ApiHelper.cs

@@ -18,6 +18,9 @@
        /// <summary>
        /// 好运箱-满箱下线入库(PDA)
        /// </summary>
        /// <remarks>
        /// 流程：人工将满箱从产线搬运到操作区后，使用PDA调用接口，呼叫AGV将满箱搬运到货架区（不指定终点货区）
        /// </remarks>
        /// <param name="model">包含：物料信息、起点货位</param>
        /// <returns></returns>
        public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
@@ -29,21 +32,29 @@
            var endAreaName = AreaName.M满箱货架区; // 终点货区

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

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

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

                
                // 查询起点货位，是否符合要求（初次下线要求货位无容器）
                // 注：起点货位绑定前没有货物，数量为 0
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位号
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
@@ -52,18 +63,21 @@
                    .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、绑定前无货物";
                    info = $"在'{startAreaName}'中没有找到起点货位'{model.StartLoc}'，或不具备取货要求：未上锁、绑定前无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(2, 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_LOC_CODE = startLoc.S_CODE, // 已校验
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE, // 已校验
                    S_CNTR_TYPE = "好运箱",
                };

                // NOTE 不需要校验locCntrRel的容器是否存在，博实下发物料已经做过校验
                
                // TODO 满箱入库算法待优化
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
@@ -75,7 +89,7 @@
                if (endLoc == null) {
                    info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                    return NewSimpleResult(3, info);
                }

                var cntId = locCntrRel.S_CNTR_CODE;
@@ -84,43 +98,45 @@
                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

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

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

                    tran.CommitTran();
@@ -132,14 +148,18 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

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

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

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

                if (cntr == null) {
                    info = $"容器'{model.CntrCode}'在容器表中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                //// 查看容器是否已有物料绑定
                //var cgDetail = db.Queryable<TN_CG_Detail>()
                //    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                //// 如果有绑定物料，报错，因为空托不应该有物料
                //if (cgDetail != null) {
                //    info = $"容器{model.CntrCode}已经绑定了物料{cgDetail.S_ITEM_CODE}，不是空托无法入库";
                //    LogHelper.Info(info);
                //    return NewSimpleResult(3, info);
                //}
                if (cntr.S_TYPE != "托盘") { // 空托入库
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与输入的容器类型'托盘'不同！";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                var cgDetail = db.Queryable<TN_CG_Detail>()
                var cgDetailOld = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                var needDeleteDetail = cgDetail != null;

                // 绑定货位和容器号（PDA在接驳位绑定
                // 如果人工将出库后的托盘入库，此时容器仍然与旧的出库货位绑定，需要检查
                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
                        locOld.T_MODIFY = DateTime.Now;
                    }
                }

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

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
@@ -208,13 +249,40 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

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

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

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

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

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

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

                // 查看容器是否已有物料绑定
                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                // 如果有绑定物料，报错，因为空箱不应该有物料
                if (cgDetail != null) {
                    info = $"容器{model.CntrCode}已经绑定了物料{cgDetail.S_ITEM_CODE}，不是空箱无法入库";
                // TEMP 目前流程：容器必须先在系统中维护，否则报错
                // - 后台程序不可以生成Container，必须由前台维护
                // - 否则，工人随意输入一个容器/输入错容器号，都可以绑定
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
                    .First();

                if (cntr == null) {
                    info = $"容器'{model.CntrCode}'在容器表中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(2, info);
                }
                if (cntr.S_TYPE != "好运箱") { // 空箱入库
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}'，与输入的容器类型'好运箱'不同！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                // 假定人工不会将有物料的箱子放在空箱入库接驳位，没有必要检查
                // 如果人工将出库后的托盘入库，这时物料信息并没有删除，需要将托盘物料的关系解除
                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) { // 如果需要解绑容器货位，也需要修改货位信息
                    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 {
                    S_LOC_CODE = model.StartLoc,
                    S_CNTR_CODE = model.CntrCode,
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntr.S_CODE,
                    S_CNTR_TYPE = "好运箱",
                };

@@ -323,6 +421,33 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

                    if (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();
@@ -377,7 +502,10 @@
        /// <summary>
        /// 托盘-空托上线(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model">包含：容器号、物料编码</param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var db = new SqlHelper<object>().GetInstance();
@@ -388,16 +516,39 @@
            var endAreaName = AreaName.B包装区;

            try {
                // 查容器-物料类型表
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "托盘")
                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntId)
                    .First();
                // 如果表中存在这个托盘信息，且物料类型与上线所需物料不符，报错
                // 如果不存在，不作限制（视作第一次上线）
                if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
                    info = $"容器{model.CntId}已经与物料类型{cntrItemRel.S_ITEM_CODE}绑定，无法用于装载物料{model.ItemCode}";

                // 如果容器在容器表中不存在，报错
                if (cntr == null) {
                    info = $"容器'{model.CntId}'在容器表中不存在，请在前台页面中维护！";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }
                // 如果存在容器号，但类型不是托盘，报错
                if (cntr.S_TYPE != "托盘") { // 容器类型默认不会为空
                    info = $"容器'{model.CntId}'在容器表中的类型是'{cntr.S_TYPE}，不是'托盘'！";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

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

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

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

                var startLoc = db.Queryable<TN_Location>()
@@ -432,7 +583,20 @@
                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

                using (var tran = db.Ado.UseTran()) {
                    if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr)
                            .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"更新表'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            return NewSimpleResult(4, info);
                        }
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
@@ -473,7 +637,7 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
                return NewSimpleResult(-1, info);
            }
        }

@@ -487,10 +651,29 @@
            var info = "";

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

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

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

                var startLoc = db.Queryable<TN_Location>()
                    .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId)
@@ -587,12 +770,20 @@
                    .First();

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

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

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -604,7 +795,7 @@
                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(4, info);
                }

                var endLoc = new TN_Location();
@@ -623,7 +814,7 @@
                        .First();
                }
                else {
                    return NewSimpleResult(2, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                    return NewSimpleResult(-1, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                }

                if (endLoc == null) {
@@ -693,6 +884,12 @@
                return NewSimpleResult(1, info);
            }
        }

        /// <summary>
        /// 抽检-不合格移库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
@@ -720,11 +917,11 @@
                    .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();
                if (locCntrRel == null) {
                    info = $"容器{model.CntrCode}在货位容器关系表中不存在";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -734,7 +931,7 @@
                    .First();

                if (startLoc == null) {
                    info = "没有找到合适的起点货位";
                    info = "待抽检物料在抽检区中没有找到！";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                }
@@ -746,7 +943,9 @@
                    .First();

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

                cgDetail.N_ITEM_STATE = 2;
@@ -811,6 +1010,11 @@
            }
        }

        /// <summary>
        /// 余料回库/尾箱回库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult RestBack(RestBackInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
@@ -824,17 +1028,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) {
                    info = $"没有找到起点货位{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))
@@ -849,15 +1060,16 @@
                        .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                        .First();
                }
                else {
                    endLoc = null;
                }
                //else {
                //    endLoc = null;
                //}

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

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

@@ -911,7 +1123,7 @@
        }

        /// <summary>
        /// 成品胶出库(PDA)
        /// 成品胶出库(PDA) 待定，暂时不需要此功能
        /// </summary>
        /// <remarks>
        /// WMS提供出库的物料类型与数量，调用接口由WCS生成具体的出库任务，然后WCS后台轮询处理
@@ -925,9 +1137,9 @@
            var taskName = TaskName.C成品胶出库;

            try {
                var orderNo = GenerateOrderNo("出库单号", "ON");
                var orderNo = GenerateOrderNo("出库单号", "CKD");

                var cgDetailList = SelectCgByTotalQty(model);
                var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);

                if (cgDetailList.Count == 0) {
                    info = "没有合适的物料可以出库";
@@ -996,9 +1208,9 @@
            var taskName = TaskName.C成品胶出库;

            try {
                var orderNo = GenerateOrderNo("出库单号", "ON");
                var orderNo = GenerateOrderNo("出库单号", "CKD");

                var cgDetailList = SelectCgByTotalQty(model);
                var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);

                if (cgDetailList.Count == 0) {
                    info = "没有合适的物料可以出库";
@@ -1056,14 +1268,14 @@
            }
        }

        public static List<TN_CG_Detail> SelectCgByTotalQty(FinishedOutboundInfo model) {
        public static List<TN_CG_Detail> SelectCgByTotalQty(int qty, string itemCode, string batchNo, string cntrType = "", bool forcedOut = true) {
            var db = new SqlHelper<object>().GetInstance();
            var result = new List<TN_CG_Detail>();
            var targetNum = model.Qty;
            var targetNum = qty;
            var info = "";
            try {
                var targetCg = db.Queryable<TN_CG_Detail>()
                    .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
                    .Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
                    .Where(a => a.N_ITEM_NUM > targetNum)
                    .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
                if (targetCg != null) //刚好有一行满足条件
@@ -1076,10 +1288,18 @@

                var sortedMaterials = new List<TN_CG_Detail>();

                if (model.ForcedOut) {
                var cntrTypeList = new List<string>();
                if (cntrType == "") {
                    cntrTypeList = new List<string> { "托盘", "好运箱" }; // 不指定托盘类型，二者均可
                }
                else {
                    cntrTypeList.Add(cntrType);
                }

                if (forcedOut) {
                    sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
                    .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
                    .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
                    .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
                    .Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格"
                             || d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检")
                    .OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
@@ -1087,13 +1307,12 @@
                }
                else {
                    sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
                    .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
                    .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
                    .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
                    .Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格")
                    .OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
                    .OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
                }


                if (sortedMaterials.Count == 0) //没有满足条件的
                {
@@ -1130,45 +1349,82 @@
        }

        /// <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 {
                if (string.IsNullOrEmpty(model.ItemCode)) {
                    info = $"博实下发物料信息：参数不合法：物料编码（itemCode）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }
                if (string.IsNullOrEmpty(model.CntrCode)) {
                    info = $"博实下发物料信息：参数不合法：容器编码（CntrCode）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }
                if (string.IsNullOrEmpty(model.BatchNo)) {
                    info = $"博实下发物料信息：参数不合法：批次号（BatchNo）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }
                if (model.ItemNum <= 0) {
                    info = $"博实下发物料信息：参数不合法：货品数量（ItemNum）应该大于 0";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }

                // TEMP 目前流程：对博实下发的信息也进行检查，未找到就报错，后面有需求再更改
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言，S_CODE就是主键，维护时必定唯一
                    .First();

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

                // 将下发的信息先存储到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_BATCH_NO = model.BatchNo,
                    S_ITEM_CODE = model.ItemCode, // NOT NULL
                    S_ITEM_NAME = model.ItemName, 
                    S_CNTR_CODE = model.CntrCode, // NOT NULL 料箱编号（待定，现在暂时设定为博实下发）
                    S_BATCH_NO = model.BatchNo,   // NOT NULL
                    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) {
                        tran.RollbackTran();
                        info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
                        return NewMesResult(2, info);
                        return NewMesResult(500, info);
                    }

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

                    tran.CommitTran();
                }
@@ -1179,30 +1435,82 @@
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewMesResult(1, info);
                return NewMesResult(-1, info);
            }
        }

        public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
        public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var orderNo = GenerateOrderNo("出库单号", "ON");
            var orderNo = GenerateOrderNo("出库单号", "CKD");
            var info = "";
            try {
                if (string.IsNullOrEmpty(orderNo)) {
                    info = "出库单号不能为空";
                // 参数合法性确认部分：错误编码：400
                if (model.pzsl <= 0) {
                    info = $"物料数量(pzsl){model.pzsl}不合法：物料数量应该大于 0";
                    LogHelper.Info(info);
                    return NewErpResult(2, info);
                    return NewErpResult(400, 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
                });
                var outboundPlan = new TN_Outbound_Plan {
                    JHDH = model.jhdh, // 计划单号（唯一标识）
                    CKZT = model.ckzt, // 出库状态
                    JHLB = model.jhlb, // 计划类别
                    CKDH = model.ckdh, // 参考单号
                    CPH = model.cph, // 车牌号
                    YSFS = model.ysfs, // 运输方式
                    CPZT = model.cpzt, // 产品状态
                    MDDW = model.mddw, // 买断单位
                    CPDM = model.cpdm, // 产品代码
                    CPLB = model.cplb, // 产品类别
                    CPLBMX = model.cplbmx, // 产品类别明细
                    PP = model.pp, // 品牌
                    DJ = model.dj, // 等级
                    GH = model.gh, // 罐号
                    PH = model.ph, // 批号
                    BZLX = model.bzlx, // 包装类型
                    PZDH = model.pzdh, // 派装单号
                    PZD_DW = model.pzd_dw, // 派装单单位
                    PZD_DYBH = model.pzd_dybh, // 派装单调运编号
                    PZJS = model.pzjs, // 派装件数
                    PZSL = model.pzsl, // 派装数量
                    PZ_RQ = model.pz_rq, // 派装日期(yyyy-mm-dd)
                    PZ_CZRQ = model.pz_czrq, // 派装操作日期
                    PZ_ZFBJ = model.pz_zfbj, // 派装作废标记
                    PZ_ZFRQ = model.pz_zfrq, // 派装作废日期
                    PZ_BZ = model.pz_bz, // 派装备注
                    CKDBH = model.ckdbh, // 出库单编号
                    SFJS = model.sfjs, // 实发件数
                    SFSL = model.sfsl, // 实发数量
                    SFCS = model.sfcs, // 实发车数
                    ZCSJ = model.zcsj, // 装车时间
                    JLDW = model.jldw, // 计量单位
                    FHRQ = model.fhrq, // 发货日期
                    CKDM = model.ckdm, // 仓库代码
                    FHR = model.fhr, // 发货人
                    CZYDM = model.czydm, // 操作员
                    SHR_USERNAME = model.shr_username, // 审核人
                    SHRQ = model.shrq, // 审核日期
                    ZFBJ = model.zfbj, // 作废标记
                    ZFRQ = model.zfrq, // 作废日期
                    JSDW = model.jsdw, // 结算单位
                    SHDW = model.shdw, // 收货单位
                    YSDW = model.ysdw, // 运输单位
                    LXR = model.lxr, // 联系人
                    RY_ZXG = model.ry_zxg, // 装卸工
                    RY_CCSJ = model.ry_ccsj, // 叉车司机
                    ERPHX_JHDH = model.erphx_jhdh, // erp交货单号
                    ERPHX_WLBM = model.erphx_wlbm, // erp物料编码
                    ERPHX_WLMC = model.erphx_wlmc, // erp物料名称
                    ERPHX_CJRQ = model.erphx_cjrq, // erp创建日期
                    HW = model.hw, // 货位
                    HWZT = model.hwzt // 货位状态
                };

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

                if (cgDetailList.Count == 0) {
                    info = "没有合适的物料可以出库";
@@ -1212,12 +1520,12 @@

                var order = new TN_Outbound_Order {
                    S_NO = orderNo,
                    S_ITEM_CODE = model.ItemCode,
                    S_BATCH = model.BatchNo,
                    N_END_NUM = model.Qty,
                    S_ITEM_CODE = model.cpdm,
                    S_BATCH = model.ph,
                    N_END_NUM = (int)model.pzsl,
                    //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                    S_END_AREA = model.EndArea,
                    S_BS_NO = model.ErpNo,
                    S_END_AREA = model.ysfs == "汽车" ? "QCCKQ" : "HCCKQ", // 暂时用运输方式（火车/汽车）来区分终点货区
                    S_BS_NO = model.jhdh,
                    S_BS_TYPE = "ERP",
                };

@@ -1229,7 +1537,9 @@
                        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
                        S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
                        S_BS_NO = order.S_BS_NO,
                        S_BS_TYPE= order.S_BS_TYPE,
                    };
                    detailList.Add(detail);
                }
@@ -1249,6 +1559,13 @@
                        return NewErpResult(4, info);
                    }

                    if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "生成出库单计划记录表失败";
                        LogHelper.Info(info);
                        return NewErpResult(500, info);
                    }

                    tran.CommitTran();
                }