1

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/InboundPlanListResponse.java

@@ -12,6 +12,7 @@ public record InboundPlanListResponse(
     String inboundCode,
     String lxCode,
     String orderType,
+    Long overseasWarehouseId,
     String overseasWarehouseCode,
     String overseasWarehouseName,
     String warehouseId,
@@ -34,4 +35,12 @@ public record InboundPlanListResponse(
     String dispatchStatus,
     LocalDateTime createdAt,
     Integer version
-) { }
+) {
+    public InboundPlanListResponse withReceivingWarehouse(String warehouseCode, String warehouseName) {
+        return new InboundPlanListResponse(lineId, planId, planNo, customerId, orderId, inboundCode, lxCode,
+            orderType, overseasWarehouseId, warehouseCode, warehouseName, warehouseId, this.warehouseCode,
+            this.warehouseName, fbaWarehouseCode, customerName, packageCount, pickedPackageCount, volumeCbm,
+            palletCount, assigned, mergeAllowed, urgent, status, appointmentNo, appointmentStatus, appointmentAt,
+            expectedLoadingAt, dispatchStatus, createdAt, version);
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanQueryMapper.java

@@ -25,7 +25,7 @@ public interface InboundPlanQueryMapper {
         "<if test='q.inboundCode != null and q.inboundCode != \"\"'> AND l.inbound_code LIKE CONCAT('%',#{q.inboundCode},'%')</if>" +
         "<if test='q.lxCode != null and q.lxCode != \"\"'> AND o.lx_code LIKE CONCAT('%',#{q.lxCode},'%')</if>" +
         "<if test='q.status != null and q.status != \"\"'> AND p.status=#{q.status}</if>" +
-        "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND o.overseas_warehouse_id=#{q.overseasWarehouseId}</if>" +
+        "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND p.overseas_warehouse_id=#{q.overseasWarehouseId}</if>" +
         "<if test='q.destinationWarehouseCode != null and q.destinationWarehouseCode != \"\"'> AND l.destination_warehouse_code=#{q.destinationWarehouseCode}</if>" +
         "<if test='q.warehouse != null and q.warehouse != \"\"'> AND (l.destination_warehouse_id LIKE CONCAT('%',#{q.warehouse},'%') OR l.destination_warehouse_code LIKE CONCAT('%',#{q.warehouse},'%') OR l.destination_warehouse_name LIKE CONCAT('%',#{q.warehouse},'%'))</if>" +
         "<if test='q.fbaWarehouseCode != null and q.fbaWarehouseCode != \"\"'> AND l.fba_warehouse_code LIKE CONCAT('%',#{q.fbaWarehouseCode},'%')</if>" +
@@ -38,7 +38,7 @@ public interface InboundPlanQueryMapper {
 
     @Select("<script>SELECT l.id lineId,p.id planId,p.plan_no planNo,p.customer_id customerId," +
         "l.order_id orderId,l.inbound_code inboundCode,o.lx_code lxCode,o.order_type orderType," +
-        "o.overseas_warehouse_code overseasWarehouseCode,o.overseas_warehouse_name overseasWarehouseName," +
+        "p.overseas_warehouse_id overseasWarehouseId,o.overseas_warehouse_code overseasWarehouseCode,o.overseas_warehouse_name overseasWarehouseName," +
         "l.destination_warehouse_id warehouseId,l.destination_warehouse_code warehouseCode," +
         "l.destination_warehouse_name warehouseName,l.fba_warehouse_code fbaWarehouseCode," +
         "o.customer_name customerName,l.required_package_count packageCount," +

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java

@@ -179,10 +179,21 @@ public class InboundPlanService {
         long total = queryMapper.count(customerId, query);
         List<InboundPlanListResponse> records = total == 0 ? List.of() : queryMapper.rows(
             customerId, query, (query.page() - 1) * query.size(), query.size());
+        Map<Long, WarehouseResourceGateway.WarehouseReference> receivingWarehouses = new HashMap<>();
+        records = records.stream().map(record -> canonicalizeReceivingWarehouse(record, receivingWarehouses)).toList();
         long pages = total == 0 ? 0 : (total + query.size() - 1) / query.size();
         return new PageResult<>(records, query.page(), query.size(), total, pages);
     }
 
+    private InboundPlanListResponse canonicalizeReceivingWarehouse(InboundPlanListResponse record,
+                                                                     Map<Long, WarehouseResourceGateway.WarehouseReference> cache) {
+        Long warehouseId = record.overseasWarehouseId();
+        if (warehouseId == null) return record.withReceivingWarehouse(null, null);
+        WarehouseResourceGateway.WarehouseReference warehouse = cache.computeIfAbsent(warehouseId,
+            id -> requiredReceivingWarehouse(String.valueOf(id)));
+        return record.withReceivingWarehouse(warehouse.warehouseCode(), warehouse.warehouseName());
+    }
+
     @Transactional(readOnly = true)
     public ContainerInboundPlanPreviewResponse previewContainer(String sourceContainerBookingId) {
         String bookingId = trimToNull(sourceContainerBookingId);