|
|
@@ -334,7 +334,7 @@ namespace WCS.Service.Works.RGV
|
|
|
//.ToList();
|
|
|
if (pickStation.Entity.CODE == "G19")
|
|
|
{
|
|
|
- var pickStations = Device.Find("G23").Create<StationDeviceGroup>().Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000);
|
|
|
+ var pickStations = Device.Find("G23").Create<StationDeviceGroup>().RGVGetTaskedDevice();
|
|
|
if (pickStations.Any())
|
|
|
{
|
|
|
obj.Move(Device.Find("G23").Create<StationDeviceGroup>());
|
|
|
@@ -342,7 +342,7 @@ namespace WCS.Service.Works.RGV
|
|
|
}
|
|
|
}
|
|
|
// 筛选出有任务号和起始及目标地址的设备
|
|
|
- var devs = pickStation.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000);
|
|
|
+ var devs = pickStation.RGVGetTaskedDevice();
|
|
|
//是否需要取货
|
|
|
if (devs != null && devs.Count() > 0)
|
|
|
{
|
Administrator