|
@@ -278,7 +278,7 @@ namespace WCS.Service.Works.Station
|
|
|
SRM = Device.Where(p => p.IsSC()).FirstOrDefault(p => item.ROUTES.Any(d => d.NEXT.CODE == p.CODE)).Create<SRMDevice>()
|
|
|
});
|
|
|
}
|
|
|
- code.infolog($"tunnelInfo:{JsonConvert.SerializeObject(tunnelInfos.Select(v => new TunnelInfo { taskIN = v.taskIN, Tunnel = v.Tunnel, SRM = null }), setting)};");
|
|
|
+ code.infolog($"tunnelInfo:{JsonConvert.SerializeObject(tunnelInfos.Select(v => new { taskIN = v.taskIN.CODE, Tunnel = v.Tunnel.CODE, SRM = v.SRM.Entity.CODE }), setting)};");
|
|
|
//筛选出优先级最高的可用巷道
|
|
|
var tunnelInfo = tunnelInfos.Where(v =>
|
|
|
{
|
|
@@ -291,7 +291,7 @@ namespace WCS.Service.Works.Station
|
|
|
}).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
|
|
|
if (tunnelInfo == null) throw new WarnException("无可用巷道");
|
|
|
code.infolog($"tunnelNo:{JsonConvert.SerializeObject(tunnelNo, setting)}。");
|
|
|
- code.infolog($"tunnelInfo:{JsonConvert.SerializeObject(new TunnelInfo { taskIN = tunnelInfo.taskIN, Tunnel = tunnelInfo.Tunnel, SRM = null }, setting)};");
|
|
|
+ code.infolog($"tunnelInfo:{JsonConvert.SerializeObject(new { taskIN = tunnelInfo.taskIN.CODE, Tunnel = tunnelInfo.Tunnel.CODE, SRM = tunnelInfo.SRM.Entity.CODE }, setting)};");
|
|
|
code.infolog($"{res.WMSTaskGroupKey}第二次分配:WCS选择{tunnelInfo.Tunnel.CODE}。");
|
|
|
|
|
|
//开始变更任务信息
|
|
@@ -341,4 +341,4 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
private readonly List<string> _devCodes = new() { "G1190", "G1199", "G1208", "G1217", "G1225" };
|
|
|
}
|
|
|
-}
|
|
|
+}
|