|
@@ -122,18 +122,22 @@ namespace WCS.Service.Works.Station
|
|
|
.Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
|
|
|
.Select(v => v.CODE)
|
|
|
.ToList();
|
|
|
- var q = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.Contains(p.NEXT.CODE))) //下一个目标地址包含取货点的设备
|
|
|
+ var putStation = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.Contains(p.NEXT.CODE))) //下一个目标地址包含取货点的设备
|
|
|
.Select(v => v.Create<StationDevice>()) //取所有可以到达取货点设备的信息
|
|
|
.Where(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位) && !v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum < 10000)//筛选出空闲的路径点,此处因输送机都是一个动力,因此可以先找路径点再找设备组
|
|
|
.Distinct()
|
|
|
.FirstOrDefault();//去一次重
|
|
|
- if (q == null) continue;
|
|
|
- var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == q.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
|
|
|
-
|
|
|
+ if (putStation == null) continue;
|
|
|
+ var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == putStation.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
|
|
|
+ //RGV是否有正在前往这个地址的任务
|
|
|
+ var rgv8 = Device.Find(RGV8).Create<RGVDevice>();
|
|
|
+ if (!rgv8.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲)
|
|
|
+ && !rgv8.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动)
|
|
|
+ && rgv8.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort()) continue;
|
|
|
tunnelInfos.Add(new TunnelInfo
|
|
|
{
|
|
|
Tunnel = item,
|
|
|
- taskIN = dev, //找到放货点设备所在组
|
|
|
+ taskIN = taskInStation, //找到放货点设备所在组
|
|
|
SRM = Device.Where(p => p.IsSC()).FirstOrDefault(p => item.ROUTES.Any(d => d.NEXT.CODE == p.CODE)).Create<SRMDevice>()
|
|
|
});
|
|
|
}
|