fix

业务工程/分拣库/WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -157,56 +157,46 @@ namespace WCS.WorkEngineering.Systems
                                             {
                                                 case "1N":
                                                     positionList.AddRange(new List<string>() { "2501", "2505", "2509", "2513" });
-                                                    allPositionList.AddRange(new List<string>() { 
-                                                        "2701", "2705", "2709", "2713", 
-                                                        "2901", "2905", "2909", "2913","3101", "3105", "3109", "3113",
-                                                        "3301", "3305", "3309", "3313","3501", "3505", "3509", "3513"});
+                                                    allPositionList.AddRange(new List<string>() {                                                        
+                                                        "2901", "2905", "2909", "2913",
+                                                        "3301", "3305", "3309", "3313"});
                                                     break;
 
                                                 case "1S":
                                                     positionList.AddRange(new List<string>() { "2701", "2705", "2709", "2713"/*"2501", "2505", "2509", "2513"*/ });
-                                                    allPositionList.AddRange(new List<string>() { 
-                                                        "2501", "2505", "2509", "2513",
-                                                        "3101", "3105", "3109", "3113","2901", "2905", "2909", "2913",
-                                                        "3501", "3505", "3509", "3513","3301", "3305", "3309", "3313"});
+                                                    allPositionList.AddRange(new List<string>() {                                                       
+                                                        "3101", "3105", "3109", "3113",
+                                                        "3501", "3505", "3509", "3513"});
                                                     break;
 
                                                 case "2N":
                                                     positionList.AddRange(new List<string>() { "2901", "2905", "2909", "2913" });
                                                     allPositionList.AddRange(new List<string>() { 
-                                                        "3101", "3105", "3109", "3113",
-                                                        "2501", "2505", "2509", "2513","2701", "2705", "2709", "2713",
-                                                        "3301", "3305", "3309", "3313","3501", "3505", "3509", "3513"});
+                                                        "2501" , "2505" , "2509" , "2513" , "3301" , "3305" , "3309" , "3313"});
                                                     break;
 
                                                 case "2S":
                                                     positionList.AddRange(new List<string>() { "3101", "3105", "3109", "3113"/*"2501", "2505", "2509", "2513"*/ });
                                                     allPositionList.AddRange(new List<string>() { 
-                                                        "2901", "2905", "2909", "2913",
-                                                        "2701", "2705", "2709", "2713","2501", "2505", "2509", "2513",
-                                                        "3501", "3505", "3509", "3513","3301", "3305", "3309", "3313"});
+                                                        "2701" , "2705" , "2709" , "2713" , "3501" , "3505" , "3509" , "3513"});
                                                     break;
 
                                                 case "3N":
                                                     positionList.AddRange(new List<string>() { "3301", "3305", "3309", "3313" });
                                                     allPositionList.AddRange(new List<string>() {
-                                                        "3501", "3505", "3509", "3513",
-                                                        "2901", "2905", "2909", "2913","3101", "3105", "3109", "3113",
-                                                        "2501", "2505", "2509", "2513","2701", "2705", "2709", "2713"});
+                                                        "2901" , "2905" , "2909" , "2913" , "2501" , "2505" , "2509" , "2513"});
                                                     break;
 
                                                 case "3S":
                                                     positionList.AddRange(new List<string>() { "3501", "3505", "3509", "3513" });
                                                     allPositionList.AddRange(new List<string>() {
-                                                        "3301", "3305", "3309", "3313",
-                                                        "3101", "3105", "3109", "3113","2901", "2905", "2909", "2913",
-                                                        "2701", "2705", "2709", "2713","2501", "2505", "2509", "2513"});
+                                                        "3101" , "3105" , "3109" , "3113" , "2701" , "2705" , "2709" , "2713"});
                                                     break;
                                             }
 
                                             List<WCS_AgvTaskInfo> agvs = new List<WCS_AgvTaskInfo>();
                                             List<WCS_AgvTaskInfo> agvsAll = new List<WCS_AgvTaskInfo>();
-                                            if (task.LastInteractionPoint == "2")
+                                            //if (task.LastInteractionPoint == "2")
                                             {
                                                 //当前可用地址正在执行的任务
                                                 agvs = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && positionList.Contains(v.Station))
@@ -219,7 +209,7 @@ namespace WCS.WorkEngineering.Systems
                                                 var endDev = positionList.Where(x => !agvPositionLists.Contains(x)).ToList();
                                                 var endAllDev = allPositionList.Where(x => !agvPositionListsAll.Contains(x)).ToList();
                                                 World.Log($"agv可用巷道信息:{JsonConvert.SerializeObject(endDev)}");
-                                                World.Log($"agv可用巷道信息(单独返空):{JsonConvert.SerializeObject(endAllDev)}");
+                                                World.Log($"agv可用巷道信息(所有):{JsonConvert.SerializeObject(endAllDev)}");
 
                                                 if (!endDev.Any() && !endAllDev.Any())//没有可用放货站台
                                                 {
@@ -292,57 +282,58 @@ namespace WCS.WorkEngineering.Systems
                                                     throw new Exception($"执行错误:{e.Message + e.StackTrace}");
                                                 }
                                             }
-                                            else
-                                            {
-                                                //当前可用地址正在执行的任务
-                                                agvs = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && positionList.Contains(v.Station))
-                                                    .SplitTable(v => v.Take(2)).ToList();
-                                                var agvPositionList = agvs.Select(x => x.Station).Distinct();
-                                                //World.Log($"执行中的AGV任务目标地址:{JsonConvert.SerializeObject(agvPositionList)}");
-                                                var endDevs = positionList.Where(x => !agvPositionList.Contains(x)).ToList();
-                                                World.Log($"agv可用巷道信息:{JsonConvert.SerializeObject(endDevs)}");
+                                            #region ELSE
+                                            //else
+                                            //{
+                                            //    //当前可用地址正在执行的任务
+                                            //    agvs = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && positionList.Contains(v.Station))
+                                            //        .SplitTable(v => v.Take(2)).ToList();
+                                            //    var agvPositionList = agvs.Select(x => x.Station).Distinct();
+                                            //    //World.Log($"执行中的AGV任务目标地址:{JsonConvert.SerializeObject(agvPositionList)}");
+                                            //    var endDevs = positionList.Where(x => !agvPositionList.Contains(x)).ToList();
+                                            //    World.Log($"agv可用巷道信息:{JsonConvert.SerializeObject(endDevs)}");
 
-                                                if (!endDevs.Any())//没有可用放货站台
-                                                {
-                                                    var msg = "已无可用放货站台,任务正在执行中:";
-                                                    foreach (var ag in agvs)
-                                                    {
-                                                        msg += $"[任务号:{ag.ID},目标地址:{ag.Station}]";
-                                                    }
-                                                    throw new Exception(msg);
-                                                }
+                                            //    if (!endDevs.Any())//没有可用放货站台
+                                            //    {
+                                            //        var msg = "已无可用放货站台,任务正在执行中:";
+                                            //        foreach (var ag in agvs)
+                                            //        {
+                                            //            msg += $"[任务号:{ag.ID},目标地址:{ag.Station}]";
+                                            //        }
+                                            //        throw new Exception(msg);
+                                            //    }
 
-                                                //获取没有光电信息的设备集合
-                                                try
-                                                {
-                                                    var devs = Device.All.Where(x => endDevs.Contains(x.Code)).Select(x =>
-                                                        new Device<IStation520, IStation521, IStation523>(x, World));
-                                                    devs = devs.Where(x =>
-                                                        !x.Data3.Status.HasFlag(StationStatus.Run) &&
-                                                        !x.Data3.Status.HasFlag(StationStatus.PH_Status) &&
-                                                        x.Data3.Status.HasFlag(StationStatus.Auto)).ToList();
-                                                    if (!devs.Any())
-                                                    {
-                                                        World.Log("可用站台均有货或有执行中任务");
-                                                        return;
-                                                    }
+                                            //    //获取没有光电信息的设备集合
+                                            //    try
+                                            //    {
+                                            //        var devs = Device.All.Where(x => endDevs.Contains(x.Code)).Select(x =>
+                                            //            new Device<IStation520, IStation521, IStation523>(x, World));
+                                            //        devs = devs.Where(x =>
+                                            //            !x.Data3.Status.HasFlag(StationStatus.Run) &&
+                                            //            !x.Data3.Status.HasFlag(StationStatus.PH_Status) &&
+                                            //            x.Data3.Status.HasFlag(StationStatus.Auto)).ToList();
+                                            //        if (!devs.Any())
+                                            //        {
+                                            //            World.Log("可用站台均有货或有执行中任务");
+                                            //            return;
+                                            //        }
 
-                                                    World.Log($"任务执行过程:开始{agv.ID}-{JsonConvert.SerializeObject(devs.Select(x => x.Entity.Code).ToList())}");
-                                                    agv.Status = AGVTaskStatus.Complete1;
-                                                    agv.Station = devs.MinBy(x => x.Entity.Code).Entity.Code;
-                                                    db.Default.UpdateableRowLock(agv).SplitTable(x => x.Take(2)).ExecuteCommand();
-                                                    World.Log($"任务执行过程:完成agv任务更新{agv.ID}--{agv.Station}");
-                                                    task.AddWCS_TASK_DTL(db.Default, "皮盘返库任务分配巷道", agv.Station, $"任务分配至:{agv.Station}");
-                                                    World.Log($"任务执行过程:完成任务明细添加{agv.Station}");
-                                                    AgvApi.ContinueTask(agv.AgvID, agv.Station);
-                                                    World.Log($"任务执行过程:任务成功下发AGV{agv.AgvID}--{agv.Station}");
-                                                }
-                                                catch (Exception e)
-                                                {
-                                                    throw new Exception($"执行错误:{e.Message + e.StackTrace}");
-                                                }
-                                            }
-                                            
+                                            //        World.Log($"任务执行过程:开始{agv.ID}-{JsonConvert.SerializeObject(devs.Select(x => x.Entity.Code).ToList())}");
+                                            //        agv.Status = AGVTaskStatus.Complete1;
+                                            //        agv.Station = devs.MinBy(x => x.Entity.Code).Entity.Code;
+                                            //        db.Default.UpdateableRowLock(agv).SplitTable(x => x.Take(2)).ExecuteCommand();
+                                            //        World.Log($"任务执行过程:完成agv任务更新{agv.ID}--{agv.Station}");
+                                            //        task.AddWCS_TASK_DTL(db.Default, "皮盘返库任务分配巷道", agv.Station, $"任务分配至:{agv.Station}");
+                                            //        World.Log($"任务执行过程:完成任务明细添加{agv.Station}");
+                                            //        AgvApi.ContinueTask(agv.AgvID, agv.Station);
+                                            //        World.Log($"任务执行过程:任务成功下发AGV{agv.AgvID}--{agv.Station}");
+                                            //    }
+                                            //    catch (Exception e)
+                                            //    {
+                                            //        throw new Exception($"执行错误:{e.Message + e.StackTrace}");
+                                            //    }
+                                            //}
+                                            #endregion
                                             break;
                                         }
                                     //取货站点安全交互