根据业务重构库区，增加记录表，开始ERP下发反馈逻辑开发

kazelee

2025-05-28 de8cd5585ba690902333cf4ce9aa5dbc7eb9acf6

 api/ApiHelper.cs

@@ -9,6 +9,8 @@
using HH.WCS.Mobox3.DSZSH.wms;

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

using SqlSugar;

using Swashbuckle.Swagger;
@@ -26,14 +28,14 @@
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            var taskName = TaskName.好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息
            var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                // 将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 == "待检") // NOTE 冗余检查：物料状态应该为 1待检
                    .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检") // 新增物料，故物料状态应该为 1待检
                    .First();

                if (cgDetail == null) {
@@ -42,14 +44,17 @@
                    return NewSimpleResult(1, info);
                }

                // 起点货位绑定后，可以不立即设置N_CURRENT_NUM为1
                // 因为AGV取货后就会恢复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))
                    .First();

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

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

@@ -80,6 +85,21 @@

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

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -239,14 +259,16 @@
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var taskName = TaskName.托盘_空托入库;
            var taskName = TaskName.T托盘_空托入库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                // 现在PDA没有单独的绑定流程，绑定在入库时完成
                var startLoc = db.Queryable<TN_Location>()
                    .Where(a => a.S_CODE == model.StartLoc) // 指定：起点货位
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 1)
                    .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)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
@@ -256,22 +278,29 @@
                }

                // 查看容器与起点货位是否绑定
                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
                    .First();
                //var locCntrRel = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
                //    .First();

                if (locCntrRel == null) {
                    info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
                //if (locCntrRel == null) {
                //    info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}";
                //    LogHelper.Info(info);
                //    return NewSimpleResult(3, info);
                //}

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

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[AreaName.空托存放区].Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .OrderBy(l => l.N_LAYER)
                    .Where(l => Settings.AreaMap[AreaName.K空托存放区].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) })
                    .First();

                if (endLoc == null) {
@@ -287,6 +316,13 @@
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

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

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
@@ -336,14 +372,15 @@
        /// </summary>
        /// <returns></returns>
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
            var taskName = TaskName.好运箱_空箱入库;
            var taskName = TaskName.H好运箱_空箱入库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(a => a.S_CODE == model.StartLoc)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 1) // 筛选：有货货位
                    .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)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
@@ -353,21 +390,28 @@
                }

                // 查看容器与起点货位是否绑定
                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
                    .First();
                //var locCntrRel = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
                //    .First();

                if (locCntrRel == null) {
                    info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }
                //if (locCntrRel == null) {
                //    info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}";
                //    LogHelper.Info(info);
                //    return NewSimpleResult(3, info);
                //}

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
                // 绑定货位和容器号
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = model.StartLoc,
                    S_CNTR_CODE = model.CntrCode,
                    S_CNTR_TYPE = "好运箱",
                };

                // TODO 暂定选择最低层顺序入库，后面待修改
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[AreaName.空箱存放区].Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .Where(l => Settings.AreaMap[AreaName.K空箱货架区].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();

@@ -382,6 +426,13 @@
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

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

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
@@ -432,42 +483,72 @@
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var taskName = TaskName.托盘_空托上线;
            var taskName = TaskName.T托盘_空托上线;
            var db = new SqlHelper<object>().GetInstance();
            var taskInfo = Settings.TaskMap[taskName];
            var info = "";
            try {
                // TODO 符合物料信息的货位
                // 找符合物料信息的货位
                //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)
                    .First();

                if (cntrItemRel == null) {
                    info = $"容器{model.CntId}不符合物料{model.ItemCode}：没有在容器物料类型登记表中找到";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 1) // 筛选：有货货位
                    .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 => 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) {
                    return NewSimpleResult(2, $"没有合适的起点位置");
                }

                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}'");
                    info = $"在空托存放区中，找不到符合{model.ItemCode}物料，且编码为{model.CntId}的空托盘";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[AreaName.包装区].Contains(l.S_AREA_CODE))
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
                    //.Where(l => Settings.AreaMap[AreaName.B包装区].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 = locCntrRel.S_CNTR_CODE;
                var cntId = model.CntId;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
@@ -524,32 +605,34 @@
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
            var taskName = TaskName.好运箱_空箱上线;
            var taskName = TaskName.H好运箱_空箱上线;
            var db = new SqlHelper<object>().GetInstance();
            var taskInfo = Settings.TaskMap[taskName];
            var info = "";
            try {
                // TODO 符合物料信息的货位
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                    .Where(a => a.N_CURRENT_NUM == 1).First();
                    .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 => 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) {
                    return NewSimpleResult(2, $"没有合适的起点位置");
                    info = $"在空箱存放区中，找不到编码为{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);
                //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}'");
                }
                //if (locCntrRel == null) {
                //    return NewSimpleResult(3, $"起点位置 '{startLoc.S_CODE}' 没有绑定容器 '{model.CntId}'");
                //}

                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[AreaName.包装区].Contains(l.S_AREA_CODE))
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
                    .Where(l => Settings.AreaMap[AreaName.B包装区].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();
@@ -558,7 +641,7 @@
                    return NewSimpleResult(4, $"终点位置 不存在或不具备放货要求");
                }

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

                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
@@ -609,87 +692,14 @@
            }
        }

        /// <summary>
        /// 创建抽检单
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) {
            var billName = "抽检单";
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                var orderNo = GenerateOrderNo("抽检单号", "CN");

                var order = new TN_Check_Order {
                    S_NO = orderNo,
                    S_ITEM_CODE = model.ItemCode,
                    //S_ITEM_NAME = model.ItemName,
                    S_BATCH_NO = model.BatchNo,
                    N_COUNT = model.Qty,
                    S_END_AREA = model.EndArea,
                };

                var cgDetailList = SelectCgByTotalQty(model);
                if (cgDetailList.Count == 0) {
                    return NewSimpleResult(3, "没有合适的物料可以抽检");
                }

                var detailList = new List<TN_Check_Detail>();
                foreach (var cgDetail in cgDetailList) {
                    var detail = new TN_Check_Detail {
                        S_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,
                    };

                    detailList.Add(detail);

                    cgDetail.N_ITEM_STATE = 3;
                    cgDetail.S_ITEM_STATE = "抽验中";
                }

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

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

                    if (db.Updateable<TN_CG_Detail>(cgDetailList).UpdateColumns(it => new { 
                        it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"更新物料状态失败";

                    }

                    tran.CommitTran();
                }
                return NewSimpleResult(0, $"创建 抽检单 成功");
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
            }
        }
        
        /// <summary>
        /// 抽检-合格回库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var taskName = TaskName.抽检_合格回库;
            var taskName = TaskName.C抽检_合格回库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
@@ -715,6 +725,7 @@
                    .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)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
@@ -726,14 +737,14 @@
                var endLoc = new TN_Location();
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.满托存放区].Contains(l.S_AREA_CODE))
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位
                        .First();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.满箱存放区].Contains(l.S_AREA_CODE))
                        .Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0)
                        .First();
@@ -809,16 +820,23 @@
            }
        }
        public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var taskName = TaskName.抽检_不合格移库;
            var taskName = TaskName.C抽检_不合格移库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {

                if (!Settings.AreaMap[AreaName.C抽检异常区].Contains(model.EndArea)) {
                    info = $"终点库区{model.EndArea}不属于{AreaName.C抽检异常区}";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                }

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

                if (cgDetail == null) {

                    return NewSimpleResult(2, "没有找到待回库的抽检物料");
                }

@@ -836,6 +854,7 @@
                    .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)) // 起点货区符合任务要求
                    .First();

                if (startLoc == null) {
@@ -917,7 +936,7 @@
        }

        public static SimpleResult RestBack(RestBackInfo model) {
            var taskName = TaskName.尾箱回库;
            var taskName = TaskName.W尾箱回库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
@@ -935,9 +954,30 @@
                    return NewSimpleResult(2, $"起点货位 {model.StartLoc}");
                }

                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)
                    .First();
                var endLoc = new TN_Location();
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满托货架区].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                        .First();
                }
                else if (locCntrRel.S_CNTR_TYPE =="好运箱"){
                    endLoc = db.Queryable<TN_Location>()
                        .Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE))
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                        .First();
                }
                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();

                if (endLoc == null) {
                    return NewSimpleResult(3, $"不存在合适的终点货位可以回库");
@@ -991,56 +1031,6 @@
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
            }
        }

        public static List<TN_CG_Detail> SelectCgByTotalQty(CreateCheckOrderInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var result = new List<TN_CG_Detail>();
            var targetNum = model.Qty;

            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();
                if (targetCg != null) //刚好有一行满足条件
                {
                    result.Add(targetCg);
                    return result;
                }

                var sortedMaterials = new List<TN_CG_Detail>();

                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.N_ITEM_STATE == 1 && 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) //没有满足条件的
                {
                    return result;
                }

                int countNum = 0;
                foreach (var mat in sortedMaterials) {
                    countNum += mat.N_ITEM_NUM;
                    result.Add(mat);
                    if (countNum >= targetNum) {
                        break;
                    }
                }
                if (result.Sum(a => a.N_ITEM_NUM) >= targetNum) {
                    return result;
                }
                else {
                    result.Clear();
                    return result;
                }
            }
            catch (Exception ex) {
                throw ex;
            }
        }

@@ -1248,106 +1238,10 @@
            }
        }

        /// <summary>
        /// 移库-创建移库任务(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
            var billName = "抽检单";
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                var orderNo = GenerateOrderNo("抽检单号", "CN");

                var order = new TN_Check_Order {
                    S_NO = orderNo,
                    S_ITEM_CODE = model.ItemCode,
                    //S_ITEM_NAME = model.ItemName,
                    S_BATCH_NO = model.BatchNo,
                    //N_COUNT = model.Qty,
                    S_END_AREA = model.EndArea,
                };

                var cgDetailList = SelectShiftItem(model);
                if (cgDetailList.Count == 0) {
                    return NewSimpleResult(3, "没有符合要求的物料需要移库");
                }

                var detailList = new List<TN_Check_Detail>();
                foreach (var cgDetail in cgDetailList) {
                    var detail = new TN_Check_Detail {
                        S_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,
                    };

                    detailList.Add(detail);

                    cgDetail.N_ITEM_STATE = 3;
                    cgDetail.S_ITEM_STATE = "抽验中";
                }

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

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

                    if (db.Updateable<TN_CG_Detail>(cgDetailList).UpdateColumns(it => new { 
                        it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"更新物料状态失败";

                    }

                    tran.CommitTran();
                }
                return NewSimpleResult(0, $"创建 抽检单 成功");
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(1, info);
            }
        }

        public static List<TN_CG_Detail> SelectShiftItem(CreateShiftOrderInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var result = new List<TN_CG_Detail>();
            var info = "";
            try {
                var targetItemList = db.Queryable<TN_CG_Detail>()
                    .Where(a => a.S_ITEM_CODE == model.ItemCode)
                    .Where(a => a.S_BATCH_NO == model.BatchNo)
                    .Where(a => a.N_ITEM_STATE != 3 && a.S_ITEM_CODE != "抽检中")
                    .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc)
                    .ToList();

                return targetItemList;
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return result;
            }
        }

        private static string GenerateOrderNo(string snType, string prefix) {
            var id = SYSHelper.GetSerialNumber(snType, prefix);
            var date = DateTime.Now.ToString("yyMMdd");
            return $"ON{date}{id.ToString().PadLeft(4, '0')}";
            return $"{prefix}{date}{id.ToString().PadLeft(4, '0')}";
        }

        /// <summary>
@@ -1355,7 +1249,7 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static WmsResult CgInfoSync(CgInfoSyncInfo model) {
        public static MesResult CgInfoSync(CgInfoSyncInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var random = new Random();
            var info = "";
@@ -1382,7 +1276,7 @@
                    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
                        return NewWmsResult(2, info);
                        return NewMesResult(2, info);
                    }

                    //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -1395,12 +1289,26 @@
                }

                info = "插入物料信息成功";
                return NewWmsResult(0, info);
                return NewMesResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewWmsResult(1, info);
                return NewMesResult(1, info);
            }
        }

        public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                // TODO
                return NewErpResult(0, info);
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewErpResult(1, info);
            }
        }
    }