|
@@ -355,13 +355,13 @@ namespace WCS.Service.Works.RGV
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- //bool needToMove = obj.RGVList.Any(v => v.Data2.TaskType_1 == RGVTaskType.放货 && v.Position > StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G19").Location && v.Position < StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G23").Location);
|
|
|
- //if(pickStation.Entity.CODE == "G23" && needToMove)
|
|
|
- //{
|
|
|
- // obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
|
|
|
- // return;
|
|
|
- //}
|
|
|
-
|
|
|
+ bool needToMove = obj.RGVList.Any(v => v.Data2.TaskType_1 == RGVTaskType.放货 && v.Position > StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G19").Location && v.Position < StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G23").Location);
|
|
|
+ if (pickStation.Entity.CODE == "G23" && needToMove)
|
|
|
+ {
|
|
|
+ obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
//计算当前RGV拦住小车的数量
|
|
|
var max = obj.RGVList.Count(v => v.Data2.WorkMode == RGVMode.自动 && v.Data2.SystemStatus != RGVRunStatus.空闲 && obj.StopedByMe(v));
|
|
|
if (pickStation.Entity.CODE == "G19" && max >= 2)
|