|
|
@@ -252,7 +252,8 @@ namespace WCS.Service.Works.Station
|
|
|
var tunnelInfos = new List<TunnelInfo>();
|
|
|
var setting = new JsonSerializerSettings();
|
|
|
setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
|
|
|
- code.infolog($"{res.WMSTaskGroupKey}第二次分配:WMS返回{JsonConvert.SerializeObject(tunnels, setting)}。");
|
|
|
+ setting.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
|
|
|
+ code.infolog($"{res.WMSTaskGroupKey}第二次分配:WMS返回{JsonConvert.SerializeObject(tunnelNo, setting)}。");
|
|
|
foreach (var item in tunnels)
|
|
|
{
|
|
|
//当前巷道的取货点
|
|
|
@@ -266,10 +267,10 @@ namespace WCS.Service.Works.Station
|
|
|
.Where(v => stationDeviceGroup.Items.Any(p => p.Entity == v))// 筛选出包含在当前设备组的设备
|
|
|
.Distinct()
|
|
|
.FirstOrDefault();//去一次重
|
|
|
- code.infolog($"turntable:{JsonConvert.SerializeObject(turntable, setting)};item:{item.CODE}");
|
|
|
+ code.infolog($"turntable:{turntable.CODE};item:{item.CODE}");
|
|
|
if (turntable == null) continue;
|
|
|
var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => allIn.Contains(d.MEMBER.CODE))).MinBy(p => p.CODE);
|
|
|
- code.infolog($"dev:{JsonConvert.SerializeObject(dev, setting)};item:{item.CODE}");
|
|
|
+ code.infolog($"dev:{dev.CODE};item:{item.CODE}");
|
|
|
tunnelInfos.Add(new TunnelInfo
|
|
|
{
|
|
|
Tunnel = item,
|
|
|
@@ -340,4 +341,4 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
private readonly List<string> _devCodes = new() { "G1190", "G1199", "G1208", "G1217", "G1225" };
|
|
|
}
|
|
|
-}
|
|
|
+}
|
Administrator