java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改提交

Browse Source
This commit is contained in:
liuyihe
2026-09-03 21:09:22 +08:00
parent 171f450e59
commit baabfdabba
38 changed files with 646 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java
+11 -2
View File
@@ -306,7 +306,7 @@ public class UnifiedOrderQueryService {
order.getCustomerId(), order.getCustomerName(),
order.getChannelCode(), order.getChannelName(), Boolean.TRUE.equals(order.getChannelChanged()), order.getReceivingWarehouseId(), order.getReceivingWarehouseName(),
order.getDestinationWarehouseId(), order.getDestinationWarehouseName(), inbound.id(), inbound.version(), inbound.inboundCode(),
order.getExpectedShipDate(), inbound.totalPackageCount() != null ? inbound.totalPackageCount() : totalPackageCount(cargo), null, inbound.locationCodes(),
order.getExpectedShipDate(), displayedPackageCount(order, cargo, inbound), null, inbound.locationCodes(),
order.getEstimatedVolumeCbm(), volumeCbm(cargo),
inbound.actualGrossWeightKg(), inbound.actualVolumeCbm(),
order.getExpectedArrivalAt() != null ? order.getExpectedArrivalAt() : inbound.expectedArrivalAt(), inbound.feeReviewStatus(),
@@ -333,7 +333,7 @@ public class UnifiedOrderQueryService {
order != null && Boolean.TRUE.equals(order.getChannelChanged()), inbound.warehouseId(),
inbound.warehouseName(), inbound.deliveryWarehouseId(), inbound.deliveryWarehouseName(),
inbound.id(), inbound.version(), inbound.inboundCode(), null,
inbound.totalPackageCount() != null ? inbound.totalPackageCount() : totalPackageCount(cargo), null, inbound.locationCodes(),
displayedPackageCount(order, cargo, inbound), null, inbound.locationCodes(),
order == null ? null : order.getEstimatedVolumeCbm(), volumeCbm(cargo),
inbound.actualGrossWeightKg(), inbound.actualVolumeCbm(),
order != null && order.getExpectedArrivalAt() != null ? order.getExpectedArrivalAt() : inbound.expectedArrivalAt(), inbound.feeReviewStatus(), inbound.companyName(),
@@ -416,6 +416,15 @@ public class UnifiedOrderQueryService {
return cargo == null ? null : cargo.totalPackageCount();
}
private Integer displayedPackageCount(OrderEntity order, CargoSummary cargo,
FirstlegUnifiedOrderClient.Inbound inbound) {
Integer declaredPackageCount = totalPackageCount(cargo);
boolean splitChild = order != null
&& (order.getParentOrderId() != null || "CHILD".equals(order.getOrderRole()));
if (!splitChild && declaredPackageCount != null) return declaredPackageCount;
return inbound.totalPackageCount() != null ? inbound.totalPackageCount() : declaredPackageCount;
}
private BigDecimal grossWeightKg(CargoSummary cargo) {
return cargo == null ? null : cargo.grossWeightKg();
}