|
@@ -159,7 +159,7 @@ namespace WCS.Service.Works.Station
|
|
|
});
|
|
|
}
|
|
|
//筛选出优先级最高的可用巷道
|
|
|
- var tunnelInfo = tunnelInfos.Where(v => { try { return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程 && v.SRM.Data2.SRMStatus == SCRunStatus.空闲; } catch { return false; } })
|
|
|
+ var tunnelInfo = tunnelInfos.Where(v => { try { return (v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程) || v.SRM.Entity.CODE == "SRM1"; } catch { return false; } })
|
|
|
.Where(v => !db.Default.Set<WCS_TASK>().Any(p => p.Priority > 0 && p.DEVICE == v.SRM.Entity.CODE && p.STATUS < TaskStatus.堆垛机完成))
|
|
|
.OrderBy(v => tunnelNo.IndexOf(v.Tunnel.CODE)).FirstOrDefault();
|
|
|
if (tunnelInfo == null) throw new WarnException("无可用巷道");
|