贴标申请，仓储转运

lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java

@@ -84,6 +84,7 @@ public class LastlegOrderService {
     @Resource private ContainerArrivalTimeOperationMapper containerArrivalTimeOperations;
     @Resource private WarehouseResourceGateway warehouseResourceGateway;
     @Resource private ContainerShippingGateMapper containerShippingGates;
+    @Resource private ReturnOrderReferenceResolver returnOrderReferences;
 
     public PageResult<LastlegOrderSummary> page(String customerId, LastlegOrderRequests.Query query) {
         return page(customerId, query, null);
@@ -93,6 +94,8 @@ public class LastlegOrderService {
         Page<LastlegOrder> page = orderMapper.selectPage(
             new Page<>(query.page(), query.size()), filter(customerId, query, relabelNo).orderByDesc(LastlegOrder::getCreatedAt).orderByDesc(LastlegOrder::getId));
         Map<Long, List<LastlegOrderMapper.PalletMergeRelationRow>> mergeRelations = palletMergeRelations(page.getRecords());
+        returnOrderReferences.populateForRead(page.getRecords());
+        refreshReturnVolumes(page.getRecords());
         Map<String, String> containerNodes = containerNodes(page.getRecords());
         Map<Long, String> dispatchStatuses = dispatchStatuses(page.getRecords());
         Map<Long, LastlegOrderMapper.OrderWeightRow> weights = orderWeights(page.getRecords());
@@ -331,6 +334,8 @@ public class LastlegOrderService {
 
     public LastlegOrderDetailResponse detail(String customerId, long orderId) {
         LastlegOrder order = findOwned(customerId, orderId);
+        returnOrderReferences.populateForRead(List.of(order));
+        refreshReturnVolumes(List.of(order));
         List<LastlegOrderDetail> cargo = detailMapper.selectList(new LambdaQueryWrapper<LastlegOrderDetail>()
             .eq(LastlegOrderDetail::getCustomerId, order.getCustomerId())
             .eq(LastlegOrderDetail::getOrderId, orderId).orderByAsc(LastlegOrderDetail::getId));
@@ -596,6 +601,14 @@ public class LastlegOrderService {
             LastlegOrderMapper.DispatchStatusRow::dispatchStatus));
     }
 
+    private void refreshReturnVolumes(List<LastlegOrder> orders) {
+        List<Long> ids = orders.stream().filter(order -> "RETURN_RELABEL".equals(order.getOrderType())).map(LastlegOrder::getId).toList();
+        if (ids.isEmpty()) return;
+        Map<Long, BigDecimal> volumes = orderMapper.findReturnVolumes(ids).stream()
+            .collect(Collectors.toMap(LastlegOrderMapper.ReturnVolumeRow::orderId, LastlegOrderMapper.ReturnVolumeRow::volumeCbm));
+        for (LastlegOrder order : orders) if (volumes.containsKey(order.getId())) order.setVolumeCbm(volumes.get(order.getId()));
+    }
+
     private Map<Long, LastlegOrderMapper.OrderWeightRow> orderWeights(List<LastlegOrder> orders) {
         if (orders.isEmpty()) return Map.of();
         List<LastlegOrderMapper.OrderWeightRow> rows = orderMapper.findOrderWeights(

lastleg-service/src/main/java/com/baiyue/lastleg/service/ReturnOrderReferenceResolver.java

@@ -0,0 +1,62 @@
+package com.baiyue.lastleg.service;
+
+import com.baiyue.lastleg.entity.LastlegOrder;
+import com.baiyue.lastleg.fleet.customer.FleetCustomerDirectory;
+import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.server.ResponseStatusException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** Return snapshots come from the owning services, never another service's database. */
+@Service
+public class ReturnOrderReferenceResolver {
+    private static final Logger log = LoggerFactory.getLogger(ReturnOrderReferenceResolver.class);
+    private final FleetCustomerDirectory customers;
+    private final WarehouseResourceGateway warehouses;
+
+    public ReturnOrderReferenceResolver(FleetCustomerDirectory customers, WarehouseResourceGateway warehouses) {
+        this.customers = customers;
+        this.warehouses = warehouses;
+    }
+
+    public void populate(List<LastlegOrder> orders) {
+        populate(orders, true);
+    }
+
+    public void populateForRead(List<LastlegOrder> orders) {
+        populate(orders, false);
+    }
+
+    private void populate(List<LastlegOrder> orders, boolean required) {
+        Map<String, FleetCustomerDirectory.Customer> customerReferences = new HashMap<>();
+        Map<String, WarehouseResourceGateway.WarehouseReference> warehouseReferences = new HashMap<>();
+        for (LastlegOrder order : orders) {
+            if (!"RETURN_RELABEL".equals(order.getOrderType())) continue;
+            if (!StringUtils.hasText(order.getCustomerName())) {
+                try {
+                    var customer = customerReferences.computeIfAbsent(order.getCustomerId(), customers::find);
+                    order.setCustomerName(customer.name());
+                } catch (ResponseStatusException error) {
+                    if (required) throw error;
+                    log.warn("Return customer reference unavailable for order {}, status {}", order.getId(), error.getStatusCode().value());
+                }
+            }
+            if (!StringUtils.hasText(order.getOverseasWarehouseCode()) || !StringUtils.hasText(order.getOverseasWarehouseName())) {
+                try {
+                    var warehouse = warehouseReferences.computeIfAbsent(order.getOverseasWarehouseId(),
+                        id -> warehouses.requireActiveSharedWarehouse(Long.parseLong(id)));
+                    order.setOverseasWarehouseCode(warehouse.warehouseCode());
+                    order.setOverseasWarehouseName(warehouse.warehouseName());
+                } catch (ResponseStatusException error) {
+                    if (required) throw error;
+                    log.warn("Return warehouse reference unavailable for order {}, status {}", order.getId(), error.getStatusCode().value());
+                }
+            }
+        }
+    }
+}