博实物料下发同步接口开发，满箱入库、出库逻辑测试与优化

kazelee

2025-05-16 6abc355aeb4e6f7960c11795dbbcc26396b0c888

 Services/MoboxService.cs

@@ -13,49 +13,9 @@

using static HH.WCS.Mobox3.DSZSH.Dtos.Request.MoboxRequest;
using static HH.WCS.Mobox3.DSZSH.Dtos.Response.MoboxResponse;
using static HH.WCS.Mobox3.DSZSH.Helpers.ResultHelper;

namespace HH.WCS.Mobox3.DSZSH.Services {
    public class MoboxService {

        #region 模板功能
        public static SimpleResult BaseBound(StartCntEndInfo model) {
            var taskName = ""; // 用于生成任务类型、打印日志信息
            var db = DbHelper.GetDbClient();

            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.StartLoc))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty.Negate()).First();

                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 '{model.StartLoc}' 不存在或不具备取货要求");
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(ExprHelper.LocCntrIsBind(startLoc.S_CODE, model.CntId)).First();

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

                var endLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.EndLoc))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty).First();

                if (endLoc == null) {
                    return BuildSimpleResult(4, $"终点位置 '{model.EndLoc}' 不存在或不具备放货要求");
                }

                return TaskHelper.SimpleCreateTask(startLoc.S_CODE, locCntrRel.S_CNTR_CODE, endLoc.S_CODE, taskName);
            }
            catch (Exception ex) {
                return BuildSimpleEx(ex);
            }
        }
        #endregion

        #region PDA 功能
        /// <summary>
@@ -69,170 +29,185 @@
            var db = DbHelper.GetDbClient();

            try {
                // TODO 将PDA提供的物料编码与贴标机的信息比对
                // 将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待检
                    .First();

                var startLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.StartLoc))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty.Negate()).First();

                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 '{model.StartLoc}' 不存在或不具备取货要求");
                if (cgDetail == null) {
                    return BuildSimpleResult(2, $"PDA扫码物料信息与贴标机传递的信息不一致：" + JsonConvert.SerializeObject(model));
                }

                // 查看容器与起点货位是否绑定
                var locCntrRel = db.Queryable<TN_Loc_Container>().First(
                    a => a.S_LOC_CODE == model.StartLoc
                    && a.S_CNTR_CODE == model.CntId);
                if (locCntrRel == null) {
                    return BuildSimpleResult(3, $"起点位置 '{model.StartLoc}' 没有绑定容器 '{model.CntId}' ，无可出库的物料");
                var startLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.StartLoc)) // 指定：起点货位
                    .Where(ExprHelper.LocIsFree)
                    //.Where(ExprHelper.LocIsEmpty)
                    .First();

                if (startLoc == null) {
                    return BuildSimpleResult(3, $"起点位置 '{model.StartLoc}' 不存在或不具备取货要求");
                }

                // 绑定货位和容器号
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = model.StartLoc,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    S_CNTR_TYPE = "好运箱",
                };

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

                // TODO 满箱入库算法待优化
                var endLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocBelongsToArea(AreaName.满箱存放区))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty)
                    .OrderBy(l => l.N_LAYER)
                    .OrderBy(l => l.S_AREA_CODE).First();

                if (endLoc == null) {
                    return BuildSimpleResult(4, "满箱入库暂时没有合适的货位可以入库");
                    return BuildSimpleResult(5, "满箱入库暂时没有合适的货位可以入库");
                }

                return TaskHelper.SimpleCreateTask(startLoc.S_CODE, locCntrRel.S_CNTR_CODE, endLoc.S_CODE, taskName);
                return TaskHelper.SimpleCreateTask(startLoc.S_CODE, locCntrRel.S_CNTR_CODE, endLoc.S_CODE, taskName, failCode: 6);
            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
            }
        }

        /// <summary>
        /// 空托盘绑定(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult EmptyBindPallet(EmptyBindInfo model) {
            var db = DbHelper.GetDbClient();
        ///// <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();
        //    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}' 无法再绑定容器");
                }
        //        if (loc == null) {
        //            return BuildSimpleResult(2, $"当前货位 '{model.LocCode}' 无法再绑定容器");
        //        }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();
        //        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}' 绑定");
                }
        //        if (locCntrRel != null) {
        //            return BuildSimpleResult(3, $"当前容器 '{model.CntrCode}' 已经与 '{locCntrRel.S_LOC_CODE}' 绑定");
        //        }

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

                locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = model.LocCode,
                    S_CNTR_CODE = model.CntrCode
                };
        //        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);
            }
        }
        //        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();
        ///// <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();
        //    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}' 无法再绑定容器");
                }
        //        if (loc == null) {
        //            return BuildSimpleResult(2, $"当前货位 '{model.LocCode}' 无法再绑定容器");
        //        }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();
        //        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}' 绑定");
                }
        //        if (locCntrRel != null) {
        //            return BuildSimpleResult(3, $"当前容器 '{model.CntrCode}' 已经与 '{locCntrRel.S_LOC_CODE}' 绑定");
        //        }

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

                locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = model.LocCode,
                    S_CNTR_CODE = model.CntrCode
                };
        //        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);
            }
        }
        //        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 EmptyInboundPallet(EmptyInboundDetailInfo model) {
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var taskName = TaskName.托盘_空托入库;
            var db = DbHelper.GetDbClient();

            try {


                var startLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.StartLoc))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty.Negate()).First();
                    .Where(ExprHelper.LocIsEmpty.Negate())
                    .First();

                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 '{model.StartLoc}' 不存在或不具备取货要求");
                }

                // 查看容器与起点货位是否绑定
                var locCntrRel = db.Queryable<TN_Loc_Container>().First(
                    a => a.S_LOC_CODE == model.StartLoc
                    && a.S_CNTR_CODE == model.CntId);
                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) {
                    return BuildSimpleResult(3, $"起点位置 '{model.StartLoc}' 没有绑定容器 '{model.CntId}'");
                    return BuildSimpleResult(3, $"起点位置 '{model.StartLoc}' 没有绑定容器 '{model.CntrCode}'");
                }

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
@@ -256,7 +231,7 @@
        /// 好运箱-空箱入库(PDA)
        /// </summary>
        /// <returns></returns>
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundDetailInfo model) {
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
            var taskName = TaskName.好运箱_空箱入库;
            var db = DbHelper.GetDbClient();

@@ -271,11 +246,12 @@
                }

                // 查看容器与起点货位是否绑定
                var locCntrRel = db.Queryable<TN_Loc_Container>().First(
                    a => a.S_LOC_CODE == model.StartLoc
                    && a.S_CNTR_CODE == model.CntId);
                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) {
                    return BuildSimpleResult(3, $"起点位置 '{model.StartLoc}' 没有绑定容器 '{model.CntId}'");
                    return BuildSimpleResult(3, $"起点位置 '{model.StartLoc}' 没有绑定容器 '{model.CntrCode}'");
                }

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
@@ -325,13 +301,13 @@
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.EndLoc))
                    .Where(ExprHelper.LocBelongsToArea(AreaName.包装区))
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty).First();

                if (endLoc == null) {
                    return BuildSimpleResult(4, $"终点位置 '{model.EndLoc}' 不存在或不具备放货要求");
                    return BuildSimpleResult(4, $"终点位置 不存在或不具备放货要求");
                }

                return TaskHelper.SimpleCreateTask(startLoc.S_CODE, locCntrRel.S_CNTR_CODE, endLoc.S_CODE, taskName);
@@ -371,13 +347,13 @@
                }

                var endLoc = db.Queryable<TN_Location>()
                    .Where(ExprHelper.LocCode(model.EndLoc))
                    .Where(ExprHelper.LocBelongsToArea(AreaName.包装区))
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
                    .Where(ExprHelper.LocIsFree)
                    .Where(ExprHelper.LocIsEmpty).First();

                if (endLoc == null) {
                    return BuildSimpleResult(4, $"终点位置 '{model.EndLoc}' 不存在或不具备放货要求");
                    return BuildSimpleResult(4, $"终点位置 不存在或不具备放货要求");
                }

                return TaskHelper.SimpleCreateTask(startLoc.S_CODE, locCntrRel.S_CNTR_CODE, endLoc.S_CODE, taskName);
@@ -399,11 +375,11 @@
                using (var tran = db.Ado.UseTran()) {

                    var order = new TN_Check_Order {
                        S_NO = model.No,
                        S_CG_ID = model.CgId,
                        S_ITEM_NAME = model.ItemName,
                        S_NO = GenerateOrderNo("抽检单号", "CN"),
                        S_ITEM_CODE = model.ItemCode,
                        //S_ITEM_NAME = model.ItemName,
                        S_BATCH_NO = model.BatchNo,
                        N_COUNT = model.N_QTY,
                        N_COUNT = model.Qty,
                        S_END_AREA = model.EndArea,
                    };

@@ -412,10 +388,10 @@
                        return BuildSimpleResult(2, "生成 抽检单 失败：" + JsonConvert.SerializeObject(order));
                    }

                    for (int i = 0; i < model.N_QTY; i++) {
                    for (int i = 0; i < model.Qty; i++) {
                        var detail = new TN_Check_Detail {
                            S_NO = model.No,
                            S_CG_ID = model.CgId,
                            S_NO = order.S_NO,
                            S_ITEM_CODE = model.ItemCode,
                            S_BATCH_NO = model.BatchNo,
                            S_END_AREA = model.EndArea
                        };
@@ -428,33 +404,37 @@

                    tran.CommitTran();
                }
                return BuildSimpleResult(0, $"创建 抽检单 成功：单号 {model.No}");
                return BuildSimpleResult(0, $"创建 抽检单 成功");
            }
            catch (Exception ex) {
                return BuildSimpleEx(ex);
            }
        }

        /// <summary>
        /// 抽检-合格回库(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var db = DbHelper.GetDbClient();
            try {

            try {
                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 BuildSimpleResult(2, "没有找到待回库的抽检物料");
                    return BuildSimpleResult(2, "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model));
                }

                cgDetail.N_ITEM_STATE = 0;
                cgDetail.S_ITEM_STATE = "合格";

                // TODO 不需要联立三个表
                var startLocCntrRel = db.Queryable<TN_Location, TN_Loc_Container>
                    ((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where(ExprHelper.LocIsFree)
                    .Select((l, c) => c)
                    .Where((l, c) => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE) // 指定容器号
                    .Where(ExprHelper.LocIsFree) // NOTE 检查
                    .Select((l, c) => c) // 筛选 Loc_Container
                    .First();

                if (startLocCntrRel == null) {
@@ -507,7 +487,6 @@
                cgDetail.N_ITEM_STATE = 2;
                cgDetail.S_ITEM_STATE = "不合格";

                // TODO 不需要联立三个表
                var startLocCntrRel = db.Queryable<TN_Location, TN_Loc_Container>
                    ((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where(ExprHelper.LocIsFree)
@@ -549,6 +528,34 @@
            }
        }

        public static SimpleResult RestBack(RestBackInfo model) {
            var db = DbHelper.GetDbClient();

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

                if (locCntrRel == null) {
                    return BuildSimpleResult(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();

                if (endLoc == null) {
                    return BuildSimpleResult(3, $"不存在合适的终点货位可以回库");
                }

                return TaskHelper.SimpleCreateTask(locCntrRel.S_LOC_CODE, locCntrRel.S_CNTR_CODE, endLoc.S_CODE, TaskName.尾箱回库);
            }
            catch (Exception ex) {

                return BuildSimpleEx(ex);
            }
        }

        #endregion

        #region Mobox 功能
@@ -584,6 +591,7 @@
                            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_QTY,
                            S_END_AREA = model.EndArea
                        };

@@ -596,9 +604,9 @@
                    var order = new TN_Outbound_Order {
                        S_NO = orderNo,
                        S_ITEM_CODE = model.ItemCode,
                        S_BATCH_NO = model.BatchNo,
                        F_QTY = model.Qty,
                        F_OUT_QTY = cgDetailList.Sum(a => a.F_QTY),
                        S_BATCH = model.BatchNo,
                        N_END_NUM = model.Qty,                        
                        //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                        S_END_AREA = model.EndArea
                    };

@@ -657,9 +665,9 @@
                    var order = new TN_Outbound_Order {
                        S_NO = orderNo,
                        S_ITEM_CODE = model.ItemCode,
                        S_BATCH_NO = model.BatchNo,
                        F_QTY = model.Qty,
                        F_OUT_QTY = cgDetailList.Sum(a => a.F_QTY),
                        S_BATCH = model.BatchNo,
                        N_END_NUM = model.Qty,
                        //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                        S_END_AREA = model.EndArea
                    };

@@ -685,8 +693,8 @@

            try {
                var targetCg = db.Queryable<TN_CG_Detail>().Where(a => a.S_ITEM_CODE == model.ItemCode
                && a.F_QTY > targetNum).
                OrderBy(a => a.F_QTY, OrderByType.Asc).First();
                && a.N_QTY > targetNum).
                OrderBy(a => a.N_QTY, OrderByType.Asc).First();
                if (targetCg != null) //刚好有一行满足条件
                {
                    result.Add(targetCg);
@@ -695,28 +703,28 @@

                // NOTE 根据总量选detail时，是否需要考虑货位的高低？
                var 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.F_QTY > 0)
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_QTY > 0)
                    .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
                    .Where(d => (model.ForcedOut && d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格")
                        || (!model.ForcedOut && (d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格"
                        || d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检")))
                    .OrderBy(d => d.F_QTY, OrderByType.Desc)
                    .OrderBy(d => d.N_QTY, OrderByType.Desc)
                    .OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();

                if (sortedMaterials.Count == 0)//没有满足条件的
                if (sortedMaterials.Count == 0) //没有满足条件的
                {
                    return result;
                }

                float countNum = 0;
                foreach (var mat in sortedMaterials) {
                    countNum += mat.F_QTY;
                    countNum += mat.N_QTY;
                    result.Add(mat);
                    if (countNum >= targetNum) {
                        break;
                    }
                }
                if (result.Sum(a => a.F_QTY) >= targetNum) {
                if (result.Sum(a => a.N_QTY) >= targetNum) {
                    return result;
                }
                else {
@@ -729,6 +737,64 @@
            }
        }

        /// <summary>
        /// 移库-创建移库任务(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
            var db = DbHelper.GetDbClient();
            try {
                var locCntrRelList = db.Queryable<TN_Loc_Container, TN_CG_Detail>((c, d) => c.S_CNTR_CODE == d.S_CNTR_CODE)
                    .Where((c, d) => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.ItemCode)
                    .ToList();

                if (locCntrRelList.Count == 0) {
                    return BuildSimpleResult(2, "没有找到待移库的物料");
                }

                // 绑定操作：插入出库单、所有的出库单明细
                using (var tran = db.Ado.UseTran()) {

                    var order = new TN_Shift_Order {
                        S_NO = GenerateOrderNo("移库单号", "SN"),
                        S_ITEM_CODE = model.ItemCode,
                        //S_ITEM_NAME = model.ItemName,
                        S_BATCH_NO = model.BatchNo,
                        N_COUNT = locCntrRelList.Count,
                        S_END_AREA = model.EndArea,
                    };

                    if (db.Insertable<TN_Shift_Order>(order).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(2, "生成 移库单 失败：" + JsonConvert.SerializeObject(order));
                    }

                    foreach (var locCntrRel in locCntrRelList) {
                        var detail = new TN_Shift_Detail {
                            S_NO = order.S_NO,
                            S_ITEM_CODE = model.ItemCode,
                            S_LOC_CODE = locCntrRel.S_LOC_CODE,
                            S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                            S_BATCH_NO = model.BatchNo,
                            S_END_AREA = model.EndArea
                        };

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

                    tran.CommitTran();
                }
                return BuildSimpleResult(0, $"创建 移库单 成功");
            }
            catch (Exception ex) {
                return BuildSimpleEx(ex);
            }
        }

        private static string GenerateOrderNo(string snType, string prefix) {
            var id = SysHelper.GetSerialNumber(snType, prefix);
            var date = DateTime.Now.ToString("yyMMdd");