|
@@ -251,8 +251,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
var tunnelInfos = new List<TunnelInfo>();
|
|
|
var setting = new JsonSerializerSettings();
|
|
|
- setting.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
|
|
|
- setting.ReferenceLoopHandling = ReferenceLoopHandling.Serialize;
|
|
|
+ setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
|
|
|
code.infolog($"{res.WMSTaskGroupKey}第二次分配:WMS返回{JsonConvert.SerializeObject(tunnels, setting)}。");
|
|
|
foreach (var item in tunnels)
|
|
|
{
|
|
@@ -278,6 +277,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, setting)};");
|
|
|
//筛选出优先级最高的可用巷道
|
|
|
var tunnelInfo = tunnelInfos.Where(v =>
|
|
|
{
|
|
@@ -289,6 +289,7 @@ namespace WCS.Service.Works.Station
|
|
|
catch { return false; }
|
|
|
}).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
|
|
|
code.infolog($"tunnelNo:{JsonConvert.SerializeObject(tunnelNo, setting)}。");
|
|
|
+ code.infolog($"tunnelInfo:{JsonConvert.SerializeObject(tunnelInfo, setting)};");
|
|
|
if (tunnelInfo == null) throw new WarnException("无可用巷道");
|
|
|
code.infolog($"{res.WMSTaskGroupKey}第二次分配:WCS选择{tunnelInfo.Tunnel.CODE}。");
|
|
|
|
|
@@ -326,6 +327,7 @@ namespace WCS.Service.Works.Station
|
|
|
finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
|
|
|
finishTask.Station.Data.CmdType = IstationCmdType.分配目标地址;
|
|
|
finishTask.Station.Data.VoucherNo++;
|
|
|
+ code.infolog($"{task.TaskGroupKey}第二次分配:WCS目标地址{finishTask.Station.Data.Goodsend}。");
|
|
|
}
|
|
|
});
|
|
|
});
|