完善ERP下发信息的处理和出库单生成流程

kazelee

2025-06-10 570a2d760cc1f2b78922d91d941ef81f01199e4c

 api/ApiHelper.cs

@@ -32,6 +32,13 @@
            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>()
@@ -70,21 +77,44 @@
                    S_CNTR_TYPE = "好运箱",
                };

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

                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = locCntrRel.S_CNTR_CODE,
                        S_SPEC = cgDetail.S_ITEM_CODE, // 登记容器对应的物料编号 
                        S_TYPE = "料箱", // 容器类型：料箱（好运箱）
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果容器存在，但没有类型或没有适用的物料编号，需要更新，并将容器来源设置为任务名称
                    if (string.IsNullOrEmpty(cntr.S_TYPE)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有类型，" +
                            $"更新类型为：料箱，并设置容器来源为：{taskName}");

                        cntr.S_TYPE = "料箱"; // 容器类型：料箱（好运箱）
                        cntr.S_SOURCE = taskName;
                    }
                    if (string.IsNullOrEmpty(cntr.S_SPEC)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有适用物料编码，" +
                            $"更新物料编码为：{cgDetail.S_ITEM_CODE}，并设置容器来源为：{taskName}");

                        cntr.S_SPEC = cgDetail.S_ITEM_CODE; // 规格：物料编号
                        cntr.S_SOURCE = taskName;
                    }
                }
                
                // TODO 满箱入库算法待优化
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
@@ -99,20 +129,29 @@
                    return NewSimpleResult(4, info);
                }

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

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

                // 数据库操作事务部分：错误编码：500
                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                    if (needInsertContainer) {
                        if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }
                    else if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
                        }
                    }

@@ -120,7 +159,7 @@
                        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 {
@@ -133,7 +172,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 {
@@ -145,14 +184,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();
@@ -175,7 +214,7 @@
        /// 人工将空托盘通过接驳位入库，需要新绑定容器货位<br/>
        /// 由于空托盘一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <param name="model"></param>
        /// <param name="model">包含：起点货位、容器号、容器类型、终点货区</param>
        /// <returns></returns>
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
@@ -225,19 +264,34 @@
                    S_CNTR_TYPE = "托盘",
                };

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

                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = locCntrRel.S_CNTR_CODE,
                        S_SPEC = "", // 空托，物料编码先设置为空
                        S_TYPE = locCntrRel.S_CNTR_TYPE, // 容器类型：托盘
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果容器存在，但没有类型或没有适用的物料编号，需要更新，并将容器来源设置为任务名称
                    if (string.IsNullOrEmpty(cntr.S_TYPE)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有类型，" +
                            $"更新类型为：托盘，并设置容器来源为：{taskName}");

                        cntr.S_TYPE = "托盘"; // 容器类型：托盘
                    }
                    // 空托不更新物料编码
                }

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

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

@@ -403,19 +465,34 @@
                    S_CNTR_TYPE = "好运箱",
                };

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

                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = locCntrRel.S_CNTR_CODE,
                        S_SPEC = "", // 空箱，物料编码先设置为空
                        S_TYPE = locCntrRel.S_CNTR_TYPE, // 容器类型：料箱（好运箱）
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果容器存在，但没有类型或没有适用的物料编号，需要更新，并将容器来源设置为任务名称
                    if (string.IsNullOrEmpty(cntr.S_TYPE)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有类型，" +
                            $"更新类型为：料箱，并设置容器来源为：{taskName}");

                        cntr.S_TYPE = "料箱"; // 容器类型：料箱（好运箱）
                    }
                    // 空箱不更新物料编码
                }

                // TODO 暂定选择最低层顺序入库，后面待修改
@@ -439,12 +516,20 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

@@ -532,7 +617,7 @@
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model"></param>
        /// <param name="model">b包含：容器号、物料编码</param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var db = new SqlHelper<object>().GetInstance();
@@ -543,16 +628,24 @@
            var endAreaName = AreaName.B包装区;

            try {
                // 查容器-物料类型表
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "托盘")
                    .First();
                // 如果表中存在这个托盘信息，且物料类型与上线所需物料不符，报错
                // 查容器信息表是否已经有这个容器
                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}";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                if (cntr != null) { 
                    // 如果存在容器号，但类型不是托盘，报错
                    if (!string.IsNullOrEmpty(cntr.S_TYPE) && cntr.S_TYPE != "托盘") {
                        info = $"容器在容器表中找到，但类型是：{cntr.S_TYPE}，不是{taskName}所需的：托盘";
                        LogHelper.Info(info);
                        return NewSimpleResult(1, info);
                    }
                    // 如果表中物料编码不为空，且与上线所需物料不一致，报错
                    if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != model.ItemCode) {
                        info = $"容器{model.CntId}已经与物料类型{cntr.S_SPEC}绑定，无法用于装载物料{model.ItemCode}";
                        LogHelper.Info(info);
                        return NewSimpleResult(2, info);
                    }
                }

                var startLoc = db.Queryable<TN_Location>()
@@ -742,12 +835,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)
@@ -759,7 +860,7 @@
                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(4, info);
                }

                var endLoc = new TN_Location();
@@ -778,7 +879,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) {
@@ -880,6 +981,12 @@
                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)
@@ -1093,9 +1200,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 = "没有合适的物料可以出库";
@@ -1164,9 +1271,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 = "没有合适的物料可以出库";
@@ -1224,14 +1331,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) //刚好有一行满足条件
@@ -1244,10 +1351,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)
@@ -1255,13 +1370,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) //没有满足条件的
                {
@@ -1307,12 +1421,33 @@
            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);
                }

                // 将下发的信息先存储到CG表中（此时托盘没有与产线处的货位绑定）
                var detail = new TN_CG_Detail {
                    S_ITEM_CODE = model.ItemCode,
                    S_ITEM_NAME = model.ItemName,
                    S_CNTR_CODE = model.CntrCode, // 料箱编号（待定，现在暂时设定为博实下发）
                    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,
@@ -1335,7 +1470,7 @@
                    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
                        return NewMesResult(2, info);
                        return NewMesResult(500, info);
                    }

                    tran.CommitTran();
@@ -1351,26 +1486,78 @@
            }
        }

        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 = "没有合适的物料可以出库";
@@ -1380,12 +1567,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",
                };

@@ -1397,7 +1584,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);
                }
@@ -1417,6 +1606,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();
                }