|
|
|
@ -444,6 +444,16 @@ public class FactoryXxlJob {
|
|
|
|
|
.eq(StaorderPackagesEntity::getIdentification, "2") |
|
|
|
|
.eq(StaorderPackagesEntity::getOrderId, k) |
|
|
|
|
); |
|
|
|
|
// 订单 order_id +包件 packagenum 重复 则剔除数据
|
|
|
|
|
staorderPackagesList = staorderPackagesList.stream() |
|
|
|
|
.collect(Collectors.collectingAndThen( |
|
|
|
|
Collectors.toMap( |
|
|
|
|
sp -> sp.getOrderId() + sp.getPackagenum(), // 键
|
|
|
|
|
sp -> sp, // 值
|
|
|
|
|
(existing, replacement) -> existing // 处理重复键的情况,这里选择保留第一个
|
|
|
|
|
), |
|
|
|
|
map -> new ArrayList<>(map.values()) |
|
|
|
|
)); |
|
|
|
|
// 查询基地名称
|
|
|
|
|
StationlinenumEntity stationlinenumEntity = stationlinenumService.selectNameByNumber(v.getTcWlb006()); |
|
|
|
|
String siteName = Objects.isNull(stationlinenumEntity) ? null : stationlinenumEntity.getLogisticsLineName(); |
|
|
|
|