新增PDA搬送，线边空托到原材料上线口

杨张扬

4 天以前 c2d2f4eb78c54bdfdb6ffb0df5932751d538ed14

 api/ApiHelper.cs

@@ -123,10 +123,12 @@
        internal static SimpleResult PDAFullCheckIn(PDAFullCheckInfo model)
        {
            LogHelper.Info("触发API：PDA满托复检判断" + JsonConvert.SerializeObject(model), "API");
            var db = new SqlHelper<object>().GetInstance();

            var result = new SimpleResult();//返回结果
            try
            {
                var db = new SqlHelper<object>().GetInstance();

                var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.rfId);
                if (locCnt == null)
                {
@@ -161,15 +163,21 @@
                    cG_Detail.N_ITEM_STATE = 0;
                    cG_Detail.S_ITEM_STATE = "合格";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            Where(o => o.S_AREA_CODE == Settings.Areas[1] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                             && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 4)//技术合格回库
                else if (model.cgState == 4)//技术判定回库
                {
                    cG_Detail.N_ITEM_STATE = 4;
                    cG_Detail.S_ITEM_STATE = "技术合格";
                    cG_Detail.S_ITEM_STATE = "技术判定";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[8] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            Where(o => o.S_AREA_CODE == Settings.Areas[8] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                            && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 2)//不合格回炉
@@ -177,7 +185,10 @@
                    cG_Detail.N_ITEM_STATE = 2;
                    cG_Detail.S_ITEM_STATE = "不合格";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[8] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            Where(o => o.S_AREA_CODE == Settings.Areas[8] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                            && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 5)//混合也回库，通过点对点再发线边
@@ -185,13 +196,38 @@
                    cG_Detail.N_ITEM_STATE = 5;
                    cG_Detail.S_ITEM_STATE = "混合";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[2] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            Where(o => o.S_AREA_CODE == Settings.Areas[2] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                            && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 6)//一级料二级料回库
                {
                    cG_Detail.N_ITEM_STATE = 6;
                    cG_Detail.S_ITEM_STATE = "一级料";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[2] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                            && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 7)//一级料二级料回库
                {
                    cG_Detail.N_ITEM_STATE = 7;
                    cG_Detail.S_ITEM_STATE = "二级料";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[2] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                            && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else
                {
                    result.resultCode = 6;
                    result.resultMsg = $"物料状态只能为0、2、4、5，如果为其他值，则不处理，0合格，2不合格，4技术合格，5混合";
                    result.resultMsg = $"物料状态只能为0合格1待检2不合格，下线即待检，3过期，4技术判定，5混合，6一级料、7二级料，如果为其他值，则不处理";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -207,14 +243,20 @@

                var typeName = (model.cgState == 0) ? "人工复检回库" : "人工复检回炉";

                //创建人工拆盘出库任务
                //创建人工复检任务
                if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, typeName, 3, locCnt.S_CNTR_CODE,out string taskNo,cG_Detail.S_SPE))//创建搬送任务，起点终点容器
                {
                    LocationHelper.LockLoc(startLoc.S_CODE, 2);//起点出库锁，
                    LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁
                    LogHelper.Info($"生成{typeName}任务成功，容器号{locCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}");

                    db.Updateable<TN_CG_Detail>().UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
                    if( db.Updateable<TN_CG_Detail>(cG_Detail).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand() <= 0)
                    {
                        result.resultCode = 5;
                        result.resultMsg = $"更新容器{locCnt.S_CNTR_CODE}的货品明细失败";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }

                    Task task99 = Task.Run(() =>
                    {
@@ -283,6 +325,179 @@
        }

        /// <summary>
        /// 线边空托到原材料输送线
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult EmptyLineToLine(EmptyLineToLineInfo model)
        {
            LogHelper.Info("触发API：线边空托到原材料输送线" + JsonConvert.SerializeObject(model), "API");
            var result = new SimpleResult();//返回结果
            try
            {
                var db = new SqlHelper<object>().GetInstance();

                var startLoc = db.Queryable<TN_Location>().First(o => o.S_CODE == model.startLoc);
                if (startLoc == null)
                {
                    result.resultCode = 1;
                    result.resultMsg = $"数据库中未找到此货位：{model.startLoc}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                if (startLoc.N_CURRENT_NUM == 1 || db.Queryable<TN_Loc_Container>().Any(a=>a.S_LOC_CODE==model.startLoc))
                {
                    result.resultCode = 2;
                    result.resultMsg = $"此货位：{model.startLoc}，已绑定托盘";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                if (startLoc.N_LOCK_STATE != 0  || startLoc.S_LOCK_STATE != "无")
                {
                    result.resultCode = 3;
                    result.resultMsg = $"此货位：{model.startLoc}，已上锁";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                if (startLoc.C_ENABLE != "Y")
                {
                    result.resultCode = 4;
                    result.resultMsg = $"此货位：{model.startLoc}，未启用";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var startLocArea = Settings.Areas[13];
                if (startLoc.S_AREA_CODE != startLocArea)
                {
                    result.resultCode = 5;
                    result.resultMsg = $"此货位：{model.startLoc}，不属于线边空托区{startLocArea}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }


                var endLocIndex = Settings.LineSorting;
                var endLocLine = Settings.ProductionLines.FirstOrDefault(a => a.Sorting == endLocIndex);
                if (endLocLine == null)
                {
                    result.resultCode = 6;
                    result.resultMsg = $"配置文件中未找到序号为：{endLocIndex}的原材料产线的信息";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == endLocLine.PointIn);
                if (endLoc == null)
                {
                    result.resultCode = 7;
                    result.resultMsg = $"数据库中未找到原材料产线空托上线口：{endLocLine.PointIn}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var endLocArea = Settings.Areas[14];
                if (endLoc.S_AREA_CODE != endLocArea)
                {
                    result.resultCode = 8;
                    result.resultMsg = $"此货位：{endLoc.S_CODE}，不属于原材料产线空托区{endLocArea}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                if (endLoc.N_CURRENT_NUM == 1 || db.Queryable<TN_Loc_Container>().Any(a => a.S_LOC_CODE == endLocLine.PointIn))
                {
                    result.resultCode = 9;
                    result.resultMsg = $"此货位：{model.startLoc}，已绑定托盘";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                if (endLoc.N_LOCK_STATE != 0 || endLoc.S_LOCK_STATE != "无")
                {
                    result.resultCode = 10;
                    result.resultMsg = $"此货位：{model.startLoc}，已上锁";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                if (endLoc.C_ENABLE != "Y")
                {
                    result.resultCode = 11;
                    result.resultMsg = $"此货位：{model.startLoc}，未启用";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var Cnt = Guid.NewGuid().ToString("D");


                using (var trans = db.Ado.UseTran())
                {
                    startLoc.N_CURRENT_NUM = 1;
                    startLoc.N_LOCK_STATE = 2;
                    startLoc.S_LOCK_STATE = "出库锁";

                    endLoc.N_LOCK_STATE = 1;
                    endLoc.S_LOCK_STATE = "入库锁";

                    var locCnt = new TN_Loc_Container()
                    {
                        S_LOC_CODE = startLoc.S_CODE,
                        S_CNTR_CODE = Cnt,
                    };

                    var task = new TN_Task()
                    {
                        S_CODE = WCSHelper.GenerateTaskNo(),
                        S_START_AREA = startLoc.S_AREA_CODE,
                        S_END_AREA = endLoc.S_AREA_CODE,
                        S_START_LOC = startLoc.S_CODE,
                        S_END_LOC = endLoc.S_CODE,
                        S_TYPE = "线边空托上线",
                        N_PRIORITY = 3,
                        N_SCHEDULE_TYPE = 1,
                        N_B_STATE = 0,
                        S_B_STATE = "等待",
                        S_CNTR_CODE = Cnt,
                    };

                    if (
                        db.Updateable<TN_Location>(startLoc).UpdateColumns(it=>new {it.N_CURRENT_NUM,it.N_LOCK_STATE,it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
                        db.Updateable<TN_Location>(endLoc).UpdateColumns(it=>new {it.N_LOCK_STATE,it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
                        db.Insertable<TN_Loc_Container>(locCnt).ExecuteCommand() == 1 &&
                        db.Insertable<TN_Task>(task).ExecuteCommand() == 1
                        )
                    {
                        if (Settings.LineSorting < Settings.ProductionLines.Count - 1)
                        {
                            Settings.LineSorting++;
                        }
                        else
                        {
                            Settings.LineSorting = 0;
                        }


                        trans.CommitTran();
                        result.resultCode = 0;
                        result.resultMsg = $"创建 线边空托上线 任务成功，起点：{startLoc.S_CODE}，终点：{endLoc.S_CODE}";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }
                    else
                    {
                        trans.RollbackTran();
                        result.resultCode = 12;
                        result.resultMsg = $"创建 线边空托上线 任务失败，起点：{startLoc.S_CODE}，终点：{endLoc.S_CODE}";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }
                }
            }
            catch(Exception ex)
            {
                result.resultCode = -1;
                result.resultMsg = $"PDA满托复检判断，发生了异常：{ex.Message}";
                LogHelper.Info(result.resultMsg);
                return result;
            }
        }

        /// <summary>
        /// 人工次品回炉
        /// </summary>
        /// <param name="model"></param>
@@ -290,11 +505,13 @@
        internal static SimpleResult PDAReturnReset(PDAReturnResetInfo model)
        {
            LogHelper.Info("触发API：人工次品回炉" + JsonConvert.SerializeObject(model), "API");
            var db = new SqlHelper<object>().GetInstance();
         
            var result = new SimpleResult();//返回结果

            try
            {
                var db = new SqlHelper<object>().GetInstance();

                var startLoc  =  db.Queryable<TN_Location>().First(o => o.S_CODE == model.startLoc && o.N_CURRENT_NUM ==0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE=="无" && o.S_AREA_CODE == Settings.Areas[4]);
                if (startLoc == null)
                {
@@ -304,7 +521,13 @@
                    return result;
                }

                var endLoc = db.Queryable<TN_Location>().First(o =>o.S_AREA_CODE == Settings.Areas[11] && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无");
                var endLoc = db.Queryable<TN_Location>().
                    Where(o =>o.S_AREA_CODE == Settings.Areas[11] 
                    && o.N_CURRENT_NUM == 0 
                    && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                    ).First();

                if (endLoc == null)
                {
                    result.resultCode = 2;
@@ -343,7 +566,7 @@

                endLoc.N_LOCK_STATE = 1;
                endLoc.S_LOCK_STATE = "入库锁";
                startLoc.T_MODIFY = System.DateTime.Now;
                endLoc.T_MODIFY = System.DateTime.Now;

                using (var tran = db.Ado.UseTran())
                {
@@ -466,7 +689,7 @@

                var allCount = allCg.Count;
                var waittime = SpecHelper.GetExportTime(model.Spe);
                var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "合格" && o.T_MODIFY.AddMinutes(waittime) <= System.DateTime.Now);
                var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "合格" && o.T_MODIFY.AddHours(waittime) <= System.DateTime.Now);
                return $"满足{model.Spe}规格的总托盘数量：{allCount}，其中合格且静置时间已过的托盘数量：{okCount}";
            }
            catch (Exception ex)
@@ -633,11 +856,23 @@
        /// </summary>
        internal static SimpleResult PDAFullInArea(PDAFullInAreaInfo model)
        {
            var db = new SqlHelper<object>().GetInstance();

            var result = new SimpleResult();//返回结果
            LogHelper.Info("触发API：PDA满托下线入库" + JsonConvert.SerializeObject(model), "API");
            try
            {
                var db = new SqlHelper<object>().GetInstance();

                if (model.RfId.Length < 16)
                {
                    result.resultCode = 1;
                    result.resultMsg = $"输入的RFID，长度不够，要大于16位";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }

                model.RfId = WMSHelper.ConvertHexToAscii(model.RfId.Substring(0,16));

                //该产线的满托下线位置，起点
                var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
                if (startPoint != null)//起点存在
@@ -702,8 +937,12 @@
                                };

                                var endLoc = db.Queryable<TN_Location>().
                                                      Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "无" && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y").
                                                      OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位，直接判断当前数量为0即可
                                                      Where(c => c.S_AREA_CODE == Settings.Areas[1] 
                                                      && c.S_LOCK_STATE == "无" && c.N_LOCK_STATE == 0 
                                                      && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y"
                                                      && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == c.S_CODE).NotAny()//不能有货
                                                      ).
                                                      OrderBy(o => o.N_LAYER, OrderByType.Asc).First();//查询合适的终点货位，1层先入库

                                if (endLoc != null)
                                {
@@ -822,7 +1061,7 @@
                    }
                    else
                    {
                        result.resultCode = 9;
                        result.resultCode = 12;
                        result.resultMsg = $"此位置：{startPoint.PointOut}已锁住";
                        LogHelper.Info(result.resultMsg);
                        return result;
@@ -911,10 +1150,11 @@
            LogHelper.Info("触发API：满托出库上线" + JsonConvert.SerializeObject(model), "API");

            var result = new SimpleResult();
            var db = new SqlHelper<object>().GetInstance();

            TN_Location endLoc = new TN_Location();
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                if (model.EndLoc != string.Empty)//指定终点货位
                {
                    endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.EndLoc);
@@ -943,7 +1183,7 @@
                        return result;
                    }

                    if (endLoc.N_CURRENT_NUM != 0)
                    if (endLoc.N_CURRENT_NUM != 0 || db.Queryable<TN_Loc_Container>().Any(b => b.S_LOC_CODE == model.EndLoc))//不能有货
                    {
                        result.resultCode = 5;
                        result.resultMsg = $"该终点货位{model.EndLoc}已满";
@@ -961,13 +1201,13 @@

                var waitTime = SpecHelper.GetWaitTime(model.Spe);

                //优先技术合格
                //优先技术判定
                var startLoc = db.Queryable<TN_Location>().
                    LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE).
                    LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE).
                    Where((o, i, s) => o.N_CURRENT_NUM > 0 && o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.C_ENABLE == "Y"
                    && (s.S_ITEM_SPEC == model.Spe || s.S_SPE == model.Spe)//指定规格
                    && s.N_ITEM_STATE == 4 && s.S_ITEM_STATE == "技术合格"). //技术合格
                    && s.N_ITEM_STATE == 4 && s.S_ITEM_STATE == "技术判定"). //技术判定
                    First();//筛选有容器货位关系表信息，筛选有容器货品明细表信息

                if (startLoc == null)//其次合格
@@ -979,7 +1219,7 @@
                       Where((o, i, s) => o.N_CURRENT_NUM > 0 && o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.C_ENABLE == "Y"
                       && (s.S_ITEM_SPEC == model.Spe || s.S_SPE == model.Spe)//指定规格
                       && s.N_ITEM_STATE == 0 && s.S_ITEM_STATE == "合格" //合格的
                       && s.T_MODIFY.AddMinutes(waitTime) <= System.DateTime.Now).//根据规格的不同静置不同分钟才能出库
                       && i.T_CREATE.AddMinutes(waitTime) <= System.DateTime.Now).//根据规格的不同静置不同分钟才能出库
                       OrderBy((o, i, s) => s.T_CREATE, OrderByType.Asc).//先进先出
                       First();//筛选有容器货位关系表信息，筛选有容器货品明细表信息
                }
@@ -1032,11 +1272,6 @@
                        };
                        SpecHelper.InsertComponentDetail(target);
                    });

                    Task task27 = Task.Run(() =>
                    {
                        SpecHelper.DeleteInventoryM(cgInfo.S_ID);
                    });
                }
                else
                {
@@ -1065,13 +1300,14 @@
        {
            LogHelper.Info("触发API：空托下线堆叠" + JsonConvert.SerializeObject(model), "API");

          
            var result = new SimpleResult();
            var db = new SqlHelper<object>().GetInstance();

            TN_Location startLoc = new TN_Location();

            try
            {
                var db = new SqlHelper<object>().GetInstance();

                var startLocCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc && a.S_CNTR_CODE == model.cntID);
                if (startLocCntrRel != null)
                {
@@ -1166,13 +1402,13 @@
            LogHelper.Info("触发API：余料下线入库" + JsonConvert.SerializeObject(model), "API");

            var result = new SimpleResult();
            var db = new SqlHelper<object>().GetInstance();

            TN_Location startLoc_Old = new TN_Location();
            TN_Location startLoc_New = new TN_Location();

            try
            {

                var db = new SqlHelper<object>().GetInstance();
                var cG_Detail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.cntID);
                if (cG_Detail == null)
                {
@@ -1238,7 +1474,9 @@

                //查询符合的未锁定已启用指定货区的货位，终点
                var endLoc = db.Queryable<TN_Location>().
                          First(o => o.S_AREA_CODE == Settings.Areas[9] && o.S_CODE == weightPoint && o.C_ENABLE == "Y");//查询合适的终点货位
                          First(o => o.S_AREA_CODE == Settings.Areas[9]
                          && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                          && o.S_CODE == weightPoint && o.C_ENABLE == "Y");//查询合适的终点货位

                if (endLoc == null)
                {
@@ -1443,14 +1681,16 @@
            LogHelper.Info("触发API：人工拆盘入库" + JsonConvert.SerializeObject(model), "API");

            var result = new SimpleResult();
            var db = new SqlHelper<object>().GetInstance();

            string cntLog = $"旧的容器号{model.old_CntId}";
            try
            {
                var db = new SqlHelper<object>().GetInstance();

                if (model.new_IsOK == model.old_IsOK)
                {
                    result.resultCode = 19;
                    result.resultMsg = $"人工拆盘入库，物料需要一个合格一个不合格";
                    result.resultMsg = $"人工拆盘入库，物料需要一个待检一个不合格";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1493,7 +1733,6 @@

                var startLoc_New = db.Queryable<TN_Location>().
                    First(b => b.S_CODE == model.new_StartLoc && b.N_CURRENT_NUM == 0 && b.S_AREA_CODE == Settings.Areas[5] && b.N_LOCK_STATE == 0 && b.S_LOCK_STATE == "无");


                if (startLoc_New == null)
                {
@@ -1565,15 +1804,19 @@
                }

                var endLoc_Ok = db.Queryable<TN_Location>().
                          First(o => o.S_AREA_CODE == Settings.Areas[9] && o.S_CODE == weightPoint);//查询合适的终点货位，去称重
                          First(o => o.S_AREA_CODE == Settings.Areas[9]
                          && o.S_CODE == weightPoint);//查询合适的终点货位，去称重

                var endLoc_NG = db.Queryable<TN_Location>().
                          First(o => o.S_AREA_CODE == Settings.Areas[8] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无" && o.N_CURRENT_NUM == 0);//查询合适的终点货位
                          Where(o => o.S_AREA_CODE == Settings.Areas[8] 
                          && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                          && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//不能有货
                          && o.N_CURRENT_NUM == 0).First();//查询合适的终点货位

                if (endLoc_Ok == null)
                {
                    result.resultCode = 10;
                    result.resultMsg = $"合格的物料未找到合适的称重终点货位{weightPoint}";
                    result.resultMsg = $"待检的物料未找到合适的称重终点货位{weightPoint}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1581,7 +1824,7 @@
                if (endLoc_NG == null)
                {
                    result.resultCode = 16;
                    result.resultMsg = $"不合格的物料未找到合适的回炉区终点货位{Settings.Areas[8]}";
                    result.resultMsg = $"不合格的物料未找到合适的拆盘不合格区终点货位{Settings.Areas[8]}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1599,7 +1842,7 @@
                    fromArea = startLoc_New.S_AREA_CODE,
                    to = (model.new_IsOK == 2) ? endLoc_NG.S_CODE : endLoc_Ok.S_CODE,
                    toArea = (model.new_IsOK == 2) ? endLoc_NG.S_AREA_CODE : endLoc_Ok.S_AREA_CODE,
                    taskType = (model.new_IsOK == 2) ? "人工拆盘回炉" : "人工拆盘回库",
                    taskType = (model.new_IsOK == 2) ? "人工拆盘回不合格区" : "人工拆盘回库",
                    pri = 3,
                    cntrInfo = model.new_CntIds,
                    spec = cG_new_Detail_Ins.S_SPE,
@@ -1614,7 +1857,7 @@
                    fromArea = startLoc_Old.S_AREA_CODE,
                    to = (model.old_IsOK == 2) ? endLoc_NG.S_CODE : endLoc_Ok.S_CODE,
                    toArea = (model.old_IsOK == 2) ? endLoc_NG.S_AREA_CODE : endLoc_Ok.S_AREA_CODE,
                    taskType = (model.old_IsOK == 2) ? "人工拆盘回炉" : "人工拆盘回库",
                    taskType = (model.old_IsOK == 2) ? "人工拆盘回不合格区" : "人工拆盘回库",
                    pri = 3,
                    cntrInfo = model.old_CntId,
                    spec = cG_old_Detail.S_SPE,
@@ -1780,93 +2023,118 @@
            LogHelper.Info("触发API：人工创建点到点任务" + JsonConvert.SerializeObject(model), "API");

            var result = new SimpleResult();
            var db = new SqlHelper<object>().GetInstance();
            try
            {
                var db = new SqlHelper<object>().GetInstance();

                var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc);
                
                if(!(startLoc != null && startLoc.N_CURRENT_NUM > 0 && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == "无"))
                if(!(startLoc != null  && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == "无"))
                {
                    result.resultCode = 1;
                    result.resultMsg = $"起始位置{model.startLoc}不满足条件：startLoc != null && startLoc.N_CURRENT_NUM > 0 && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == 无";
                    result.resultMsg = $"起始位置{model.startLoc}不满足条件：startLoc != null && startLoc.N_LOCK_STATE == 0 && startLoc.S_LOCK_STATE == 无";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }

                var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc);

                if (!(endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == "无"))
                if (!(endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == "无") || db.Queryable<TN_Loc_Container>().Any(a=>a.S_LOC_CODE == endLoc.S_CODE))
                {
                    result.resultCode = 2;
                    result.resultMsg = $"终点位置{model.endLoc}不满足条件：endLoc != null && endLoc.N_CURRENT_NUM == 0 && endLoc.N_LOCK_STATE == 0 && endLoc.S_LOCK_STATE == 无";
                    result.resultMsg = $"终点位置{model.endLoc}已锁住或已满";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }

                var startLocCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
                
                if (startLocCnt == null)
                var tn_Task = new TN_Task()
                {
                    startLocCnt = new TN_Loc_Container()
                    {
                        S_LOC_CODE = model.startLoc,
                        S_CNTR_CODE = Guid.NewGuid().ToString("D"),
                    };
                    db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand();
                }
                    S_CODE = WCSHelper.GenerateTaskNo(),
                    S_START_AREA = startLoc.S_AREA_CODE,
                    S_END_AREA = endLoc.S_AREA_CODE,
                    S_START_LOC = startLoc.S_CODE,
                    S_END_LOC = endLoc.S_CODE,
                    S_TYPE = "点对点",
                    N_PRIORITY = model.priority,
                    N_SCHEDULE_TYPE = 1,
                    N_B_STATE = 0
                };
                startLoc.N_LOCK_STATE  = 2;
                startLoc.S_LOCK_STATE = "出库锁";
                startLoc.N_CURRENT_NUM = 1;

                //创建点对点任务
                if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "点对点", 3, startLocCnt.S_CNTR_CODE))//创建搬送任务，起点终点容器
                endLoc.N_LOCK_STATE = 1;
                endLoc.S_LOCK_STATE = "入库锁";


                using (var tran = db.Ado.UseTran())
                {
                    LocationHelper.LockLoc(startLoc.S_CODE, 2);//起点出库锁，
                    LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁
                    LogHelper.Info($"生成点对点任务成功，容器号{startLocCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}");

                    Task task1 = Task.Run(() =>
                    if (startLocCnt == null)
                    {
                        WMSHelper.InsertOpInfo(model.staff, "点对点", startLocCnt.S_CNTR_CODE);
                    });

                    var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == startLocCnt.S_CNTR_CODE);
                    Task task27 = Task.Run(() =>
                    {
                        if (endLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null)
                        startLocCnt = new TN_Loc_Container()
                        {
                            var target = new TN_InventoryM()
                            S_LOC_CODE = model.startLoc,
                            S_CNTR_CODE = Guid.NewGuid().ToString("D"),
                        };
                        if (db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand() <= 0)
                        {
                            tran.RollbackTran();
                            result.resultCode = 3;
                            result.resultMsg = $"插入TN_Loc_Container表失败，货位：{model.startLoc}";
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
                    }
                    
                    tn_Task.S_CNTR_CODE = startLocCnt.S_CNTR_CODE;

                    if (db.Insertable<TN_Task>(tn_Task).ExecuteCommand() > 0 &&
                        db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
                        db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0
                        ){
                        LogHelper.Info($"生成点对点任务成功，容器号{startLocCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}");

                        Task task1 = Task.Run(() =>
                        {
                            WMSHelper.InsertOpInfo(model.staff, "点对点", startLocCnt.S_CNTR_CODE);
                        });

                        var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == startLocCnt.S_CNTR_CODE);
                        Task task27 = Task.Run(() =>
                        {
                            if (endLoc.S_AREA_CODE == Settings.Areas[1] && cginfo != null) //插入WMS库存明细
                            {
                                S_ID = cginfo.S_ID,
                                RFID = cginfo.S_CNTR_CODE,
                                SPEC = cginfo.S_SPE,
                                WEIGHT = cginfo.F_QTY,
                                ITEMSTATE = cginfo.S_ITEM_STATE,
                                ITEMCODE = cginfo.S_ITEM_CODE,
                                LOGINNAME = model.staff,
                                SHIFT = model.shift,
                            };
                            SpecHelper.InsertInventoryM(target);
                        }
                    });
                    Task task26 = Task.Run(() =>
                                var target = new TN_InventoryM()
                                {
                                    S_ID = cginfo.S_ID,
                                    RFID = cginfo.S_CNTR_CODE,
                                    SPEC = cginfo.S_SPE,
                                    WEIGHT = cginfo.F_QTY,
                                    ITEMSTATE = cginfo.S_ITEM_STATE,
                                    ITEMCODE = cginfo.S_ITEM_CODE,
                                    LOGINNAME = model.staff,
                                    SHIFT = model.shift,
                                };
                                SpecHelper.InsertInventoryM(target);
                            }
                        });

                        tran.CommitTran();
                        result.resultCode = 0;
                        result.resultMsg = "成功";
                        LogHelper.Info($"生成点对点失败，容器号{ startLocCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}");
                        return result;
                    }
                    else
                    {
                        if (startLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null)
                        {
                            SpecHelper.DeleteInventoryM(cginfo.S_ID);
                        }
                    });

                    result.resultCode = 0;
                    result.resultMsg =  "成功";
                    LogHelper.Info($"生成点对点失败，容器号{ startLocCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}");
                    return result;
                        tran.RollbackTran();
                        result.resultCode = 9;
                        result.resultMsg = $"生成点对点失败，容器号{ startLocCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }
                }
                else
                {
                    result.resultCode = 9;
                    result.resultMsg = $"生成点对点失败，容器号{ startLocCnt.S_CNTR_CODE}，起点{startLoc.S_CODE}，终点{endLoc.S_CODE}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }

            }
            catch (Exception ex)
            {