AGV会换车，删除库存操作改成收到4执行，去线边的货位自动解绑

杨张扬

8 天以前 3909fbf77ad4ebc0dde600ff82710d959f74b5f4

 api/ApiHelper.cs

@@ -161,15 +161,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 +183,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 +194,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 +241,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(() =>
                    {
@@ -235,7 +275,8 @@
                                CARCODE = cG_Detail.S_CAR_CODE,
                                WEIGHT = cG_Detail.F_QTY,
                                REMELTTIME = DateTime.Now,
                                TASKNO = taskNo
                                TASKNO = taskNo,
                                SHIFT = model.shift,
                            };
                            SpecHelper.InsertRemeltDetail(target);
                        }
@@ -254,7 +295,7 @@
                                ITEMSTATE = cG_Detail.S_ITEM_STATE,
                                ITEMCODE = cG_Detail.S_ITEM_CODE,
                                LOGINNAME = model.staff,
                                SHIFT = "None",
                                SHIFT = model.shift,
                            };
                            SpecHelper.InsertInventoryM(target);
                        }
@@ -275,7 +316,7 @@
            catch (Exception ex)
            {
                result.resultCode = -1;
                result.resultMsg = $"发生了异常：{ex.Message}";
                result.resultMsg = $"PDA满托复检判断，发生了异常：{ex.Message}";
                LogHelper.Info(result.resultMsg);
                return result;
            }
@@ -303,7 +344,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;
@@ -342,7 +389,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())
                {
@@ -413,7 +460,8 @@
                                SPEC = cgInfo.S_SPE,
                                CARCODE = cgInfo.S_CAR_CODE,
                                WEIGHT = cgInfo.F_QTY,
                                REMELTTIME = DateTime.Now
                                REMELTTIME = DateTime.Now,
                                SHIFT = model.shift,
                            };
                            SpecHelper.InsertRemeltDetail(target);
                        });
@@ -464,7 +512,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)
@@ -636,208 +684,206 @@
            LogHelper.Info("触发API：PDA满托下线入库" + JsonConvert.SerializeObject(model), "API");
            try
            {
                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)//起点存在
                {
                    var woInfo = db.Queryable<TN_WorkOrder>().Where(a => a.S_LINE_NO == startPoint.ProductionLine_Name && a.S_B_STATE == "开启").OrderBy(b => b.T_CREATE, OrderByType.Desc).First();

                    if (woInfo != null)//当前产线不存在开启的最新的工单
                    var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "无" && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
                    if (startLoc != null)//该产线的起点没锁住
                    {
                        var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "无" && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
                        if (startLoc != null)//该产线的起点没锁住
                        var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
                        if (cgInfo != null)//有残留的容器货品明细关系表信息
                        {
                            var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
                            if (cgInfo != null)//有残留的容器货品明细关系表信息
                            result.resultCode = 1;
                            result.resultMsg = $"该容器{model.RfId}已绑定货品{cgInfo.S_ITEM_CODE}，如果要使用，容器先解绑货品";
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
                        else
                        {
                            var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
                            if (locCntrRel != null)//当前容器是否绑定了货位
                            {
                                result.resultCode = 1;
                                result.resultMsg = $"该容器{model.RfId}已绑定货品{cgInfo.S_ITEM_CODE}，如果要使用，容器先解绑货品";
                                result.resultCode = 2;
                                result.resultMsg = $"该容器{model.RfId}已绑定货位{locCntrRel.S_LOC_CODE}，如果要使用，容器先解绑货位";
                                LogHelper.Info(result.resultMsg);
                                return result;
                            }
                            else
                            {
                                var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
                                if (locCntrRel != null)//当前容器是否绑定了货位
                                //新增货位容器关系表
                                locCntrRel = new TN_Loc_Container()
                                {
                                    result.resultCode = 2;
                                    result.resultMsg = $"该容器{model.RfId}已绑定货位{locCntrRel.S_LOC_CODE}，如果要使用，容器先解绑货位";
                                    S_LOC_CODE = startPoint.PointOut,
                                    S_CNTR_CODE = model.RfId,
                                };

                                var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
                                byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
                                string rfids16 = BitConverter.ToString(rfid);
                                string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
                                LogHelper.Info($"产线容器号：{rfids}，其16进制形式：{rfids16}");

                                if (rfids != model.RfId)
                                {
                                    result.resultCode = 9;
                                    result.resultMsg = $"PDA填入的容器号{model.RfId}与S7产线通讯的容器号{rfids}不同";
                                    LogHelper.Info(result.resultMsg);
                                    return result;
                                }
                                else
                                var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
                                var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];

                                var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//查询是否有这个对应的且状态正常的容器车号子表

                                TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//新增容器货品明细表
                                {
                                    //新增货位容器关系表
                                    locCntrRel = new TN_Loc_Container()
                                    S_CNTR_CODE = model.RfId,
                                    S_ITEM_SPEC = model.Spe,
                                    S_SPE = model.Spe,
                                    S_CAR_CODE = model.CarCode,
                                    N_ITEM_STATE = 1,
                                    S_ITEM_STATE = "待检",
                                    F_QTY = modelWeight,//这里的重量要当成数量来使用
                                };

                                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"
                                                      && 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)
                                {
                                    var task1 = new TN_Task()
                                    {
                                        S_LOC_CODE = startPoint.PointOut,
                                        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 = "PDA满托下线入库",
                                        N_B_STATE = 0,
                                        S_CNTR_CODE = model.RfId,
                                        S_SPEC = model.Spe,
                                    };

                                    var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
                                    byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
                                    string rfids16 = BitConverter.ToString(rfid);
                                    string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
                                    LogHelper.Info($"产线容器号：{rfids}，其16进制形式：{rfids16}");
                                    startLoc.N_LOCK_STATE = 2;
                                    startLoc.S_LOCK_STATE = "出库锁";
                                    startLoc.N_CURRENT_NUM = 1;
                                    startLoc.T_MODIFY = DateTime.Now;

                                    if (rfids != model.RfId)
                                    endLoc.N_LOCK_STATE = 1;
                                    endLoc.S_LOCK_STATE = "入库锁";
                                    startLoc.T_MODIFY = DateTime.Now;

                                    using (var tran = db.Ado.UseTran())
                                    {
                                        result.resultCode = 9;
                                        result.resultMsg = $"PDA填入的容器号{model.RfId}与S7产线通讯的容器号{rfids}不同";
                                        LogHelper.Info(result.resultMsg);
                                        return result;
                                    }
                                    var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
                                    var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];

                                    var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//查询是否有这个对应的且状态正常的容器车号子表
                                    
                                    TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//新增容器货品明细表
                                    {
                                        S_CNTR_CODE = model.RfId,
                                        S_ITEM_CODE = woInfo.S_ITEM_CODE,
                                        S_BATCH_NO = woInfo.S_BATCH_CODE,
                                        S_ITEM_SPEC = woInfo.S_ITEM_SPEC,
                                        S_SPE= woInfo.S_ITEM_SPEC,
                                        S_CAR_CODE = model.CarCode,
                                        N_ITEM_STATE = 1,
                                        S_ITEM_STATE = "待检",
                                        F_QTY = modelWeight,//这里的重量要当成数量来使用
                                    };

                                    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即可

                                    if (endLoc != null)
                                    {
                                        var task1 = new TN_Task()
                                        if (modelCI == null)//容器车号子表不存在
                                        {
                                            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 = "PDA满托下线入库",
                                            N_B_STATE = 0,
                                            S_CNTR_CODE = model.RfId,
                                            S_SPEC = model.Spe,
                                        };

                                        startLoc.N_LOCK_STATE = 2;
                                        startLoc.S_LOCK_STATE = "出库锁";
                                        startLoc.N_CURRENT_NUM = 1;
                                        startLoc.T_MODIFY = DateTime.Now;

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

                                        using (var tran = db.Ado.UseTran())
                                        {
                                            if (modelCI == null)//容器车号子表不存在
                                            modelCI = new TN_CAR_IN()
                                            {
                                                modelCI = new TN_CAR_IN()
                                                {
                                                    S_CNTR_CODE = model.RfId,
                                                    S_CAR_CODE = model.CarCode,
                                                    S_B_STATE = "0",
                                                };
                                                if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
                                                {
                                                    tran.RollbackTran();
                                                    result.resultCode = 8;
                                                    result.resultMsg = $"新增的TN_CAR_IN表插入失败，容器：{modelCI.S_CNTR_CODE}，车号：{modelCI.S_CAR_CODE}";
                                                    LogHelper.Info(result.resultMsg);
                                                    return result;
                                                }
                                            }

                                            if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
                                                db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
                                                db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0 &&
                                                db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
                                                db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//创建搬送任务，起点终点容器
                                            {
                                                tran.CommitTran();
                                                result.resultCode = 0;
                                                result.resultMsg = "成功";
                                                LogHelper.Info($"生成PDA满托下线入库任务成功，容器：{modelCI.S_CNTR_CODE}，起点：{startPoint.PointOut}，终点：{endLoc.S_CODE}");

                                                Task task99 = Task.Run(() =>
                                                {
                                                    WMSHelper.InsertOpInfo(model.staff, "PDA满托下线入库", modelCI.S_CNTR_CODE);
                                                });

                                                Task task98 = Task.Run(() =>
                                                {
                                                    var target = new TN_EquipProDetail()
                                                    {
                                                        S_ID = tN_CG_Detail.S_ID,
                                                        TASKTYPE = "PDA满托下线入库",
                                                        RFID = model.RfId,
                                                        SPEC = woInfo.S_ITEM_SPEC,
                                                        CARCODE = model.CarCode,
                                                        WEIGHT = modelWeight,
                                                        ITEMSTATE = "待检",
                                                        ITEMCODE = woInfo.S_ITEM_CODE,
                                                        LOGINNAME = model.staff,
                                                        SHIFT = "None",
                                                        STARTLOC = startLoc.S_CODE,
                                                    };
                                                    SpecHelper.InsertEquipProDetail(target);
                                                });

                                                Task task27 = Task.Run(() =>
                                                {
                                                    var target = new TN_InventoryM()
                                                    {
                                                        S_ID = tN_CG_Detail.S_ID,
                                                        RFID = model.RfId,
                                                        SPEC = woInfo.S_ITEM_SPEC,
                                                        WEIGHT = modelWeight,
                                                        ITEMSTATE = "待检",
                                                        ITEMCODE = woInfo.S_ITEM_CODE,
                                                        LOGINNAME = model.staff,
                                                        SHIFT = "None",
                                                    };
                                                    SpecHelper.InsertInventoryM(target);
                                                });

                                                return result;
                                            }
                                            else
                                                S_CNTR_CODE = model.RfId,
                                                S_CAR_CODE = model.CarCode,
                                                S_B_STATE = "0",
                                            };
                                            if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
                                            {
                                                tran.RollbackTran();
                                                result.resultCode = 7;
                                                result.resultMsg = $"生成满托下线入库任务失败，容器：{modelCI.S_CNTR_CODE}，起点：{startPoint.PointOut}，终点：{endLoc.S_CODE}";
                                                result.resultCode = 8;
                                                result.resultMsg = $"新增的TN_CAR_IN表插入失败，容器：{modelCI.S_CNTR_CODE}，车号：{modelCI.S_CAR_CODE}";
                                                LogHelper.Info(result.resultMsg);
                                                return result;
                                            }
                                        }
                                    }
                                    else
                                    {
                                        result.resultCode = 4;
                                        result.resultMsg = $"未找到合适的终点，容器：{modelCI.S_CNTR_CODE}";
                                        LogHelper.Info(result.resultMsg);
                                        return result;

                                        if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
                                            db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
                                            db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0 &&
                                            db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
                                            db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//创建搬送任务，起点终点容器
                                        {
                                            tran.CommitTran();
                                            result.resultCode = 0;
                                            result.resultMsg = "成功";
                                            LogHelper.Info($"生成PDA满托下线入库任务成功，容器：{modelCI.S_CNTR_CODE}，起点：{startPoint.PointOut}，终点：{endLoc.S_CODE}");

                                            Task task99 = Task.Run(() =>
                                            {
                                                WMSHelper.InsertOpInfo(model.staff, "PDA满托下线入库", modelCI.S_CNTR_CODE);
                                            });

                                            Task task98 = Task.Run(() =>
                                            {
                                                var target = new TN_EquipProDetail()
                                                {
                                                    S_ID = tN_CG_Detail.S_ID,
                                                    TASKTYPE = "PDA满托下线入库",
                                                    RFID = model.RfId,
                                                    SPEC = model.Spe,
                                                    CARCODE = model.CarCode,
                                                    WEIGHT = modelWeight,
                                                    ITEMSTATE = "待检",
                                                    LOGINNAME = model.staff,
                                                    SHIFT = model.shift,
                                                    STARTLOC = startLoc.S_CODE,
                                                };
                                                SpecHelper.InsertEquipProDetail(target);
                                            });

                                            Task task27 = Task.Run(() =>
                                            {
                                                var target = new TN_InventoryM()
                                                {
                                                    S_ID = tN_CG_Detail.S_ID,
                                                    RFID = model.RfId,
                                                    SPEC = model.Spe,
                                                    WEIGHT = modelWeight,
                                                    ITEMSTATE = "待检",
                                                    LOGINNAME = model.staff,
                                                    SHIFT = model.shift,
                                                };
                                                SpecHelper.InsertInventoryM(target);
                                            });

                                            return result;
                                        }
                                        else
                                        {
                                            tran.RollbackTran();
                                            result.resultCode = 7;
                                            result.resultMsg = $"生成满托下线入库任务失败，容器：{modelCI.S_CNTR_CODE}，起点：{startPoint.PointOut}，终点：{endLoc.S_CODE}";
                                            LogHelper.Info(result.resultMsg);
                                            return result;
                                        }
                                    }
                                }
                                else
                                {
                                    result.resultCode = 4;
                                    result.resultMsg = $"未找到合适的终点，容器：{modelCI.S_CNTR_CODE}";
                                    LogHelper.Info(result.resultMsg);
                                    return result;
                                }
                            }
                        }
                        else
                        {
                            result.resultCode = 9;
                            result.resultMsg = $"此位置：{startPoint.PointOut}已锁住";
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
                    }
                    else
                    {
                        result.resultCode = 10;
                        result.resultMsg = $"当前产线{startPoint.ProductionLine_Name}位置{startPoint.PointOut}没有开启的工单";
                        result.resultCode = 12;
                        result.resultMsg = $"此位置：{startPoint.PointOut}已锁住";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }
@@ -957,7 +1003,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}已满";
@@ -975,13 +1021,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)//其次合格
@@ -993,7 +1039,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();//筛选有容器货位关系表信息，筛选有容器货品明细表信息
                }
@@ -1042,13 +1088,9 @@
                           WEIGHT = cgInfo.F_QTY,
                           SPEC = model.Spe,
                           TASKNO = taskNo,
                           SHIFT = model.shift,
                        };
                        SpecHelper.InsertComponentDetail(target);
                    });

                    Task task27 = Task.Run(() =>
                    {
                        SpecHelper.DeleteInventoryM(cgInfo.S_ID);
                    });
                }
                else
@@ -1251,7 +1293,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)
                {
@@ -1293,7 +1337,8 @@
                            CARCODE = cG_Detail.S_CAR_CODE,
                            WEIGHT = cG_Detail.F_QTY,
                            REMELTTIME = DateTime.Now,
                            TASKNO = taksNo
                            TASKNO = taksNo,
                            SHIFT = model.shift,
                        };
                        SpecHelper.InsertSurplusDetail(target);
                    });
@@ -1309,7 +1354,7 @@
                            ITEMSTATE = cG_Detail.S_ITEM_STATE,
                            ITEMCODE = cG_Detail.S_ITEM_CODE,
                            LOGINNAME = model.staff,
                            SHIFT = "None",
                            SHIFT = model.shift,
                        };
                        SpecHelper.InsertInventoryM(target);
                    });
@@ -1462,7 +1507,7 @@
                if (model.new_IsOK == model.old_IsOK)
                {
                    result.resultCode = 19;
                    result.resultMsg = $"人工拆盘入库，物料需要一个合格一个不合格";
                    result.resultMsg = $"人工拆盘入库，物料需要一个待检一个不合格";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1505,7 +1550,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)
                {
@@ -1577,15 +1621,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;
                }
@@ -1593,7 +1641,7 @@
                if (endLoc_NG == null)
                {
                    result.resultCode = 16;
                    result.resultMsg = $"不合格的物料未找到合适的回炉区终点货位{Settings.Areas[8]}";
                    result.resultMsg = $"不合格的物料未找到合适的拆盘不合格区终点货位{Settings.Areas[8]}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1611,7 +1659,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,
@@ -1626,7 +1674,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,
@@ -1693,7 +1741,8 @@
                                        SPEC = cG_old_Detail.S_SPE,
                                        CARCODE = cG_old_Detail.S_CAR_CODE,
                                        WEIGHT = cG_old_Detail.F_QTY,
                                        REMELTTIME = DateTime.Now
                                        REMELTTIME = DateTime.Now,
                                        SHIFT = model.shift,
                                    };
                                    SpecHelper.InsertRemeltDetail(target);
                                }
@@ -1709,7 +1758,8 @@
                                        SPEC = cG_new_Detail_Ins.S_SPE,
                                        CARCODE = cG_new_Detail_Ins.S_CAR_CODE,
                                        WEIGHT = cG_new_Detail_Ins.F_QTY,
                                        REMELTTIME = DateTime.Now
                                        REMELTTIME = DateTime.Now,
                                        SHIFT = model.shift,
                                    };
                                    SpecHelper.InsertRemeltDetail(target);
                                }
@@ -1728,7 +1778,7 @@
                                        ITEMSTATE = cG_old_Detail.S_ITEM_STATE,
                                        ITEMCODE = cG_old_Detail.S_ITEM_CODE,
                                        LOGINNAME = model.staff,
                                        SHIFT = "None",
                                        SHIFT = model.shift,
                                    };
                                    SpecHelper.InsertInventoryM(target);
                                }
@@ -1743,7 +1793,7 @@
                                        ITEMSTATE = cG_new_Detail_Ins.S_ITEM_STATE,
                                        ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
                                        LOGINNAME = model.staff,
                                        SHIFT = "None",
                                        SHIFT = model.shift,
                                    };
                                    SpecHelper.InsertInventoryM(target);
                                }
@@ -1795,86 +1845,112 @@
            {
                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()
                {
                    result.resultCode = 3;
                    result.resultMsg = $"起始位置{model.startLoc}未绑定容器";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                    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 = "None",
                            };
                            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)
            {