|
|
@@ -117,7 +117,7 @@ namespace WCS.Service.Works.Station
|
|
|
});
|
|
|
}
|
|
|
//筛选出优先级最高的可用巷道
|
|
|
- var tunnelInfo = tunnelInfos.Where(v => { try { return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程; } catch { return false; } })
|
|
|
+ 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; } })
|
|
|
.OrderBy(v => tunnelNo.IndexOf(v.Tunnel.CODE)).FirstOrDefault();
|
|
|
if (tunnelInfo == null) throw new Exception(LogHelper.SpliceLogMessage("无可用巷道", obj.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常, GetType()));
|
|
|
|