删除有问题的TCP旧代码, 优化事务处理和ERP数据模型

kazelee

8 天以前 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6

 api/ApiHelper.cs

@@ -1,19 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;

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

using Newtonsoft.Json;

using SqlSugar;

using Swashbuckle.Swagger;

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

@@ -29,7 +21,7 @@
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.M满箱下线入库.Info();
            var tInfo = ETask.M满箱下线入库.Info();
            const string preLog = "API:满箱下线入库:";
            const string cntrType = "好运箱";

@@ -39,7 +31,7 @@
                }

                // 检查货品容器表:是否已经存在贴标机传递的待入库物料信息
                // TODO:数量,规格是否也参与比对？
                // QES:数量,规格是否也参与比对?
                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo 
                             && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检").First();
@@ -48,23 +40,28 @@
                        $"请检查:PDA扫码物料信息与贴标机传递的信息是否一致!!");
                }

                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, taskInfo.StartAreas)).First();
                // 查询起点货位(绑定前)
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, tInfo.StartAreas)).First();
                if (startLoc == null) {
                    return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, taskInfo.StartAreas));
                    return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, tInfo.StartAreas));
                }

                // 和满托下线入库的逻辑一致,由于容器移动不会更改绑定信息,所以必须删除旧数据
                WMSHelper.FindCntrOldInfo(obj, cgDetail.S_CNTR_CODE, skipCgDetail: true);
                WMSHelper.FindOldCntrInfo(obj, cgDetail.S_CNTR_CODE, skipCgDetail: true);

                // 绑定货位容器
                var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, cgDetail.S_CNTR_CODE, cntrType);

                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: taskInfo.EndAreas))
                // 查询终点货位
                // Order:优先选择低层货架
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas))
                    .OrderBy(l => new { l.N_LAYER }).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
                }

                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
                // 起点终点上锁,创建任务
                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
@@ -81,49 +78,42 @@
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.K空托入库.Info();
            var tInfo = ETask.K空托入库.Info();
            const string preLog = "API:空托入库:";
            const string cntrType = "托盘";

            try {
                // 查询起点货位:数量=0
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, taskInfo.StartAreas)).First();
                if (startLoc == null) {
                    return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, taskInfo.StartAreas));
                }

                // 查询容器表:容器类型字段
                (ok, msg) = WMSHelper.CheckCntrType(model.CntrCode, cntrType, out var cntr);
                if (!ok) {
                    return NewSimpleResult(3, preLog + msg);
                    return NewSimpleResult(1, preLog + msg);
                }

                // 查询起点货位(绑定前)
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, tInfo.StartAreas)).First();
                if (startLoc == null) {
                    return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, tInfo.StartAreas));
                }
                
                // 空箱入库时,如果存在旧的绑定数据,删除
                var old = WCSHelper.GetLocCntrCg(model.CntrCode);
                WMSHelper.FindOldCntrInfo(obj, model.CntrCode);

                // 绑定货位容器
                var locCntrRel = WCSHelper.BindLocCntr(startLoc, cntr.S_CODE);
                locCntrRel.S_CNTR_TYPE = cntrType;
                var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, cntr.S_CODE, cntrType);

                // 查询终点货位
                // Order:层数从低到高,行,列
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: taskInfo.EndAreas))
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas))
                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
                }

                // 起点终点上锁,创建任务
                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    Old = old,
                    New = new LocCntrCg { LocCntrRel = locCntrRel },
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -138,44 +128,39 @@
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.K空箱入库.Info();
            var tInfo = ETask.K空箱入库.Info();
            const string preLog = "API:空箱入库:";
            const string cntrType = "好运箱";

            try {
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, taskInfo.StartAreas)).First();
                // 查询起点货位(绑定前)
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, tInfo.StartAreas)).First();
                if (startLoc == null) {
                    return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, taskInfo.StartAreas));
                    return NewSimpleResult(1, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, tInfo.StartAreas));
                }

                // 查询容器表:容器类型字段
                (ok, msg) = WMSHelper.CheckCntrType(model.CntrCode, cntrType, out var cntr);
                if (!ok) {
                    return NewSimpleResult(3, preLog + msg);
                    return NewSimpleResult(2, preLog + msg);
                }

                // 空箱入库时,如果存在旧的绑定数据,删除
                var old = WCSHelper.GetLocCntrCg(model.CntrCode);
                WMSHelper.FindOldCntrInfo(obj, model.CntrCode);

                var locCntrRel = WCSHelper.BindLocCntr(startLoc, model.CntrCode);
                locCntrRel.S_CNTR_TYPE = cntrType;
                var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, model.CntrCode, cntrType);

                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: taskInfo.EndAreas))
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas))
                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
                }

                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    Old = old,
                    New = new LocCntrCg { LocCntrRel = locCntrRel },
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                // 起点终点上锁,创建任务
                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -191,8 +176,9 @@
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.K空托上线出库.Info();
            var tInfo = ETask.K空托上线出库.Info();
            const string preLog = "API:空托上线出库:";
            const string cntrType = "托盘";

@@ -203,11 +189,11 @@
                    return NewSimpleResult(1, preLog + msg);
                }

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

                    // 目前流程:如果容器表中规格 (物料编码) 为空,根据流程的物料信息写入
                    // TEMP:后面可能会更改流程,或者用其他信息 (如物料类型/规格) 作为容器的规格
                    needUpdateContainer = true;
                    cntr.S_SPEC = model.ItemCode;
                    LogHelper.Info($"容器'{model.CntId}'在[容器表]中[规格(物料编码)]为空,将物料编码'{model.ItemCode}'写入容器的规格");
@@ -216,30 +202,29 @@
                    return NewSimpleResult(3, $"容器'{model.CntId}'已经与物料类型'{cntr.S_SPEC}'绑定,无法用于装载物料'{model.ItemCode}'!");
                }

                // 查询起点货位
                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where(DbExpr.StartLoc(areas: taskInfo.StartAreas))
                    .Where(DbExpr.StartLoc(areas: tInfo.StartAreas))
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
                if (startLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.StartLocNotFound(areas: taskInfo.StartAreas) +
                    return NewSimpleResult(3, preLog + LogMsg.StartLocNotFound(areas: tInfo.StartAreas) +
                        $"绑定容器编码='{model.CntId}';绑定容器类型='{cntrType}';");
                }

                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: taskInfo.EndAreas)).First();
                // 查询终点货位
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas)).First();
                if (endLoc == null) {
                    return NewSimpleResult(5, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
                    return NewSimpleResult(5, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
                }

                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, model.CntId, taskInfo.TaskName);
                // 起点终点上锁,创建任务
                var task = WMSHelper.CreateTask(obj, startLoc, endLoc, model.CntId, tInfo.TaskName);

                cntr.S_SOURCE = task.S_CODE; // 用任务号作为容器更新的依据
                cntr.T_MODIFY = DateTime.Now;
                obj.ContainerToUpdate = needUpdateContainer ? cntr : null; // 如果需要更新[容器表]规格,写入obj

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    ContainerToUpdate = needUpdateContainer ? cntr : null,
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -255,8 +240,9 @@
        public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.K空箱上线出库.Info();
            var tInfo = ETask.K空箱上线出库.Info();
            const string preLog = "API:空箱上线出库:";
            const string cntrType = "好运箱";

@@ -268,26 +254,21 @@
                }

                var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                    .Where(DbExpr.StartLoc(areas: taskInfo.StartAreas))
                    .Where(DbExpr.StartLoc(areas: tInfo.StartAreas))
                    .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
                if (startLoc == null) {
                    return NewSimpleResult(2, preLog + preLog + LogMsg.StartLocNotFound(areas: taskInfo.StartAreas) +
                    return NewSimpleResult(2, preLog + preLog + LogMsg.StartLocNotFound(areas: tInfo.StartAreas) +
                        $"绑定容器编码='{model.CntId}';绑定容器类型='{cntrType}';");
                }

                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas)).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
                }

                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, model.CntId, taskInfo.TaskName);

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                // 起点终点上锁,创建任务
                WMSHelper.CreateTask(obj, startLoc, endLoc, model.CntId, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -303,45 +284,43 @@
        public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.C抽检合格回库.Info();
            const string preLog = "API:抽检合格回库";
            var tInfo = ETask.C抽检合格回库.Info();
            const string preLog = "API:抽检合格回库:";

            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 NewSimpleResult(2, preLog + LogMsg.CgDetailNotFound(item: model.ItemCode, cntr: model.CntrCode));
                    return NewSimpleResult(1, preLog + LogMsg.CgDetailNotFound(item: model.ItemCode, cntr: model.CntrCode));
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE).First();
                if (locCntrRel == null) {
                    return NewSimpleResult(3, preLog + LogMsg.LocCntrRelNotFound(cntr: cgDetail.S_CNTR_CODE));
                    return NewSimpleResult(2, preLog + LogMsg.LocCntrRelNotFound(cntr: cgDetail.S_CNTR_CODE));
                }

                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCntrRel.S_LOC_CODE, taskInfo.StartAreas)).First();
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCntrRel.S_LOC_CODE, tInfo.StartAreas)).First();
                if (startLoc == null) {
                    return NewSimpleResult(4, preLog + LogMsg.StartLocNotFound(locCntrRel.S_LOC_CODE, taskInfo.StartAreas));
                    return NewSimpleResult(3, preLog + LogMsg.StartLocNotFound(locCntrRel.S_LOC_CODE, tInfo.StartAreas));
                }

                var endAreas = locCntrRel.S_CNTR_CODE == "托盘" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
                var endAreas = locCntrRel.S_CNTR_CODE == "托盘" ? tInfo.EndAreas_Pallet : tInfo.EndAreas_Goodpack;
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: endAreas)).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: endAreas));
                    return NewSimpleResult(4, preLog + LogMsg.EndLocNotFound(areas: endAreas));
                }

                //修改物料状态为[合格]
                cgDetail.N_ITEM_STATE = 0;
                cgDetail.S_ITEM_STATE = "合格";
                cgDetail.T_MODIFY = DateTime.Now;
                obj.CgDetailToUpdate = cgDetail;

                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    CgDetailToUpdate = cgDetail,
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                // 起点终点上锁,创建任务
                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -357,13 +336,14 @@
        public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.C抽检不合格移库.Info();
            var tInfo = ETask.C抽检不合格移库.Info();
            const string preLog = "API:抽检不合格移库:";

            try {
                if (!taskInfo.EndAreas.Contains(model.EndArea)) {
                    return NewSimpleResult(1, preLog + $"终点库区'{model.EndArea}'不满足条件!需要:货区={LogObject(taskInfo.EndAreas)}");
                if (!tInfo.EndAreas.Contains(model.EndArea)) {
                    return NewSimpleResult(1, preLog + $"终点库区'{model.EndArea}'不满足条件!需要:货区={LogObject(tInfo.EndAreas)}");
                }

                var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -377,27 +357,24 @@
                    return NewSimpleResult(3, preLog + LogMsg.LocCntrRelNotFound(cntr: cgDetail.S_CNTR_CODE));
                }

                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCntrRel.S_LOC_CODE, taskInfo.StartAreas)).First();
                var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCntrRel.S_LOC_CODE, tInfo.StartAreas)).First();
                if (startLoc == null) {
                    return NewSimpleResult(1, preLog + LogMsg.StartLocNotFound(locCntrRel.S_LOC_CODE, taskInfo.StartAreas));
                    return NewSimpleResult(4, preLog + LogMsg.StartLocNotFound(locCntrRel.S_LOC_CODE, tInfo.StartAreas));
                }

                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: new List<string> { model.EndArea })).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: new List<string> { model.EndArea }));
                    return NewSimpleResult(5, preLog + LogMsg.EndLocNotFound(areas: new List<string> { model.EndArea }));
                }

                cgDetail.N_ITEM_STATE = 2;
                cgDetail.S_ITEM_STATE = "不合格";
                cgDetail.T_MODIFY = DateTime.Now;
                obj.CgDetailToUpdate = cgDetail;

                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    CgDetailToUpdate = cgDetail,
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                // 起点终点上锁,创建任务
                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -413,8 +390,9 @@
        public static SimpleResult RestBack(RestBackInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);
            var obj = new CreateTaskObj();

            var taskInfo = ETask.W尾料回库.Info();
            var tInfo = ETask.W尾料回库.Info();
            const string preLog = "API:尾料回库:";
            
            try {
@@ -428,19 +406,15 @@
                    return NewSimpleResult(3, preLog + LogMsg.LocCntrRelNotFound(loc: model.StartLoc));
                }

                var endAreas = locCntrRel.S_CNTR_CODE == "托盘" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
                var endAreas = locCntrRel.S_CNTR_CODE == "托盘" ? tInfo.EndAreas_Pallet : tInfo.EndAreas_Goodpack;
                var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: endAreas)).First();
                if (endLoc == null) {
                    return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: endAreas));
                }

                var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);

                (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
                    StartLocToUpdate = startLoc,
                    EndLocToUpdate = endLoc,
                    TaskToInsert = task,
                });
                // 起点终点上锁,创建任务
                WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
                (ok, msg) = DbTran.CreateTask(obj);
                return NewSimpleResult(ok ? 0 : 500, preLog + msg);
            }
            catch (Exception ex) {
@@ -449,7 +423,20 @@
        }

        /// <summary>
        /// 成品胶出库(PDA) 待定,暂时不需要此功能
        /// 生成出库单号,私有
        /// </summary>
        /// <param name="snType"></param>
        /// <param name="prefix"></param>
        /// <returns></returns>
        private static string GenerateOrderNo(string snType, string prefix) {
            //var id = SYSHelper.GetSerialNumberResetByDay(snType, prefix);
            //var date = DateTime.Now.ToString("yyMMdd");
            //return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
            return SYSHelper.GenerateSN(snType, prefix, "yyMMdd");
        }

        /// <summary>
        /// 成品胶出库(搁置)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -457,7 +444,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var (ok, msg) = (false, string.Empty);

            var taskInfo = ETask.C成品胶出库.Info();
            var tInfo = ETask.C成品胶出库.Info();
            const string preLog = "API:成品胶出库:";

            try {
@@ -555,12 +542,12 @@
                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable(order).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(2, preLog + "生成出库单失败:" + LogObject(order));
                        return NewSimpleResult(500, preLog + "生成出库单失败:" + LogObject(order));
                    }

                    if (db.Insertable(detailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(4, preLog + "生成出库单明细失败:" + LogObject(detailList));
                        return NewSimpleResult(500, preLog + "生成出库单明细失败:" + LogObject(detailList));
                    }

                    tran.CommitTran();
@@ -588,7 +575,7 @@
                    return result;
                }

                // NOTE 根据总量选detail时,是否需要考虑货位的高低？
                // NOTE 根据总量选detail时,是否需要考虑货位的高低?

                var sortedMaterials = new List<TN_CG_Detail>();

@@ -645,12 +632,7 @@
            }
        }

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

        /// <summary>
        /// 博实物料信息下发同步 (只针对好运箱) 
@@ -715,157 +697,6 @@
            }
            catch (Exception ex) {
                return NewMesResult(-1, preLog + $"发生了异常:{ex.Message}\n\n{ex.StackTrace}\n");
            }
        }

        public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var orderNo = GenerateOrderNo("出库单号", "CKD");
            const string preLog = "API:ERP下发出库计划单:";
            try {
                if (model.pzjs <= 0) {
                    return NewErpResult(400, preLog + $"物料数量(pzjs)'{model.pzjs}'不合法!要求:物料数量＞0");
                }

                var outboundPlan = db.Queryable<TN_Outbound_Plan>()
                    .Where(p => p.JHDH == model.jhdh).First();
                if (outboundPlan != null) {
                    return NewErpResult(1, preLog + $"计划单号'{model.jhdh}'已在[出库计划单]中存在!");
                }

                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 = "没有合适的物料可以出库";
                //    LogHelper.Info(info);
                //    return NewErpResult(3, info);
                //}

                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.cpdm && d.N_ITEM_NUM >= model.pzjs).First();
                if (cgDetail == null ) {
                    return NewErpResult(2, preLog + $"在[货品明细表]中没有找到合适的物料!要求:物料编码='{model.cpdm}',物料数量>={model.pzjs}");
                }

                var order = new TN_Outbound_Order {
                    S_NO = orderNo,
                    //S_ITEM_CODE = model.cpdm,
                    //S_BATCH = model.ph,
                    //N_END_NUM = (int)model.pzsl,
                    S_ITEM_CODE = model.cpdm,
                    S_BATCH = cgDetail.S_BATCH_NO,
                    N_END_NUM = (int)model.pzjs,
                    S_END_AREA = "QCCKQ", // ERP下发出库任务为汽车出库区
                    S_BS_NO = model.jhdh,
                    S_BS_TYPE = "ERP",
                };

                var detailList = new List<TN_Outbound_Detail>();
                //foreach (var cgDetail in cgDetailList) {
                //    var detail = new TN_Outbound_Detail {
                //        S_OO_NO = orderNo,
                //        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                //        S_BATCH_NO = cgDetail.S_BATCH_NO,
                //        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                //        N_COUNT = cgDetail.N_ITEM_NUM,
                //        S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
                //        S_BS_NO = order.S_BS_NO,
                //        S_BS_TYPE= order.S_BS_TYPE,
                //    };
                //    detailList.Add(detail);
                //}
                var detail = new TN_Outbound_Detail {
                    S_OO_NO = orderNo,
                    S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                    S_BATCH_NO = cgDetail.S_BATCH_NO,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    N_COUNT = cgDetail.N_ITEM_NUM,
                    S_END_AREA = order.S_END_AREA, // order为detail的每一个货位设置终点值
                    S_BS_NO = order.S_BS_NO,
                    S_BS_TYPE = order.S_BS_TYPE,
                };
                detailList.Add(detail);

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable(order).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewErpResult(500, preLog + $"生成[出库单]失败!数据:{LogObject(order)}");
                    }

                    if (db.Insertable(detailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewErpResult(500, preLog + $"生成[出库单明细]失败!数据:{LogObject(detailList)}");
                    }

                    if (db.Insertable(outboundPlan).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewErpResult(500, preLog + $"生成[出库单计划记录表]失败!数据:{LogObject(outboundPlan)}");
                    }

                    tran.CommitTran();
                    return NewErpResult(0, preLog + $"生成[出库单]成功!出库单:{LogObject(order)}\n出库单明细:{LogObject(detail)}");
                }
            }
            catch (Exception ex) {
                return NewErpResult(1, preLog + $"发生了异常:{ex.Message}\n\n{ex.StackTrace}\n");
            }
        }