fix

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -390,7 +390,8 @@ namespace WCS.Service.Extensions
             {
                 //利用WorkMode来排除的环穿维护设备
                 return AllRGVList.Where(v => v.Entity.PROTOCOLS.Any(d => Entity.PROTOCOLS.Any(e => e.DB.PLC.IP == d.DB.PLC.IP)))
-                    .Where(v => v.Entity.CODE != Entity.CODE && v.Data2.WorkMode != 0).ToList();
+                    .Where(v => v.Data2.WorkMode != 0)
+                    .Where(v => v.Entity.CODE != Entity.CODE).ToList();
             }
         }
 
@@ -1088,4 +1089,4 @@ namespace WCS.Service.Extensions
         public WCS_DEVICE taskIN;
         public Device<ISRM520, ISRM521, ISRM537> SRM;
     }
-}
+}

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -203,12 +203,11 @@ namespace WCS.Service.Works.RGV
                             {
                                 case "G2":
                                     {
-                                        if (rgvDevice.RGVList.Count == 6)
-                                        { //此站台因需要进行排队，因此是否需要赶车取决于是否拦住了两个小车的任务
-                                            var afterRgv1 = afterRgv.After();
-                                            //如果是空闲或者没有拦住他，就不执行赶车
-                                            if (afterRgv1.Data2.WorkMode == RGVMode.自动 && (afterRgv1.Data2.SystemStatus == RGVRunStatus.空闲 || !afterRgv.StopedByMe(afterRgv1))) return;
-                                        }
+                                        if (rgvDevice.RGVList.Count == 6) break;
+                                        //此站台因需要进行排队，因此是否需要赶车取决于是否拦住了两个小车的任务
+                                        var afterRgv1 = afterRgv.After();
+                                        //如果是空闲或者没有拦住他，就不执行赶车
+                                        if (afterRgv1.Data2.WorkMode == RGVMode.自动 && (afterRgv1.Data2.SystemStatus == RGVRunStatus.空闲 || !afterRgv.StopedByMe(afterRgv1))) return;
                                         break;
                                     }
                                 case "G3":