gkj 2 жил өмнө
parent
commit
dfbe5a78ad

+ 6 - 2
WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -146,8 +146,12 @@ namespace WCS.WorkEngineering.Systems
                             var nextPos = stations.FirstOrDefault(v => v.Entity.Sources.Where(t => t.IsTunnel()).Select(t => t.Sources).SelectMany(v => v) //获取所有巷道
                                                                                        .Where(t => t.HasProtocol(typeof(ISRM520)))//筛选出堆垛机
                                                                                        .SelectMany(v => v.Sources).Any(t => t.Code == srm.Entity.Parent.Code));
-                            var agvs = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status <= AGVTaskStatus.MissionCompleted && v.Position == nextPos.Entity.Code).SplitTable(v => v.Take(2)).ToList();
-                            if (agvs.Any()) throw new KnownException($"当前站台已有放货AGV任务执行中", LogLevelEnum.Mid);
+                            var agvs = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.Position == nextPos.Entity.Code).SplitTable(v => v.Take(2)).ToList();
+                            if (agvs.Any())
+                            {
+                                World.Log($"当前站台已有放货AGV任务执行中", LogLevelEnum.Mid);
+                                continue;
+                            }
 
                             //更新AGV任务状态
                             agv.Status = AGVTaskStatus.Complete1;