|
@@ -141,10 +141,8 @@ namespace WCS.Service.Extensions
|
|
|
public bool IsPickUp(RGVDevice rgvDevice)
|
|
|
{
|
|
|
if (Entity.CODE is "G2" or "G3") return true;
|
|
|
- var dCount = Device.Where(v => v.CODE is "G1" or "G1340" or "G1337").Select(v => v.Create<StationDeviceGroup>()).Count(v => v.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)
|
|
|
- || v.Data2.Status.HasFlag(IstationStatus.光电状态)
|
|
|
- || v.Data2.Tasknum > 10000
|
|
|
- || !v.Data3.Status.HasFlag(StationStatus.自动)));
|
|
|
+ var dCount = Device.Where(v => v.CODE is "G1" or "G1340" or "G1337").Select(v => v.Create<StationDeviceGroup>()).Count(v => v.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位) && !v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum < 10000
|
|
|
+ && v.Data3.Status.HasFlag(StationStatus.自动)));
|
|
|
var rCount = rgvDevice.RGVList.Count(v => v.Data.DestPosition_1 == 1);
|
|
|
return rCount < dCount;
|
|
|
}
|