fix

Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs

@@ -200,7 +200,7 @@ namespace WCS.Service.Works
 
                                  var end = Device.Find(code).Device<IStation521>();
 
-                                 var arr = Device.Find("2272", "2120", "2119", "2122", "2328", "2117", "2116", "2114").Select(v => v.Device<IStation521, IStation520>()).ToArray();                              
+                                                              
 
                                  var res = true;
                                  if (end.Data.TASKNUM != 0) res = false;
@@ -208,8 +208,7 @@ namespace WCS.Service.Works
                                  // RGV可以到达放货地址,此处判断取反
                                  else if (!dev.Entity.ROUTES.Any(p => p.NEXT.CODE == end.Entity.CODE)) res = false;
                                  else if(dev.Data.PH_Status_1) res = false;
-                                 else if(v.Entity.CODE is "2108" && (arr.Where(v => v.Data.GOODSEND == 2359).Any())) res=false;
-
+                               
                                  return res;
                              });
             if (!validPickupPoints.Any()) return;//不需要取货

Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

@@ -61,7 +61,7 @@ namespace WCS.Service.Works.Stations
                 var rgv = Device.Find("RGV4").Device<IDRGV521, IDRGV520>();
                 if (rgv.Data2.Trigger_1 != 0 && rgv.Data2.Trigger_2 != 0)
                     throw new Exception("RGV4任务触发中");
-                if ((rgv.Data.DestPosition_1 == 2114 || rgv.Data.DestPosition_1 == 2114) && rgv.Data.SystemStatus != RGVRunStatus.空闲)
+                if ((rgv.Data.DestPosition_1 == 2114 || rgv.Data.StartPosition_1 == 2114) && rgv.Data.SystemStatus != RGVRunStatus.空闲)
                 {
                     flag = true;
                 }
@@ -176,7 +176,9 @@ namespace WCS.Service.Works.Stations
                 var rgv = Device.Find("RGV4").Device<IDRGV521, IDRGV520>();
                 if (rgv.Data2.Trigger_1 != 0 && rgv.Data2.Trigger_2 != 0)
                     throw new Exception("RGV4任务触发中");
-                if ((rgv.Data.DestPosition_1 == 2114 || rgv.Data.DestPosition_1 == 2114) && rgv.Data.SystemStatus != RGVRunStatus.空闲)
+                if ((rgv.Data.DestPosition_1 == 2114 || rgv.Data.StartPosition_1 == 2114 || rgv.Data2.StartPosition_1 == 2114 || rgv.Data2.DestPosition_1 == 2114) 
+                    && rgv.Data.SystemStatus != RGVRunStatus.空闲 
+                    || (rgv.Data2.StartPosition_1 == 2114 || rgv.Data2.DestPosition_1 == 2114) && rgv.Data.PH_Status_1)
                     throw new Exception("交通管制,RGV4正在出库");
             }