fix

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

@@ -152,81 +152,196 @@ namespace WCS.WorkEngineering.Systems
 
                                             //获取当前任务可以去的目标地址
                                             var positionList = new List<string>();
+                                            var allPositionList = new List<string>();
                                             switch (task.WarehouseCode)
                                             {
                                                 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"});
                                                     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"});
                                                     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"});
                                                     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"});
                                                     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"});
                                                     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"});
                                                     break;
                                             }
 
-                                            //当前可用地址正在执行的任务
-                                            var 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())//没有可用放货站台
+                                            List<WCS_AgvTaskInfo> agvs = new List<WCS_AgvTaskInfo>();
+                                            List<WCS_AgvTaskInfo> agvsAll = new List<WCS_AgvTaskInfo>();
+                                            if (task.LastInteractionPoint == "2")
                                             {
-                                                var msg = "已无可用放货站台,任务正在执行中:";
-                                                foreach (var ag in agvs)
+                                                //当前可用地址正在执行的任务
+                                                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();
+                                                agvsAll = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && allPositionList.Contains(v.Station))
+                                                    .SplitTable(v => v.Take(2)).ToList();
+                                                var agvPositionLists = agvs.Select(x => x.Station).Distinct();
+                                                var agvPositionListsAll = agvsAll.Select(x => x.Station).Distinct();
+                                                //World.Log($"执行中的AGV任务目标地址:{JsonConvert.SerializeObject(agvPositionList)}");
+                                                var endDev = positionList.Where(x => !agvPositionLists.Contains(x)).ToList();
+                                                var endAllDev = allPositionList.Where(x => !agvPositionListsAll.Contains(x)).ToList();
+                                                World.Log($"agv可用巷道信息:{JsonConvert.SerializeObject(endDev)}");
+
+                                                if (!endDev.Any() && !endAllDev.Any())//没有可用放货站台
                                                 {
-                                                    msg += $"[任务号:{ag.ID},目标地址:{ag.Station}]";
+                                                    var msg = "已无可用放货站台,任务正在执行中:";
+                                                    foreach (var ag in agvs)
+                                                    {
+                                                        msg += $"[任务号:{ag.ID},目标地址:{ag.Station}]";
+                                                    }
+                                                    throw new Exception(msg);
                                                 }
-                                                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())
+                                                //获取没有光电信息的设备集合
+                                                try
                                                 {
-                                                    World.Log("可用站台均有货或有执行中任务");
-                                                    return;
-                                                }
+                                                    var devs = Device.All.Where(x => endDev.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();
 
-                                                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}");
+                                                    var devsAll = Device.All.Where(x => endAllDev.Contains(x.Code)).Select(x =>
+                                                        new Device<IStation520, IStation521, IStation523>(x, World));
+                                                    devsAll = devsAll.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())
+                                                    {
+                                                        if (devsAll.Any())
+                                                        {
+                                                            foreach (var dev in devsAll)
+                                                            {
+                                                                if (dev.Data3.Status.HasFlag(StationStatus.Run) && !dev.Data3.Status.HasFlag(StationStatus.PH_Status) &&
+                                                                                                                  dev.Data3.Status.HasFlag(StationStatus.Auto))
+                                                                {
+                                                                    World.Log($"任务执行过程:开始{agv.ID}-{JsonConvert.SerializeObject(devsAll.Select(x => x.Entity.Code).ToList())}");
+                                                                    agv.Status = AGVTaskStatus.Complete1;
+                                                                    agv.Station = dev.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}");
+                                                                    return;
+                                                                }
+                                                                else
+                                                                {
+                                                                    continue;
+                                                                }
+                                                            }
+                                                        }
+                                                        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}");
+                                                }
                                             }
-                                            catch (Exception e)
+                                            else
                                             {
-                                                throw new Exception($"执行错误:{e.Message + e.StackTrace}");
-                                            }
+                                                //当前可用地址正在执行的任务
+                                                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);
+                                                }
+
+                                                //获取没有光电信息的设备集合
+                                                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}");
+                                                }
+                                            }
+                                            
                                             break;
                                         }
                                     //取货站点安全交互

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

@@ -34,16 +34,16 @@ namespace WCS.WorkEngineering.Systems
                 taskInfos = db.Default.Queryable<WCS_TaskInfo>().ReadPastUpdLock().Where(x => x.Status == 0).ToList().Where(x => x.Type != TaskType.SetPlate || (x.Type == TaskType.SetPlate && x.AddrFrom != "Robot")).Select(x => x.ID).ToList();
                 var time = DateTime.Now.AddMinutes(-20);
                 var time1 = DateTime.Now.AddMinutes(-40);
-                var timeOut = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.EditTime < time);
+                var timeOut = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.AddTime < time);
                 if (timeOut > 0) World.Log($"共有{timeOut}个车间叫料任务超过二十分钟未执行，请检查相关相关任务对应的堆垛机是否正常、堆垛机放货点是否卡任务等", LogLevelEnum.High);
 
-                var timeOut1 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.EditTime < time1);
+                var timeOut1 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.AddTime < time1);
                 if (timeOut1 > 0) World.Log($"共有{timeOut1}个车间叫料任务超过四十分钟未执行，请检查相关相关任务对应的堆垛机是否正常、堆垛机放货点是否卡任务等", LogLevelEnum.High);
 
-                var timeOut2 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "皮盘入库" && x.Status < TaskStatus.StackerExecution && x.EditTime < time);
+                var timeOut2 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "皮盘入库" && x.Status < TaskStatus.StackerExecution && x.AddTime < time);
                 if (timeOut2 > 0) World.Log($"共有{timeOut2}个皮盘入库任务超过二十分钟未执行，请检查相关相关任务及对应agv设备", LogLevelEnum.High);
 
-                var timeOut3 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "皮盘入库" && x.Status < TaskStatus.StackerExecution && x.EditTime < time1);
+                var timeOut3 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "皮盘入库" && x.Status < TaskStatus.StackerExecution && x.AddTime < time1);
                 if (timeOut3 > 0) World.Log($"共有{timeOut3}个皮盘入库任务超过四十分钟未执行，请检查相关相关任务及对应agv设备", LogLevelEnum.High);
 
             });