优化

lastleg-service/src/main/java/com/baiyue/lastleg/controller/LastlegOrderController.java

@@ -102,6 +102,20 @@ public class LastlegOrderController {
         return ApiResponse.success(orderService.containerProgressDetail(sourceContainerBookingId));
     }
 
+    @PutMapping("/api/platform/v1/last-leg/orders/container-summaries/{sourceContainerBookingId}/receiving-warehouse")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.LAST_MILE_ORDER_EDIT + "')")
+    @Operation(summary = "修改整柜海外接柜仓",
+        description = "仅在海外PDA建立接柜会话前允许修改；按 expectedVersion 乐观锁原子同步柜内订单与入库计划。")
+    public ApiResponse<ContainerPlanProgressSummary> changeReceivingWarehouse(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String sourceContainerBookingId,
+        @RequestHeader("Idempotency-Key") String idempotencyKey,
+        @Valid @RequestBody LastlegOrderRequests.ChangeReceivingWarehouse request) {
+        platformScope(user, null);
+        return ApiResponse.success(orderService.changeReceivingWarehouse(sourceContainerBookingId,
+            idempotencyKey, request, operatorName(user)));
+    }
+
     @GetMapping("/api/platform/v1/last-leg/orders/{id}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.LAST_MILE_ORDER_LIST + "')")
     @Operation(summary = "Get one inbound-code-level tail-leg order", description = "Required authority: " + OverseasPermissions.LAST_MILE_ORDER_LIST)

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchCandidateMapper.java

@@ -36,7 +36,13 @@ public interface DispatchCandidateMapper {
         "(SELECT MAX(fa.expected_loading_at) FROM ll_inbound_fba_appointment_item fi " +
         "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id WHERE fi.line_id IN " +
         "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id)) AS expectedLoadingAt," +
-        "MIN(o.overseas_warehouse_id) AS overseasWarehouseId,MIN(o.overseas_warehouse_name) AS overseasWarehouseName,MIN(o.order_no) AS orderNo," +
+        "CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(pos.overseas_warehouse_id) " +
+        "FROM ll_inventory_position pos WHERE pos.customer_id=ip.customer_id AND pos.pallet_id=p.warehouse_pallet_id " +
+        "AND pos.available_packages > 0) ELSE CAST(ip.overseas_warehouse_id AS CHAR) END AS overseasWarehouseId," +
+        "CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(b.overseas_warehouse_name) " +
+        "FROM ll_inventory_position pos JOIN ll_inventory_balance b ON b.id=pos.balance_id AND b.customer_id=pos.customer_id " +
+        "WHERE pos.customer_id=ip.customer_id AND pos.pallet_id=p.warehouse_pallet_id AND pos.available_packages > 0) " +
+        "ELSE MIN(o.overseas_warehouse_name) END AS overseasWarehouseName,MIN(o.order_no) AS orderNo," +
         "GROUP_CONCAT(DISTINCT o.order_no ORDER BY o.order_no SEPARATOR ',') AS orderRefs,MIN(l.inbound_code) AS inboundCode," +
         "p.pallet_no AS palletNo,p.destination_warehouse_id AS destinationWarehouseId," +
         "p.destination_warehouse_code AS destinationWarehouseCode,p.destination_warehouse_name AS destinationWarehouseName," +
@@ -94,7 +100,13 @@ public interface DispatchCandidateMapper {
         "(SELECT MAX(fa.expected_loading_at) FROM ll_inbound_fba_appointment_item fi " +
         "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id WHERE fi.line_id IN " +
         "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id)) AS expectedLoadingAt," +
-        "MIN(o.overseas_warehouse_id) AS overseasWarehouseId,MIN(o.overseas_warehouse_name) AS overseasWarehouseName,MIN(o.order_no) AS orderNo," +
+        "CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(pos.overseas_warehouse_id) " +
+        "FROM ll_inventory_position pos WHERE pos.customer_id=ip.customer_id AND pos.pallet_id=p.warehouse_pallet_id " +
+        "AND pos.available_packages > 0) ELSE CAST(ip.overseas_warehouse_id AS CHAR) END AS overseasWarehouseId," +
+        "CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(b.overseas_warehouse_name) " +
+        "FROM ll_inventory_position pos JOIN ll_inventory_balance b ON b.id=pos.balance_id AND b.customer_id=pos.customer_id " +
+        "WHERE pos.customer_id=ip.customer_id AND pos.pallet_id=p.warehouse_pallet_id AND pos.available_packages > 0) " +
+        "ELSE MIN(o.overseas_warehouse_name) END AS overseasWarehouseName,MIN(o.order_no) AS orderNo," +
         "GROUP_CONCAT(DISTINCT o.order_no ORDER BY o.order_no SEPARATOR ',') AS orderRefs,MIN(l.inbound_code) AS inboundCode," +
         "p.pallet_no AS palletNo,p.destination_warehouse_id AS destinationWarehouseId," +
         "p.destination_warehouse_code AS destinationWarehouseCode,p.destination_warehouse_name AS destinationWarehouseName," +

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java

@@ -220,10 +220,16 @@ public class DispatchService {
         if (selected.size() != palletIds.size()) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "One or more selected pallets are not in this tenant");
         }
+        boolean missingWarehouse = selected.stream().map(DispatchPalletCandidate::overseasWarehouseId)
+            .anyMatch(value -> value == null || value.isBlank());
+        if (missingWarehouse) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT,
+                "所选托盘中存在尚未关联海外仓的托盘");
+        }
         Set<String> warehouseIds = selected.stream().map(DispatchPalletCandidate::overseasWarehouseId)
-            .filter(Objects::nonNull).map(String::trim).filter(value -> !value.isEmpty()).collect(Collectors.toSet());
-        if (warehouseIds.size() != 1 || selected.stream().anyMatch(candidate -> candidate.overseasWarehouseId() == null)) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "A dispatch must belong to exactly one overseas warehouse");
+            .map(String::trim).collect(Collectors.toSet());
+        if (warehouseIds.size() != 1) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "一次排车只能包含同一海外仓的托盘");
         }
         String draftToken = trimToNull(request.draftToken());
         for (DispatchPalletCandidate candidate : selected) {

lastleg-service/src/main/java/com/baiyue/lastleg/dto/ContainerPlanProgressSummary.java

@@ -6,6 +6,12 @@ import java.time.LocalDateTime;
 public record ContainerPlanProgressSummary(
     String sourceContainerBookingId,
     String containerNo,
+    String overseasWarehouseId,
+    String overseasWarehouseCode,
+    String overseasWarehouseName,
+    int assignmentVersion,
+    boolean canChangeReceivingWarehouse,
+    String receivingWarehouseLockReason,
     long totalOrderCount,
     long inboundCodeCount,
     long missingInboundCodeCount,
@@ -16,4 +22,14 @@ public record ContainerPlanProgressSummary(
     boolean allPlansReady,
     String blockingReason
 ) {
+    public ContainerPlanProgressSummary(String sourceContainerBookingId, String containerNo,
+                                        long totalOrderCount, long inboundCodeCount,
+                                        long missingInboundCodeCount, long planCount,
+                                        long plannedInboundCodeCount, long pendingPlanCount,
+                                        LocalDateTime plannedArrivalAt, boolean allPlansReady,
+                                        String blockingReason) {
+        this(sourceContainerBookingId, containerNo, null, null, null, -1, false, null,
+            totalOrderCount, inboundCodeCount, missingInboundCodeCount, planCount,
+            plannedInboundCodeCount, pendingPlanCount, plannedArrivalAt, allPlansReady, blockingReason);
+    }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderRequests.java

@@ -54,6 +54,12 @@ public final class LastlegOrderRequests {
         }
     }
 
+    public record ChangeReceivingWarehouse(
+        @NotNull Long overseasWarehouseId,
+        @NotNull @Min(0) Integer expectedVersion,
+        @Size(max = 500) String remark
+    ) { }
+
     public record TransferDestination(
         @NotEmpty @Size(max = 200) List<Long> orderIds,
         @NotBlank @Size(max = 128) String warehouseId,

lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderSummary.java

@@ -22,6 +22,7 @@ public record LastlegOrderSummary(
     String customerId,
     String customerName,
     String overseasWarehouseId,
+    String overseasWarehouseCode,
     String overseasWarehouseName,
     String transferWarehouseId,
     String transferWarehouseCode,

lastleg-service/src/main/java/com/baiyue/lastleg/entity/LastlegOrder.java

@@ -28,7 +28,9 @@ public class LastlegOrder {
     private String sourceWarehouseId;
     private String sourceWarehouseName;
     private String overseasWarehouseId;
+    private String overseasWarehouseCode;
     private String overseasWarehouseName;
+    private Integer receivingWarehouseVersion;
     private String fbaWarehouseCode;
     private String containerNo;
     private String transferWarehouseId;

lastleg-service/src/main/java/com/baiyue/lastleg/entity/ReceivingWarehouseOperation.java

@@ -0,0 +1,21 @@
+package com.baiyue.lastleg.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("ll_receiving_warehouse_operation")
+public class ReceivingWarehouseOperation {
+    @TableId(type = IdType.INPUT) private Long id;
+    private String sourceContainerBookingId;
+    private String idempotencyKey;
+    private String requestHash;
+    private Integer resultVersion;
+    private String operatorName;
+    private String remark;
+    private LocalDateTime createdAt;
+}

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

@@ -12,6 +12,8 @@ public record InboundPlanListResponse(
     String inboundCode,
     String lxCode,
     String orderType,
+    String overseasWarehouseCode,
+    String overseasWarehouseName,
     String warehouseId,
     String warehouseCode,
     String warehouseName,
@@ -29,18 +31,4 @@ public record InboundPlanListResponse(
     String dispatchStatus,
     LocalDateTime createdAt,
     Integer version
-) {
-    public InboundPlanListResponse(Long lineId, Long planId, String planNo, String customerId,
-                                   Long orderId, String inboundCode, String orderType,
-                                   String warehouseId, String warehouseCode, String warehouseName,
-                                   String fbaWarehouseCode, String customerName, Integer packageCount,
-                                   BigDecimal volumeCbm, Integer palletCount, String status,
-                                   String appointmentNo, String appointmentStatus,
-                                   LocalDateTime appointmentAt, LocalDateTime expectedLoadingAt,
-                                   String dispatchStatus, LocalDateTime createdAt) {
-        this(lineId, planId, planNo, customerId, orderId, inboundCode, null, orderType, warehouseId,
-            warehouseCode, warehouseName, fbaWarehouseCode, customerName, packageCount, 0,
-            volumeCbm, palletCount, status, appointmentNo, appointmentStatus, appointmentAt,
-            expectedLoadingAt, dispatchStatus, createdAt, 0);
-    }
-}
+) { }

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

@@ -10,6 +10,8 @@ public record InboundPlanResponse(
     String customerId,
     Long sourceOrderId,
     String containerNo,
+    String overseasWarehouseCode,
+    String overseasWarehouseName,
     String status,
     int lineCount,
     int palletCount,
@@ -21,22 +23,6 @@ public record InboundPlanResponse(
     List<Allocation> allocations,
     int version
 ) {
-    public InboundPlanResponse(Long id, String planNo, String customerId, Long sourceOrderId,
-                               String containerNo, String status, int lineCount, int palletCount,
-                               BigDecimal totalVolumeCbm, List<Line> lines, List<Pallet> pallets,
-                               List<Allocation> allocations) {
-        this(id, planNo, customerId, sourceOrderId, containerNo, status, lineCount, palletCount,
-            totalVolumeCbm, lines, pallets, allocations, 0);
-    }
-
-    public InboundPlanResponse(Long id, String planNo, String customerId, Long sourceOrderId,
-                               String containerNo, String status, int lineCount, int palletCount,
-                               BigDecimal totalVolumeCbm, List<Line> lines, List<Pallet> pallets,
-                               List<Allocation> allocations, int version) {
-        this(id, planNo, customerId, sourceOrderId, containerNo, status, lineCount, palletCount,
-            totalVolumeCbm, lines.stream().mapToInt(Line::requiredPackageCount).sum(),
-            allocations.stream().mapToInt(Allocation::pickedPackageCount).sum(), lines, pallets, allocations, version);
-    }
     public record Line(Long id, Long orderId, String inboundCode, String fbaWarehouseCode, String destinationWarehouseId,
                        String destinationWarehouseCode, String destinationWarehouseName,
                        BigDecimal volumeCbm, int requiredPackageCount, int plannedPalletCount) {

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

@@ -14,6 +14,8 @@ import java.util.List;
 public interface InboundPlanOrderMapper {
     record ContainerOrderRef(String customerId, Long orderId, String currentStatus, String containerNo,
                              String orderType) { }
+    record ReceivingWarehouseSnapshot(String overseasWarehouseId, String overseasWarehouseCode,
+                                      String overseasWarehouseName) { }
 
     @Select("SELECT customer_id AS customerId,id AS orderId,current_status AS currentStatus,container_no AS containerNo," +
         "order_type AS orderType " +
@@ -26,7 +28,8 @@ public interface InboundPlanOrderMapper {
     @Select("SELECT o.id AS orderId,o.customer_id AS customerId,o.container_no AS containerNo," +
         "o.inbound_code AS inboundCode,o.current_status AS currentStatus,o.inbound_order_no AS inboundOrderNo," +
         "COALESCE(o.volume_cbm,0) AS volumeCbm,COALESCE(o.package_count,0) AS packageCount," +
-        "COALESCE(o.pallet_count,0) AS recommendedPalletCount," +
+        "COALESCE(o.pallet_count,0) AS recommendedPalletCount,o.overseas_warehouse_id AS overseasWarehouseId," +
+        "o.overseas_warehouse_code AS overseasWarehouseCode,o.overseas_warehouse_name AS overseasWarehouseName," +
         "NULLIF(o.fba_warehouse_code,'') AS fbaWarehouseCode," +
         "COALESCE(NULLIF(o.transfer_warehouse_id,''),MIN(NULLIF(d.destination_warehouse_id,''))) AS destinationWarehouseId," +
         "COALESCE(NULLIF(o.transfer_warehouse_code,''),MIN(NULLIF(d.destination_warehouse_code,''))) AS destinationWarehouseCode," +
@@ -36,12 +39,19 @@ public interface InboundPlanOrderMapper {
         "0 AS destinationMismatchCount " +
         "FROM ll_order o LEFT JOIN ll_order_detail d ON d.order_id=o.id " +
         "WHERE o.customer_id=#{customerId} AND o.id=#{orderId} " +
-        "GROUP BY o.id,o.customer_id,o.container_no,o.inbound_code,o.current_status,o.inbound_order_no,o.volume_cbm,o.package_count,o.pallet_count,o.fba_warehouse_code," +
+        "GROUP BY o.id,o.customer_id,o.container_no,o.inbound_code,o.current_status,o.inbound_order_no,o.volume_cbm,o.package_count,o.pallet_count," +
+        "o.overseas_warehouse_id,o.overseas_warehouse_code,o.overseas_warehouse_name,o.fba_warehouse_code," +
         "o.transfer_warehouse_id,o.transfer_warehouse_code,o.transfer_warehouse_name " +
         "ORDER BY o.id FOR UPDATE")
     List<SourceOrderSnapshot> lockOrder(@Param("customerId") String customerId,
                                         @Param("orderId") Long orderId);
 
+    @Select("SELECT overseas_warehouse_id AS overseasWarehouseId," +
+        "overseas_warehouse_code AS overseasWarehouseCode,overseas_warehouse_name AS overseasWarehouseName " +
+        "FROM ll_order WHERE customer_id=#{customerId} AND id=#{orderId} LIMIT 1")
+    ReceivingWarehouseSnapshot findReceivingWarehouse(@Param("customerId") String customerId,
+                                                       @Param("orderId") Long orderId);
+
     @Update("UPDATE ll_order SET inbound_order_no=#{planNo},current_status='INBOUND_PLANNED'," +
         "pallet_merge_flag='MERGED',pallet_count=#{palletCount},updated_at=#{updatedAt} " +
         "WHERE customer_id=#{customerId} AND id=#{orderId}")

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 l.destination_warehouse_id=#{q.overseasWarehouseId}</if>" +
+        "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND o.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,6 +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," +
         "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/model/SourceOrderSnapshot.java

@@ -12,30 +12,13 @@ public record SourceOrderSnapshot(
     BigDecimal volumeCbm,
     int packageCount,
     int recommendedPalletCount,
+    String overseasWarehouseId,
+    String overseasWarehouseCode,
+    String overseasWarehouseName,
     String fbaWarehouseCode,
     String destinationWarehouseId,
     String destinationWarehouseCode,
     String destinationWarehouseName,
     int destinationCount,
     int destinationMismatchCount
-) {
-    public SourceOrderSnapshot(Long orderId, String customerId, String containerNo, String inboundCode,
-                               String currentStatus, String inboundOrderNo, BigDecimal volumeCbm,
-                               int packageCount, String fbaWarehouseCode, String destinationWarehouseId,
-                               String destinationWarehouseCode, String destinationWarehouseName,
-                               int destinationCount, int destinationMismatchCount) {
-        this(orderId, customerId, containerNo, inboundCode, currentStatus, inboundOrderNo, volumeCbm,
-            packageCount, 0, fbaWarehouseCode, destinationWarehouseId, destinationWarehouseCode,
-            destinationWarehouseName, destinationCount, destinationMismatchCount);
-    }
-
-    public SourceOrderSnapshot(Long orderId, String customerId, String containerNo, String inboundCode,
-                               String currentStatus, String inboundOrderNo, BigDecimal volumeCbm,
-                               int packageCount, String destinationWarehouseId,
-                               String destinationWarehouseCode, String destinationWarehouseName,
-                               int destinationCount, int destinationMismatchCount) {
-        this(orderId, customerId, containerNo, inboundCode, currentStatus, inboundOrderNo, volumeCbm,
-            packageCount, 0, null, destinationWarehouseId, destinationWarehouseCode,
-            destinationWarehouseName, destinationCount, destinationMismatchCount);
-    }
-}
+) { }

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

@@ -6,22 +6,46 @@ import java.util.List;
 public final class ReceivingContainerResponses {
     private ReceivingContainerResponses() { }
 
-    public record Candidate(String sourceContainerBookingId, String containerNo, String status,
+    public record Candidate(String sourceContainerBookingId, String containerNo,
+                            String overseasWarehouseCode, String overseasWarehouseName, String status,
                             int totalOrderCount, int inboundCodeCount, int missingInboundCodeCount,
                             int planCount, int plannedInboundCodeCount, int pendingPlanCount,
                             List<String> destinationCodes, int plannedPalletCount,
                             int totalPackages, int receivedPackages,
                             boolean operable, boolean allPlansReady, String blockReason,
-                            LocalDateTime plannedArrivalAt, boolean currentAccount) { }
+                            LocalDateTime plannedArrivalAt, boolean currentAccount) {
+        public Candidate(String sourceContainerBookingId, String containerNo, String status,
+                         int totalOrderCount, int inboundCodeCount, int missingInboundCodeCount,
+                         int planCount, int plannedInboundCodeCount, int pendingPlanCount,
+                         List<String> destinationCodes, int plannedPalletCount, int totalPackages,
+                         int receivedPackages, boolean operable, boolean allPlansReady,
+                         String blockReason, LocalDateTime plannedArrivalAt, boolean currentAccount) {
+            this(sourceContainerBookingId, containerNo, null, null, status, totalOrderCount,
+                inboundCodeCount, missingInboundCodeCount, planCount, plannedInboundCodeCount,
+                pendingPlanCount, destinationCodes, plannedPalletCount, totalPackages,
+                receivedPackages, operable, allPlansReady, blockReason, plannedArrivalAt, currentAccount);
+        }
+    }
 
     public record WarehouseProfile(String warehouseId, String warehouseCode, String warehouseName) { }
 
-    public record Session(String containerNo, Long overseasWarehouseId, String overseasWarehouseName,
+    public record Session(String containerNo, Long overseasWarehouseId, String overseasWarehouseCode,
+                          String overseasWarehouseName,
                           String status, String operatorName, int version,
                           List<SignedPhoto> photos, LocalDateTime preparedAt, LocalDateTime signedAt,
                           LocalDateTime receivingAt, LocalDateTime completedAt,
                           int totalPackages, int receivedPackages, int pendingPackages,
-                          List<Inbound> inbounds) { }
+                          List<Inbound> inbounds) {
+        public Session(String containerNo, Long overseasWarehouseId, String overseasWarehouseName,
+                       String status, String operatorName, int version, List<SignedPhoto> photos,
+                       LocalDateTime preparedAt, LocalDateTime signedAt, LocalDateTime receivingAt,
+                       LocalDateTime completedAt, int totalPackages, int receivedPackages,
+                       int pendingPackages, List<Inbound> inbounds) {
+            this(containerNo, overseasWarehouseId, null, overseasWarehouseName, status, operatorName,
+                version, photos, preparedAt, signedAt, receivingAt, completedAt, totalPackages,
+                receivedPackages, pendingPackages, inbounds);
+        }
+    }
 
     public record SignedPhoto(ReceivingPhotoRole role, String fileId, String downloadPath) { }
 

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/entity/ReceivingContainerSession.java

@@ -20,6 +20,7 @@ public class ReceivingContainerSession {
     private String containerFactHash;
     private String containerNo;
     private Long overseasWarehouseId;
+    private String overseasWarehouseCode;
     private String overseasWarehouseName;
     private String operatorKey;
     private String operatorName;

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java

@@ -126,7 +126,7 @@ public class ReceivingContainerService {
     public ReceivingContainerResponses.Session detail(String operatorKey, long overseasWarehouseId, String containerNo) {
         List<InboundPlan> containerPlans = requirePlans(containerNo);
         String customerId = requireSingleCustomer(containerPlans, containerNo);
-        if (!warehouseEligible(containerPlans, overseasWarehouseId)) throw notFound("Container is assigned to another overseas warehouse");
+        if (!warehouseEligible(containerPlans, overseasWarehouseId)) throw conflict("当前柜已分配至其他海外接柜仓，无法在本仓操作");
         requireReceivingAvailable(customerId, containerNo);
         ReceivingContainerSession current = sessions.findActiveByOperator(activeOperatorKey(operatorKey));
         requireSessionWarehouse(current, overseasWarehouseId);
@@ -158,7 +158,7 @@ public class ReceivingContainerService {
         }
         List<InboundPlan> containerPlans = requirePlans(containerNo);
         String customerId = requireSingleCustomer(containerPlans, containerNo);
-        if (!warehouseEligible(containerPlans, overseasWarehouseId)) throw conflict("Container is assigned to another overseas warehouse");
+        if (!warehouseEligible(containerPlans, overseasWarehouseId)) throw conflict("当前柜已分配至其他海外接柜仓，无法在本仓操作");
         requireReceivingAvailable(customerId, containerNo);
         String activeOperatorKey = activeOperatorKey(operatorKey);
         ReceivingContainerSession active = sessions.lockActiveByOperator(activeOperatorKey);
@@ -167,7 +167,6 @@ public class ReceivingContainerService {
             if (!containerNo.equals(active.getContainerNo())) throw conflict("Finish the current container before selecting another one");
             WarehouseResourceGateway.WarehouseReference receivingWarehouse =
                 warehouse.requireActiveSharedWarehouse(overseasWarehouseId);
-            claimReceivingWarehouse(customerId, containerPlans, receivingWarehouse);
             ReceivingContainerResponses.Session result = snapshot(active, containerPlans);
             save(active, "PREPARE", request.idempotencyKey(), command, result); return result;
         }
@@ -176,13 +175,13 @@ public class ReceivingContainerService {
         }
         WarehouseResourceGateway.WarehouseReference receivingWarehouse =
             warehouse.requireActiveSharedWarehouse(overseasWarehouseId);
-        claimReceivingWarehouse(customerId, containerPlans, receivingWarehouse);
         LocalDateTime now = LocalDateTime.now();
         ReceivingContainerSession session = new ReceivingContainerSession();
         session.setId(IdWorker.getId()); session.setCustomerId(customerId); session.setContainerNo(containerNo);
         session.setSourceContainerBookingId(readiness.sourceContainerBookingId());
         session.setContainerFactHash(readiness.factHash());
         session.setOverseasWarehouseId(overseasWarehouseId);
+        session.setOverseasWarehouseCode(receivingWarehouse.warehouseCode());
         session.setOverseasWarehouseName(receivingWarehouse.warehouseName());
         session.setOperatorKey(operatorKey); session.setOperatorName(operatorName);
         session.setActiveOperatorKey(activeOperatorKey); session.setActiveContainerKey(activeContainerKey(containerNo));
@@ -412,7 +411,7 @@ public class ReceivingContainerService {
         ContainerReadiness value = readiness(bookingIds.iterator().next(), orderFacts, planFacts, lineFacts,
             overseasWarehouseId);
         if (value == null || !value.operable()) {
-            throw conflict(value == null ? "Container is assigned to another overseas warehouse" : value.blockReason());
+            throw conflict(value == null ? "当前柜已分配至其他海外接柜仓，无法在本仓操作" : value.blockReason());
         }
         return value;
     }
@@ -444,8 +443,13 @@ public class ReceivingContainerService {
                 try { assignedWarehouses.add(Long.valueOf(value)); }
                 catch (NumberFormatException ignored) { assignedWarehouses.add(Long.MIN_VALUE); }
             });
-        if (assignedWarehouses.size() > 1) throw conflict("Container plans have inconsistent receiving warehouse assignments");
-        if (!assignedWarehouses.isEmpty() && !assignedWarehouses.contains(overseasWarehouseId)) return null;
+        if (assignedWarehouses.size() > 1) throw conflict("柜内接柜仓分配不一致");
+        if (assignedWarehouses.size() != 1 || !assignedWarehouses.contains(overseasWarehouseId)) return null;
+        Set<String> warehouseCodes = orderFacts.stream().map(LastlegOrder::getOverseasWarehouseCode)
+            .map(ReceivingContainerService::trim).filter(Objects::nonNull).collect(Collectors.toSet());
+        Set<String> warehouseNames = orderFacts.stream().map(LastlegOrder::getOverseasWarehouseName)
+            .map(ReceivingContainerService::trim).filter(Objects::nonNull).collect(Collectors.toSet());
+        if (warehouseCodes.size() != 1 || warehouseNames.size() != 1) throw conflict("柜内接柜仓业务快照不一致");
         Set<String> customers = orderFacts.stream().map(LastlegOrder::getCustomerId).collect(Collectors.toSet());
         String containerNo = orderFacts.stream().map(LastlegOrder::getContainerNo).filter(Objects::nonNull).findFirst().orElse(null);
         int totalOrders = orderFacts.size();
@@ -488,7 +492,8 @@ public class ReceivingContainerService {
             inboundValues.stream().mapToInt(ReceivingContainerResponses.Inbound::plannedPalletCount).sum(),
             inboundValues.stream().mapToInt(ReceivingContainerResponses.Inbound::totalPackages).sum(),
             inboundValues.stream().mapToInt(ReceivingContainerResponses.Inbound::receivedPackages).sum());
-        return new ContainerReadiness(sourceContainerBookingId, containerNo, totalOrders, inboundCodes,
+        return new ContainerReadiness(sourceContainerBookingId, containerNo, warehouseCodes.iterator().next(),
+            warehouseNames.iterator().next(), totalOrders, inboundCodes,
             totalOrders - inboundCodes, planCount, plannedOrders, pending, allPlansReady, allPlansCompleted, shippingReady, operable,
             blockReason, arrival, factHash, totals);
     }
@@ -498,6 +503,7 @@ public class ReceivingContainerService {
         boolean active = current != null && value.containerNo().equals(current.getContainerNo());
         Totals totals = value.totals();
         return new ReceivingContainerResponses.Candidate(value.sourceContainerBookingId(), value.containerNo(),
+            value.overseasWarehouseCode(), value.overseasWarehouseName(),
             active ? current.getStatus() : "WAIT_SIGN", value.totalOrderCount(), value.inboundCodeCount(),
             value.missingInboundCodeCount(), value.planCount(), value.plannedInboundCodeCount(),
             value.pendingPlanCount(), totals.destinationCodes(), totals.plannedPalletCount(), totals.total(),
@@ -663,7 +669,7 @@ public class ReceivingContainerService {
         int total = inbounds.stream().mapToInt(ReceivingContainerResponses.Inbound::totalPackages).sum();
         int received = inbounds.stream().mapToInt(ReceivingContainerResponses.Inbound::receivedPackages).sum();
         return new ReceivingContainerResponses.Session(session.getContainerNo(), session.getOverseasWarehouseId(),
-            session.getOverseasWarehouseName(), session.getStatus(), session.getOperatorName(),
+            session.getOverseasWarehouseCode(), session.getOverseasWarehouseName(), session.getStatus(), session.getOperatorName(),
             value(session.getVersion()), signPhotos(session), session.getPreparedAt(), session.getSignedAt(),
             session.getReceivingAt(), session.getCompletedAt(), total, received, Math.max(0, total - received), inbounds);
     }
@@ -864,6 +870,7 @@ public class ReceivingContainerService {
                                                    String containerNo) {
         ReceivingContainerSession value = new ReceivingContainerSession(); value.setCustomerId(customerId);
         value.setOverseasWarehouseId(warehouse.warehouseId());
+        value.setOverseasWarehouseCode(warehouse.warehouseCode());
         value.setOverseasWarehouseName(warehouse.warehouseName());
         value.setOperatorKey(operatorKey); value.setContainerNo(containerNo); value.setStatus("WAIT_SIGN"); value.setVersion(0);
         return value;
@@ -881,7 +888,7 @@ public class ReceivingContainerService {
         if (assigned.size() > 1) {
             throw conflict("Container plans have inconsistent receiving warehouse assignments");
         }
-        return assigned.isEmpty() || assigned.contains(overseasWarehouseId);
+        return assigned.size() == 1 && assigned.contains(overseasWarehouseId);
     }
 
     private void requireReceivingAvailable(String customerId, String containerNo) {
@@ -890,30 +897,6 @@ public class ReceivingContainerService {
         }
     }
 
-    private void claimReceivingWarehouse(String customerId, List<InboundPlan> containerPlans,
-                                          WarehouseResourceGateway.WarehouseReference warehouse) {
-        long overseasWarehouseId = warehouse.warehouseId();
-        String warehouseId = String.valueOf(overseasWarehouseId);
-        for (InboundPlan plan : containerPlans) {
-            int claimed = plans.claimReceivingWarehouse(customerId, plan.getId(), overseasWarehouseId);
-            InboundPlan actual = plans.selectById(plan.getId());
-            if ((claimed == 0 && actual == null) || actual == null
-                || !Objects.equals(actual.getOverseasWarehouseId(), overseasWarehouseId)) {
-                throw conflict("Container was claimed by another overseas warehouse");
-            }
-            plan.setOverseasWarehouseId(overseasWarehouseId);
-            for (InboundPlanLine line : lines.selectList(new LambdaQueryWrapper<InboundPlanLine>()
-                .eq(InboundPlanLine::getCustomerId, customerId).eq(InboundPlanLine::getPlanId, plan.getId()))) {
-                orders.claimReceivingWarehouse(customerId, line.getOrderId(), warehouseId,
-                    warehouse.warehouseName());
-                LastlegOrder order = orders.selectById(line.getOrderId());
-                if (order == null || !warehouseId.equals(order.getOverseasWarehouseId())) {
-                    throw conflict("Inbound order was claimed by another overseas warehouse");
-                }
-            }
-        }
-    }
-
     private void requireSessionWarehouse(ReceivingContainerSession session, long overseasWarehouseId) {
         if (session != null && !Objects.equals(session.getOverseasWarehouseId(), overseasWarehouseId)) {
             throw conflict("Current container belongs to another overseas warehouse");
@@ -990,6 +973,7 @@ public class ReceivingContainerService {
     private record Totals(int inboundCount, List<String> destinationCodes, int plannedPalletCount,
                           int total, int received) { }
     private record ContainerReadiness(String sourceContainerBookingId, String containerNo,
+                                      String overseasWarehouseCode, String overseasWarehouseName,
                                       int totalOrderCount, int inboundCodeCount, int missingInboundCodeCount,
                                       int planCount, int plannedInboundCodeCount, int pendingPlanCount,
                                       boolean allPlansReady, boolean allPlansCompleted, boolean shippingReady, boolean operable, String blockReason,

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

@@ -126,6 +126,15 @@ public class InboundPlanService {
         plan.setCustomerId(customerId);
         plan.setSourceOrderId(selectedOrderId);
         plan.setContainerNo(containerNo);
+        String receivingWarehouseId = trimToNull(orders.get(0).overseasWarehouseId());
+        if (receivingWarehouseId == null || orders.stream().anyMatch(order ->
+            !Objects.equals(receivingWarehouseId, trimToNull(order.overseasWarehouseId())))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内接柜仓未预分配或存在不一致");
+        }
+        try { plan.setOverseasWarehouseId(Long.parseLong(receivingWarehouseId)); }
+        catch (NumberFormatException exception) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "接柜仓ID格式无效", exception);
+        }
         plan.setStatus("PENDING_ASSIGNMENT");
         plan.setLineCount(orders.size());
         plan.setTotalVolumeCbm(orders.stream().map(SourceOrderSnapshot::volumeCbm)
@@ -495,6 +504,13 @@ public class InboundPlanService {
         if (customerId != null && !customerId.equals(plan.getCustomerId())) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inbound plan not found");
         }
+        InboundPlanOrderMapper.ReceivingWarehouseSnapshot receivingWarehouse = orderMapper.findReceivingWarehouse(
+            plan.getCustomerId(), plan.getSourceOrderId());
+        if (receivingWarehouse == null || trimToNull(receivingWarehouse.overseasWarehouseId()) == null
+            || trimToNull(receivingWarehouse.overseasWarehouseCode()) == null
+            || trimToNull(receivingWarehouse.overseasWarehouseName()) == null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "入库计划关联订单缺少接柜仓预分配事实");
+        }
         List<InboundPlanLine> lines = lineMapper.selectList(new LambdaQueryWrapper<InboundPlanLine>()
             .eq(InboundPlanLine::getPlanId, plan.getId()).orderByAsc(InboundPlanLine::getId));
         List<InboundPlanPallet> pallets = palletMapper.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
@@ -504,8 +520,10 @@ public class InboundPlanService {
                 .eq(InboundPlanPalletAllocation::getPlanId, plan.getId())
                 .orderByAsc(InboundPlanPalletAllocation::getId));
         return new InboundPlanResponse(plan.getId(), plan.getPlanNo(), plan.getCustomerId(), plan.getSourceOrderId(),
-            plan.getContainerNo(),
+            plan.getContainerNo(), receivingWarehouse.overseasWarehouseCode(), receivingWarehouse.overseasWarehouseName(),
             plan.getStatus(), plan.getLineCount(), plan.getPalletCount(), plan.getTotalVolumeCbm(),
+            lines.stream().mapToInt(InboundPlanLine::getRequiredPackageCount).sum(),
+            allocations.stream().mapToInt(InboundPlanPalletAllocation::getPickedPackageCount).sum(),
             lines.stream().map(line -> new InboundPlanResponse.Line(line.getId(), line.getOrderId(), line.getInboundCode(), line.getFbaWarehouseCode(),
                 line.getDestinationWarehouseId(), line.getDestinationWarehouseCode(), line.getDestinationWarehouseName(),
                 line.getVolumeCbm(), line.getRequiredPackageCount(), line.getPlannedPalletCount())).toList(),

lastleg-service/src/main/java/com/baiyue/lastleg/mapper/LastlegOrderMapper.java

@@ -28,6 +28,13 @@ public interface LastlegOrderMapper extends BaseMapper<LastlegOrder> {
     String CONTAINER_PROGRESS_COLUMNS = "SELECT o.source_container_booking_id AS sourceContainerBookingId," +
         "CASE WHEN COUNT(NULLIF(o.container_no,''))=COUNT(*) AND COUNT(DISTINCT NULLIF(o.container_no,''))=1 " +
         "THEN MAX(NULLIF(o.container_no,'')) ELSE NULL END AS containerNo," +
+        "CASE WHEN COUNT(DISTINCT NULLIF(o.overseas_warehouse_id,''))=1 THEN MAX(o.overseas_warehouse_id) ELSE NULL END AS overseasWarehouseId," +
+        "CASE WHEN COUNT(DISTINCT NULLIF(o.overseas_warehouse_code,''))=1 THEN MAX(o.overseas_warehouse_code) ELSE NULL END AS overseasWarehouseCode," +
+        "CASE WHEN COUNT(DISTINCT NULLIF(o.overseas_warehouse_name,''))=1 THEN MAX(o.overseas_warehouse_name) ELSE NULL END AS overseasWarehouseName," +
+        "CASE WHEN COUNT(DISTINCT o.receiving_warehouse_version)=1 THEN MAX(o.receiving_warehouse_version) ELSE -1 END AS assignmentVersion," +
+        "CASE WHEN COUNT(DISTINCT o.receiving_warehouse_version)=1 AND NOT EXISTS (SELECT 1 FROM ll_receiving_container_session s WHERE s.source_container_booking_id=o.source_container_booking_id) THEN TRUE ELSE FALSE END AS canChangeReceivingWarehouse," +
+        "CASE WHEN COUNT(DISTINCT o.receiving_warehouse_version)&lt;&gt;1 THEN '柜内接柜仓分配版本不一致' " +
+        "WHEN EXISTS (SELECT 1 FROM ll_receiving_container_session s WHERE s.source_container_booking_id=o.source_container_booking_id) THEN '海外PDA已建立接柜会话，接柜仓已永久锁定' ELSE NULL END AS receivingWarehouseLockReason," +
         "COUNT(*) AS totalOrderCount,COUNT(DISTINCT NULLIF(TRIM(o.inbound_code),'')) AS inboundCodeCount," +
         "SUM(CASE WHEN NULLIF(TRIM(o.inbound_code),'') IS NULL THEN 1 ELSE 0 END) AS missingInboundCodeCount," +
         "COUNT(DISTINCT p.id) AS planCount," +
@@ -114,6 +121,25 @@ public interface LastlegOrderMapper extends BaseMapper<LastlegOrder> {
     List<String> lockContainerNumbers(
         @Param("sourceContainerBookingId") String sourceContainerBookingId);
 
+    @Select("SELECT * FROM ll_order WHERE source_container_booking_id=#{sourceContainerBookingId} ORDER BY customer_id,id FOR UPDATE")
+    List<LastlegOrder> lockContainerOrders(@Param("sourceContainerBookingId") String sourceContainerBookingId);
+
+    @Select("SELECT COUNT(*) FROM ll_receiving_container_session WHERE source_container_booking_id=#{sourceContainerBookingId}")
+    long countReceivingSessions(@Param("sourceContainerBookingId") String sourceContainerBookingId);
+
+    @Update("UPDATE ll_order SET overseas_warehouse_id=#{warehouseId},overseas_warehouse_code=#{warehouseCode}," +
+        "overseas_warehouse_name=#{warehouseName},receiving_warehouse_version=receiving_warehouse_version+1,updated_at=NOW(3) " +
+        "WHERE source_container_booking_id=#{sourceContainerBookingId} AND receiving_warehouse_version=#{expectedVersion}")
+    int updateContainerReceivingWarehouse(@Param("sourceContainerBookingId") String sourceContainerBookingId,
+        @Param("warehouseId") String warehouseId, @Param("warehouseCode") String warehouseCode,
+        @Param("warehouseName") String warehouseName, @Param("expectedVersion") int expectedVersion);
+
+    @Update("UPDATE ll_inbound_plan p JOIN ll_order o ON o.id=p.source_order_id AND o.customer_id=p.customer_id " +
+        "SET p.overseas_warehouse_id=#{warehouseId},p.version=p.version+1,p.updated_at=NOW(3) " +
+        "WHERE o.source_container_booking_id=#{sourceContainerBookingId}")
+    int updateContainerPlanReceivingWarehouse(@Param("sourceContainerBookingId") String sourceContainerBookingId,
+        @Param("warehouseId") long warehouseId);
+
     @Select("SELECT COUNT(*) FROM ll_order WHERE customer_id=#{customerId} AND container_no=#{containerNo}")
     long countContainer(@Param("customerId") String customerId, @Param("containerNo") String containerNo);
 
@@ -135,13 +161,6 @@ public interface LastlegOrderMapper extends BaseMapper<LastlegOrder> {
     int transferPickedToShipped(@Param("customerId") String customerId, @Param("id") Long id,
                                 @Param("packages") long packages, @Param("outboundNo") String outboundNo);
 
-    @Update("UPDATE ll_order SET overseas_warehouse_id=#{warehouseId},overseas_warehouse_name=#{warehouseName}," +
-        "updated_at=NOW(3) WHERE id=#{orderId} AND customer_id=#{customerId} " +
-        "AND (overseas_warehouse_id IS NULL OR overseas_warehouse_id=#{warehouseId})")
-    int claimReceivingWarehouse(@Param("customerId") String customerId, @Param("orderId") long orderId,
-                                @Param("warehouseId") String warehouseId,
-                                @Param("warehouseName") String warehouseName);
-
     @Update("UPDATE ll_order SET pallet_merge_flag=#{flag}," +
         "pallet_merge_batch_id=CASE WHEN #{flag} IS NULL THEN NULL ELSE pallet_merge_batch_id END," +
         "updated_at=#{updatedAt} " +

lastleg-service/src/main/java/com/baiyue/lastleg/mapper/ReceivingWarehouseOperationMapper.java

@@ -0,0 +1,13 @@
+package com.baiyue.lastleg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baiyue.lastleg.entity.ReceivingWarehouseOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface ReceivingWarehouseOperationMapper extends BaseMapper<ReceivingWarehouseOperation> {
+    @Select("SELECT * FROM ll_receiving_warehouse_operation WHERE idempotency_key=#{key} LIMIT 1")
+    ReceivingWarehouseOperation findByKey(@Param("key") String key);
+}

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

@@ -15,6 +15,8 @@ import com.baiyue.lastleg.entity.LastlegOrderDetail;
 import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
 import com.baiyue.lastleg.entity.LastlegOrderFee;
 import com.baiyue.lastleg.entity.LastlegOrderOperationLog;
+import com.baiyue.lastleg.entity.ReceivingWarehouseOperation;
+import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanCarton;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanCartonMapper;
 import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
@@ -23,6 +25,7 @@ import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderFeeMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
+import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
 import com.baiyue.lastleg.model.LastlegOrderType;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
@@ -37,6 +40,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -60,6 +64,8 @@ public class LastlegOrderService {
     @Resource private FbaWarehouseValidator fbaWarehouseValidator;
     @Resource private InventoryCommandService inventory;
     @Resource private InboundOrderDetainedOutboxService detainedOutbox;
+    @Resource private ReceivingWarehouseOperationMapper receivingWarehouseOperations;
+    @Resource private WarehouseResourceGateway warehouseResourceGateway;
 
     public PageResult<LastlegOrderSummary> page(String customerId, LastlegOrderRequests.Query query) {
         Page<LastlegOrder> page = orderMapper.selectPage(
@@ -99,9 +105,58 @@ public class LastlegOrderService {
             orderMapper.findContainerProgressItems(bookingId));
     }
 
+    @Transactional
+    public ContainerPlanProgressSummary changeReceivingWarehouse(String sourceContainerBookingId,
+        String idempotencyKey, LastlegOrderRequests.ChangeReceivingWarehouse request, String operatorName) {
+        String bookingId = normalizeBookingId(sourceContainerBookingId);
+        String key = normalizeIdempotencyKey(idempotencyKey);
+        String requestHash = hash(bookingId + "\n" + request.overseasWarehouseId() + "\n"
+            + request.expectedVersion() + "\n" + Objects.toString(request.remark(), ""));
+        ReceivingWarehouseOperation replay = receivingWarehouseOperations.findByKey(key);
+        if (replay != null) {
+            if (!bookingId.equals(replay.getSourceContainerBookingId()) || !requestHash.equals(replay.getRequestHash())) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT,
+                    "Idempotency-Key 已用于其他接柜仓修改请求");
+            }
+            return requireFrozenContainer(orderMapper.findContainerProgress(bookingId));
+        }
+
+        List<LastlegOrder> orders = orderMapper.lockContainerOrders(bookingId);
+        if (orders.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜不存在");
+        int version = requireSingleAssignmentVersion(orders);
+        if (version != request.expectedVersion()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "接柜仓分配版本已变化，请刷新后重试");
+        }
+        if (orderMapper.countReceivingSessions(bookingId) > 0) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT,
+                "海外PDA已建立接柜会话，接柜仓已永久锁定");
+        }
+        WarehouseResourceGateway.WarehouseReference warehouse =
+            warehouseResourceGateway.requireActiveSharedWarehouse(request.overseasWarehouseId());
+        int updated = orderMapper.updateContainerReceivingWarehouse(bookingId,
+            Long.toString(warehouse.warehouseId()), warehouse.warehouseCode(), warehouse.warehouseName(), version);
+        if (updated != orders.size()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内接柜仓分配发生并发变化");
+        }
+        orderMapper.updateContainerPlanReceivingWarehouse(bookingId, warehouse.warehouseId());
+        ReceivingWarehouseOperation operation = new ReceivingWarehouseOperation();
+        operation.setId(IdWorker.getId()); operation.setSourceContainerBookingId(bookingId);
+        operation.setIdempotencyKey(key); operation.setRequestHash(requestHash);
+        operation.setResultVersion(version + 1); operation.setOperatorName(operatorName);
+        operation.setRemark(request.remark() == null ? null : request.remark().trim());
+        operation.setCreatedAt(LocalDateTime.now()); receivingWarehouseOperations.insert(operation);
+        return requireFrozenContainer(orderMapper.findContainerProgress(bookingId));
+    }
+
     private ContainerPlanProgressSummary requireFrozenContainer(ContainerPlanProgressSummary summary) {
+        if (summary == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜不存在");
         try {
             ContainerNumbers.requireCanonical(summary.containerNo());
+            if (!StringUtils.hasText(summary.overseasWarehouseId())
+                || !StringUtils.hasText(summary.overseasWarehouseCode())
+                || !StringUtils.hasText(summary.overseasWarehouseName()) || summary.assignmentVersion() < 0) {
+                throw new IllegalArgumentException("receiving warehouse assignment drift");
+            }
             return summary;
         } catch (IllegalArgumentException exception) {
             throw new ResponseStatusException(HttpStatus.CONFLICT,
@@ -109,6 +164,42 @@ public class LastlegOrderService {
         }
     }
 
+    private String normalizeBookingId(String value) {
+        String result = value == null ? null : value.trim();
+        if (!StringUtils.hasText(result) || result.length() > 128) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "来源柜预订ID不能为空");
+        }
+        return result;
+    }
+
+    private String normalizeIdempotencyKey(String value) {
+        String result = value == null ? null : value.trim();
+        if (!StringUtils.hasText(result) || result.length() > 255) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Idempotency-Key 必填且不得超过255字符");
+        }
+        return result;
+    }
+
+    private int requireSingleAssignmentVersion(List<LastlegOrder> orders) {
+        Integer version = orders.get(0).getReceivingWarehouseVersion();
+        if (version == null || orders.stream().anyMatch(order -> !Objects.equals(version,
+            order.getReceivingWarehouseVersion()) || !StringUtils.hasText(order.getOverseasWarehouseId())
+            || !StringUtils.hasText(order.getOverseasWarehouseCode())
+            || !StringUtils.hasText(order.getOverseasWarehouseName()))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内接柜仓分配事实不一致");
+        }
+        return version;
+    }
+
+    private String hash(String value) {
+        try {
+            return java.util.HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
+                .digest(value.getBytes(StandardCharsets.UTF_8)));
+        } catch (Exception exception) {
+            throw new IllegalStateException(exception);
+        }
+    }
+
     public LastlegOrderDetailResponse detail(String customerId, long orderId) {
         LastlegOrder order = findOwned(customerId, orderId);
         List<LastlegOrderDetail> cargo = detailMapper.selectList(new LambdaQueryWrapper<LastlegOrderDetail>()
@@ -434,7 +525,7 @@ public class LastlegOrderService {
         return new LastlegOrderSummary(o.getId(), o.getOrderNo(), o.getOrderType(),
             LastlegOrderType.labelOf(o.getOrderType()), o.getDestinationType(), o.getSourceInboundId(),
             displayInboundCode(o), o.getLxCode(), o.getSourceOrderNo(), o.getCustomerId(), o.getCustomerName(), o.getOverseasWarehouseId(),
-            o.getOverseasWarehouseName(), o.getTransferWarehouseId(), o.getTransferWarehouseCode(),
+            o.getOverseasWarehouseCode(), o.getOverseasWarehouseName(), o.getTransferWarehouseId(), o.getTransferWarehouseCode(),
             o.getTransferWarehouseName(), o.getFbaWarehouseCode(), o.getContainerNo(), o.getContainerStatus(),
             o.getAbnormal(), o.getDetained(), o.getPalletCount(), o.getPackageCount(), o.getVolumeCbm(),
             o.getProductQuantity(), o.getVolumeWeightKg(), o.getEstimatedArrivalAt(), o.getActualArrivalAt(),

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

@@ -30,6 +30,9 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 @Service
 public class LoadingCompletedConsumer {
+    static final String DEFAULT_RECEIVING_WAREHOUSE_ID = "193000000000200003";
+    static final String DEFAULT_RECEIVING_WAREHOUSE_CODE = "US-LAX-01";
+    static final String DEFAULT_RECEIVING_WAREHOUSE_NAME = "洛杉矶仓";
     @Resource private LastlegEventInboxMapper inboxMapper;
     @Resource private LastlegOrderMapper orderMapper;
     @Resource private LastlegInboundOrderMapper inboundOrderMapper;
@@ -240,7 +243,10 @@ public class LoadingCompletedConsumer {
         order.setSourceOrderId(source.sourceOrderId()); order.setSourceOrderNo(source.sourceOrderNo()); order.setRootOrderId(source.rootOrderId());
         order.setCustomerName(customerName);
         order.setSourceWarehouseId(payload.warehouseId()); order.setSourceWarehouseName(payload.warehouseName());
-        order.setOverseasWarehouseId(null); order.setOverseasWarehouseName(null);
+        order.setOverseasWarehouseId(DEFAULT_RECEIVING_WAREHOUSE_ID);
+        order.setOverseasWarehouseCode(DEFAULT_RECEIVING_WAREHOUSE_CODE);
+        order.setOverseasWarehouseName(DEFAULT_RECEIVING_WAREHOUSE_NAME);
+        order.setReceivingWarehouseVersion(0);
         order.setFbaWarehouseCode(source.destinationWarehouseCode()); order.setContainerNo(containerNo);
         order.setContainerStatus("待转柜"); order.setAbnormal(false); order.setDetained(false);
         order.setPackageCount(source.packageCount());