|
|
|
@ -73,7 +73,7 @@ public class NodeDataPushListener {
|
|
|
|
|
if (CollUtil.isNotEmpty(content)) { |
|
|
|
|
FactoryNodeEnums factoryNode = NodeMappingEnums.getFactoryByNodeAndStatus(workNodeEnums, 1); |
|
|
|
|
// 1 先处理 批次件 OLO开头的包件 OLO2312064418-20231226010129-1-001 原始包件 2312064418 回传按原始包件回传
|
|
|
|
|
content.stream().map(i -> { |
|
|
|
|
content = content.stream().map(i -> { |
|
|
|
|
String packageCode = i.getPackageCode(); |
|
|
|
|
if (StrUtil.startWith(packageCode, "OLO")) { |
|
|
|
|
if (StrUtil.isNotEmpty(packageCode)) { |
|
|
|
@ -82,7 +82,7 @@ public class NodeDataPushListener {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return i; |
|
|
|
|
}); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
// 2 先查出 包件+订单 的所有发运分单号和发运单号
|
|
|
|
|
Set<String> packageSet = content.stream().map(PushData::getPackageCode).collect(Collectors.toSet()); |
|
|
|
|
Set<String> orderSet = content.stream().map(PushData::getOrderCode).collect(Collectors.toSet()); |
|
|
|
|