|
|
@ -160,6 +160,7 @@ public class NodeDataPushListener { |
|
|
|
mtPushDataDTOS1.stream().map(mtPushDataDTO -> { |
|
|
|
mtPushDataDTOS1.stream().map(mtPushDataDTO -> { |
|
|
|
return CentralStkInConfirmOrderVO.builder() |
|
|
|
return CentralStkInConfirmOrderVO.builder() |
|
|
|
.orderCode(mtPushDataDTO.getOrderCode()) |
|
|
|
.orderCode(mtPushDataDTO.getOrderCode()) |
|
|
|
|
|
|
|
.outWarehouseType(mtPushDataDTO.getOutWarehouseType()) |
|
|
|
.packageVOS( |
|
|
|
.packageVOS( |
|
|
|
content.stream() |
|
|
|
content.stream() |
|
|
|
.filter(pushData -> StrUtil.equals(pushData.getOrderCode(), mtPushDataDTO.getOrderCode())) |
|
|
|
.filter(pushData -> StrUtil.equals(pushData.getOrderCode(), mtPushDataDTO.getOrderCode())) |
|
|
@ -268,6 +269,7 @@ public class NodeDataPushListener { |
|
|
|
pushData -> { |
|
|
|
pushData -> { |
|
|
|
return SignForConfirmPackageVO.builder() |
|
|
|
return SignForConfirmPackageVO.builder() |
|
|
|
.orderCode(pushData.getOrderCode()) |
|
|
|
.orderCode(pushData.getOrderCode()) |
|
|
|
|
|
|
|
.outWarehouseType(mtPushDataDTOMap.get(pushData.getOrderCode()).getOutWarehouseType()) |
|
|
|
.packageCode(pushData.getPackageCode()) |
|
|
|
.packageCode(pushData.getPackageCode()) |
|
|
|
.operatingTime(operatorTime) |
|
|
|
.operatingTime(operatorTime) |
|
|
|
.warehouseCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getWarehouseCode()) |
|
|
|
.warehouseCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getWarehouseCode()) |
|
|
|