Merge origin/dev and resolve backend conflicts

2026-09-08 20:50:28 +08:00
parent 249bf0ab4b da5cf0eb64
commit 4d4008cdb3
342 changed files with 13161 additions and 2296 deletions
@@ -3,8 +3,8 @@ package com.baiyue.lastleg.inboundplan.controller;
 import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
-import com.baiyue.lastleg.inboundplan.dto.ConvertInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.dto.ConvertContainerInboundPlanRequest;
+import com.baiyue.lastleg.inboundplan.dto.ManualInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.dto.BatchFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.dto.FbaAppointmentResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
@@ -44,19 +44,24 @@ public class InboundPlanController {
        return ApiResponse.success(service.page(scope(user, customerId), query));
    }

-    @PostMapping("/convert")
+    @PostMapping("/manual")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_CREATE + "')")
-    /** 由平台人工将待分配尾程订单转换为入仓计划。 */
-    @Operation(summary = "人工创建入仓计划", description = "头程装柜完成只生成待分配尾程订单；平台确认后调用本接口创建入仓计划。Required authority: "
+    @Operation(summary = "手工填写并创建单票入仓计划", description = "要求订单版本和 Idempotency-Key；仓库主档、入仓码及客户归属均由服务端校验。Required authority: "
        + OverseasPermissions.INBOUND_ORDER_CREATE)
-    public ApiResponse<InboundPlanResponse> convert(@AuthenticationPrincipal AuthenticatedUser user,
-                                                    @Valid @RequestBody ConvertInboundPlanRequest request) {
-        return ApiResponse.success(service.convert(convertScope(user, request.customerId()), request.orderId()));
+    public ApiResponse<InboundPlanResponse> manual(@AuthenticationPrincipal AuthenticatedUser user,
+                                                   @RequestHeader("Idempotency-Key") String idempotencyKey,
+                                                   @Valid @RequestBody ManualInboundPlanRequest request) {
+        if (user == null || user.tenantId() == null || user.tenantId() != 0L || !"PLATFORM".equals(user.appCode())) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "仅平台账号可手工创建入仓计划");
+        }
+        convertScope(user, request.customerId());
+        String operatorId = user.userId() == null ? user.username() : String.valueOf(user.userId());
+        return ApiResponse.success(service.convertManual(request, idempotencyKey, operatorId));
    }

    @PostMapping("/convert-container")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_CREATE + "')")
-    @Operation(summary = "按整柜批量生成入库计划", description = "平台按 sourceContainerBookingId 锁定整柜订单；每个入仓码独立生成计划，整批原子且可幂等重放。Required authority: " + OverseasPermissions.INBOUND_ORDER_CREATE)
+    @Operation(summary = "按整柜批量生成剩余入库计划", description = "平台按 sourceContainerBookingId 锁定整柜订单；保留已有有效计划，只为剩余入仓码分别生成独立计划，整批原子且可幂等重放。Required authority: " + OverseasPermissions.INBOUND_ORDER_CREATE)
    public ApiResponse<java.util.List<InboundPlanResponse>> convertContainer(
        @AuthenticationPrincipal AuthenticatedUser user,
        @Valid @RequestBody ConvertContainerInboundPlanRequest request) {
@@ -1,10 +0,0 @@
-package com.baiyue.lastleg.inboundplan.dto;
-
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-public record ConvertInboundPlanRequest(
-    @NotNull Long orderId,
-    @Size(max = 128) String customerId
-) {
-}
@@ -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);
-    }
-}
+) { }
@@ -2,6 +2,7 @@ package com.baiyue.lastleg.inboundplan.dto;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.List;

 public record InboundPlanResponse(
@@ -10,6 +11,8 @@ public record InboundPlanResponse(
    String customerId,
    Long sourceOrderId,
    String containerNo,
+    String overseasWarehouseCode,
+    String overseasWarehouseName,
    String status,
    int lineCount,
    int palletCount,
@@ -19,24 +22,15 @@ public record InboundPlanResponse(
    List<Line> lines,
    List<Pallet> pallets,
    List<Allocation> allocations,
-    int version
+    int version,
+    LocalDate plannedArrivalDate,
+    String palletType,
+    boolean assigned,
+    boolean mergeRequired,
+    boolean urgent,
+    String creationMode,
+    String remark
 ) {
-    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) {
@@ -46,7 +40,7 @@ public record InboundPlanResponse(
                         String destinationWarehouseCode, String destinationWarehouseName,
                         BigDecimal capacityCbm, BigDecimal allocatedVolumeCbm, int sequenceNo,
                         Long warehousePalletId, Long warehouseLocationId, Long warehouseResourceLockId,
-                         String assignmentStatus, LocalDateTime lockedAt, BigDecimal actualVolumeCbm,
+                         String palletType, String assignmentStatus, LocalDateTime lockedAt, BigDecimal actualVolumeCbm,
                         int actualPackageCount) {
    }

@@ -0,0 +1,21 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.time.LocalDate;
+
+public record ManualInboundPlanRequest(
+    @NotBlank @Size(max = 128) String customerId,
+    @NotNull Long orderId,
+    @NotNull @Min(0) Integer expectedOrderVersion,
+    @NotNull LocalDate plannedArrivalDate,
+    @NotNull @Min(1) @Max(999) Integer palletCount,
+    @NotBlank @Size(max = 32) String palletType,
+    @NotNull Boolean assigned,
+    @NotNull Boolean mergeRequired,
+    @NotNull Boolean urgent,
+    @Size(max = 1000) String remark
+) { }
@@ -8,6 +8,7 @@ import lombok.Data;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalDate;

@Data
@TableName("ll_inbound_plan")
@@ -19,6 +20,13 @@ public class InboundPlan {
    private Long sourceOrderId;
    private String containerNo;
    private Long overseasWarehouseId;
+    private LocalDate plannedArrivalDate;
+    private String palletType;
+    private Boolean assignedFlag;
+    private Boolean mergeRequired;
+    private Boolean urgentFlag;
+    private String creationMode;
+    private String planRemark;
    private String status;
    private Integer lineCount;
    private Integer palletCount;
@@ -16,6 +16,8 @@ public class InboundPlanPallet {
    private String customerId;
    private Long planId;
    private String palletNo;
+    private String sourcePalletNo;
+    private String palletType;
    private String destinationWarehouseId;
    private String destinationWarehouseCode;
    private String destinationWarehouseName;
@@ -14,6 +14,19 @@ 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) { }
+    record ContainerWarehouseRef(String customerId, Long orderId, String sourceContainerBookingId,
+                                 String overseasWarehouseId) { }
+
+    @Select("SELECT c.customer_id AS customerId,c.id AS orderId," +
+        "c.source_container_booking_id AS sourceContainerBookingId,c.overseas_warehouse_id AS overseasWarehouseId " +
+        "FROM ll_order target JOIN ll_order c ON c.source_container_booking_id=target.source_container_booking_id " +
+        "WHERE target.customer_id=#{customerId} AND target.id=#{orderId} " +
+        "AND target.source_container_booking_id IS NOT NULL AND target.source_container_booking_id!='' " +
+        "ORDER BY c.customer_id,c.id FOR UPDATE")
+    List<ContainerWarehouseRef> lockContainerWarehouseFacts(@Param("customerId") String customerId,
+                                                             @Param("orderId") Long orderId);

    @Select("SELECT customer_id AS customerId,id AS orderId,current_status AS currentStatus,container_no AS containerNo," +
        "order_type AS orderType " +
@@ -26,22 +39,30 @@ 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," +
        "COALESCE(NULLIF(o.transfer_warehouse_name,''),MIN(NULLIF(d.destination_warehouse_name,''))) AS destinationWarehouseName," +
        "CASE WHEN COALESCE(NULLIF(o.transfer_warehouse_id,''),NULLIF(o.transfer_warehouse_code,'')) IS NOT NULL THEN 1 " +
        "ELSE COUNT(DISTINCT COALESCE(NULLIF(d.destination_warehouse_id,''),NULLIF(d.destination_warehouse_code,''),'#EMPTY#')) END AS destinationCount," +
-        "0 AS destinationMismatchCount " +
+        "0 AS destinationMismatchCount,o.detained AS detained,o.version AS version " +
        "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," +
-        "o.transfer_warehouse_id,o.transfer_warehouse_code,o.transfer_warehouse_name " +
+        "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,o.detained,o.version " +
        "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}")
@@ -49,6 +70,17 @@ public interface InboundPlanOrderMapper {
                    @Param("planNo") String planNo, @Param("palletCount") int palletCount,
                    @Param("updatedAt") LocalDateTime updatedAt);

+    @Update("UPDATE ll_order SET inbound_order_no=#{planNo},current_status='INBOUND_PLANNED'," +
+        "pallet_merge_flag=CASE WHEN #{mergeRequired}=1 THEN 'MERGE_REQUIRED' ELSE NULL END," +
+        "pallet_count=#{palletCount},version=version+1,updated_at=#{updatedAt} " +
+        "WHERE customer_id=#{customerId} AND id=#{orderId} AND version=#{expectedVersion} AND detained=0 " +
+        "AND current_status IN ('PENDING_ASSIGNMENT','DESTINATION_ASSIGNED') AND inbound_order_no IS NULL")
+    int markPlannedManual(@Param("customerId") String customerId, @Param("orderId") Long orderId,
+                          @Param("planNo") String planNo, @Param("palletCount") int palletCount,
+                          @Param("mergeRequired") boolean mergeRequired,
+                          @Param("expectedVersion") int expectedVersion,
+                          @Param("updatedAt") LocalDateTime updatedAt);
+
    @Insert("INSERT INTO ll_loading_order_status_history(customer_id,order_id,from_status,to_status,remark,created_at) " +
        "VALUES(#{customerId},#{orderId},#{fromStatus},'INBOUND_PLANNED',#{remark},#{createdAt})")
    int insertHistory(@Param("customerId") String customerId, @Param("orderId") Long orderId, @Param("fromStatus") String fromStatus,
@@ -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," +
@@ -12,30 +12,27 @@ 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
+    int destinationMismatchCount,
+    boolean detained,
+    int version
 ) {
    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) {
+                               int packageCount, int recommendedPalletCount, String overseasWarehouseId,
+                               String overseasWarehouseCode, String overseasWarehouseName, 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);
+            packageCount, recommendedPalletCount, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName,
+            fbaWarehouseCode, destinationWarehouseId, destinationWarehouseCode, destinationWarehouseName,
+            destinationCount, destinationMismatchCount, false, 0);
    }
 }
@@ -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) { }

@@ -25,6 +25,7 @@ public class InboundStockReceipt {
    private String productNameEn;
    private Long warehousePalletId;
    private String palletNo;
+    private String sourcePalletNo;
    private Long warehouseLocationId;
    private String warehouseLocationCode;
    private String batchNo;
@@ -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;
@@ -59,10 +59,20 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
                "businessId", businessId, "reservationKey", reservationKey))
            .retrieve()
            .onStatus(HttpStatusCode::isError, (request, result) -> {
-                throw new IllegalStateException("Warehouse rejected pallet reservation: HTTP " + result.getStatusCode());
+                throw warehouseReservationFailure(result.getStatusCode());
            })
            .body(ReserveEnvelope.class);
-        if (response == null || response.data() == null) throw new IllegalStateException("Warehouse returned an empty lock response");
+        if (response == null) {
+            throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
+                "Warehouse resource reservation returned no response");
+        }
+        if (response.data() == null) {
+            HttpStatus status = "A0409".equals(response.code()) ? HttpStatus.CONFLICT
+                : "A0404".equals(response.code()) ? HttpStatus.NOT_FOUND : HttpStatus.SERVICE_UNAVAILABLE;
+            throw new ResponseStatusException(status,
+                response.message() == null || response.message().isBlank()
+                    ? "Warehouse resource reservation was rejected" : response.message());
+        }
        return response.data().lockId();
    }

@@ -120,6 +130,7 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
            throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
                "Warehouse pallet service returned no usable response");
        }
+        requireReservable(response.data());
        return new WarehousePalletReference(response.data().id(), response.data().palletCode(),
            response.data().warehouseId(), response.data().locationId(), response.data().status(),
            response.data().fbaWarehouseCode(), response.data().unitPrice(), response.data().version());
@@ -133,6 +144,7 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
            .body(WarehousePalletResponse.class);
        if (response == null || response.data() == null) throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
            "Warehouse pallet service returned no usable response");
+        requireReservable(response.data());
        return new WarehousePalletReference(response.data().id(), response.data().palletCode(), response.data().warehouseId(),
            response.data().locationId(), response.data().status(), response.data().fbaWarehouseCode(),
            response.data().unitPrice(), response.data().version());
@@ -144,6 +156,26 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
            status.value() == 404 ? "Warehouse pallet was not found" : "Warehouse pallet lookup failed");
    }

+    private ResponseStatusException warehouseReservationFailure(HttpStatusCode status) {
+        HttpStatus mapped = status.value() == 409 ? HttpStatus.CONFLICT
+            : status.value() == 404 ? HttpStatus.NOT_FOUND
+            : status.is4xxClientError() ? HttpStatus.BAD_REQUEST : HttpStatus.SERVICE_UNAVAILABLE;
+        return new ResponseStatusException(mapped, "Warehouse resource reservation was rejected");
+    }
+
+    private void requireReservable(WarehousePalletData pallet) {
+        if (pallet.reservable()) return;
+        String reason = switch (pallet.reservationBlockReason() == null
+            ? "RESOURCE_STATE_UNKNOWN" : pallet.reservationBlockReason()) {
+            case "PALLET_NOT_IDLE" -> "Pallet is not idle";
+            case "LOCATION_NOT_FOUND" -> "Pallet location was not found";
+            case "VIRTUAL_LOCATION_NOT_ACTIVE" -> "Pallet virtual location is not active";
+            case "LOCATION_NOT_IDLE" -> "Pallet location is not idle";
+            default -> "Pallet resource availability could not be verified";
+        };
+        throw new ResponseStatusException(HttpStatus.CONFLICT, reason);
+    }
+
    @Override
    public WarehouseLocationReference resolveLocation(long warehouseId, String locationCode) {
        WarehouseLocationResponse response = client.get()
@@ -200,8 +232,10 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {

    private record WarehousePalletResponse(String code, String message, WarehousePalletData data) {}
    private record WarehousePalletData(@JsonAlias("palletId") long id, String palletCode, long warehouseId, long locationId,
-                                       String status, String fbaWarehouseCode, java.math.BigDecimal unitPrice, int version) {}
-    private record ReserveEnvelope(ReserveData data) {}
+                                       String status, String fbaWarehouseCode, java.math.BigDecimal unitPrice, int version,
+                                       String locationType, String locationStatus, boolean reservable,
+                                       String reservationBlockReason) {}
+    private record ReserveEnvelope(String code, String message, ReserveData data) {}
    private record ReserveData(long lockId) {}
    private record WarehouseReferenceResponse(String code, String message, WarehouseReference data) {}
    private record WarehouseLocationResponse(String code, String message, WarehouseLocationReference data) {}
@@ -171,13 +171,17 @@ public class InboundPdaWorkflowService {
            if (Objects.equals(pallet.getWarehousePalletId(), resource.palletId())) return null;
            throw conflict("Destination pallet is already bound to another physical pallet");
        }
+        if (resource.palletNo() == null || resource.palletNo().isBlank()) {
+            throw conflict("Resolved physical pallet has no pallet code");
+        }
        String destinationKey = destinationKey(pallet);
        String businessId = plan.getContainerNo() + ":" + destinationKey;
        String reservationKey = "INBOUND_CONTAINER_DESTINATION_PALLET:" + businessId + ":" + resource.palletId();
        long lockId = warehouse.reserve(customerId, resource.warehouseId(), resource.palletId(), resource.locationId(),
            "INBOUND_CONTAINER_DESTINATION_PALLET", businessId, reservationKey);
        try {
-            pallet.setWarehousePalletId(resource.palletId()); pallet.setWarehouseLocationId(resource.locationId());
+            pallet.setWarehousePalletId(resource.palletId()); pallet.setPalletNo(resource.palletNo().trim());
+            pallet.setWarehouseLocationId(resource.locationId());
            pallet.setWarehouseResourceLockId(lockId); pallet.setAssignmentStatus("ASSIGNED");
            pallet.setLockedAt(LocalDateTime.now()); repository.update(pallet);
            return lockId;
@@ -941,7 +945,7 @@ public class InboundPdaWorkflowService {
        boolean wholePalletInbound = "ONE_CLICK_DROPSHIP".equals(orderType);
        Map<String, InboundPlanPallet> palletsByNo = wholePalletInbound
            ? repository.pallets(plan.getId()).stream().collect(java.util.stream.Collectors.toMap(
-                InboundPlanPallet::getPalletNo, value -> value)) : Map.of();
+                InboundPlanPallet::getSourcePalletNo, value -> value)) : Map.of();
        Map<Long, InboundPlanPalletAllocation> allocationsByPallet = wholePalletInbound
            ? allocations.stream().collect(java.util.stream.Collectors.toMap(
                InboundPlanPalletAllocation::getPalletId, value -> value)) : Map.of();
@@ -15,6 +15,7 @@ import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingSkuReceiptMapper;
 import com.baiyue.lastleg.inventory.command.dto.InventoryCommandRequests;
 import com.baiyue.lastleg.inventory.command.dto.InventoryCommandResponse;
 import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
+import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
@@ -43,6 +44,7 @@ public class InboundStockReceiptService {
    @Resource private InboundStockReceiptMapper receipts;
    @Resource private ReceivingSkuReceiptMapper receivingSkuReceipts;
    @Resource private InventoryCommandService inventory;
+    @Resource private WarehouseResourceGateway warehouseGateway;
    @Resource private DropshipOrderService dropshipOrders;
    @Resource private LastlegOrderStatusHistoryMapper orderHistories;

@@ -116,7 +118,7 @@ public class InboundStockReceiptService {
                    if (value(allocation.getPickedPackageCount()) != value(allocation.getPlannedPackageCount())) {
                        throw conflict("One-click dropship inbound must receive a complete source pallet");
                    }
-                    DropshipPalletSnapshot sourcePallet = dropshipPallets.get(pallet.getPalletNo());
+                    DropshipPalletSnapshot sourcePallet = dropshipPallets.get(pallet.getSourcePalletNo());
                    if (sourcePallet == null || sourcePallet.packageCount() != value(allocation.getPickedPackageCount())) {
                        throw conflict("One-click dropship source pallet SKU package total does not match PDA receipt");
                    }
@@ -228,6 +230,8 @@ public class InboundStockReceiptService {
            "Actual overseas warehouse is required for stock-in");
        String overseasWarehouseName = required(order.getOverseasWarehouseName(),
            "Actual overseas warehouse name is required for stock-in");
+        String overseasWarehouseCode = required(order.getOverseasWarehouseCode(),
+            "Actual overseas warehouse code is required for stock-in");
        if (plan.getOverseasWarehouseId() == null
            || !overseasWarehouseId.equals(String.valueOf(plan.getOverseasWarehouseId()))) {
            throw conflict("Inbound plan and tail-leg order overseas warehouses must match for stock-in");
@@ -235,12 +239,20 @@ public class InboundStockReceiptService {
        if (overseasWarehouseId.equals(trim(order.getSourceWarehouseId()))) {
            throw conflict("Actual overseas warehouse must not use the domestic source warehouse");
        }
+        WarehouseResourceGateway.WarehouseLocationReference location = warehouseGateway.resolveLocation(
+            Long.parseLong(overseasWarehouseId), pallet.getWarehouseLocationId());
+        if (location == null || location.locationId() != pallet.getWarehouseLocationId()) {
+            throw conflict("Assigned warehouse location could not be resolved for stock-in");
+        }
+        String warehouseLocationCode = required(location.locationCode(),
+            "Assigned warehouse location code is required for stock-in");
        InventoryCommandRequests.StockIn stockIn = new InventoryCommandRequests.StockIn(null, customerName,
-                overseasWarehouseId, null, overseasWarehouseName, line.getDestinationWarehouseId(), destinationCode,
+                overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName,
+                line.getDestinationWarehouseId(), destinationCode,
                line.getDestinationWarehouseName(), order.getId(), plan.getPlanNo(), line.getInboundCode(),
                sku.skuCode(), sku.productNameZh(), sku.productNameEn(),
                pallet.getWarehousePalletId(), pallet.getPalletNo(), plan.getPlanNo(),
-                pallet.getWarehouseLocationId(), null, packages, order.getOrderNo(),
+                pallet.getWarehouseLocationId(), warehouseLocationCode, packages, order.getOrderNo(),
                order.getSourceEventId(), operationKey,
                "PDA inbound completion for " + line.getInboundCode());
        InventoryCommandResponse result = Boolean.TRUE.equals(order.getDetained())
@@ -261,6 +273,7 @@ public class InboundStockReceiptService {
        receipt.setProductNameEn(sku.productNameEn());
        receipt.setWarehousePalletId(pallet.getWarehousePalletId());
        receipt.setPalletNo(pallet.getPalletNo());
+        receipt.setSourcePalletNo(pallet.getSourcePalletNo());
        receipt.setWarehouseLocationId(pallet.getWarehouseLocationId());
        receipt.setBatchNo(plan.getPlanNo());
        receipt.setReceivedPackages(packages);
@@ -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,31 +158,31 @@ 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);
        requireSessionWarehouse(active, overseasWarehouseId);
-        if (active != null) {
-            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;
+        if (active != null && !containerNo.equals(active.getContainerNo())) {
+            throw conflict("Finish the current container before selecting another one");
        }
-        if (sessions.lockActiveByContainer(activeContainerKey(containerNo)) != null) {
+        if (active == null && sessions.lockActiveByContainer(activeContainerKey(containerNo)) != null) {
            throw conflict("Container is already signed or prepared by another account");
        }
        WarehouseResourceGateway.WarehouseReference receivingWarehouse =
            warehouse.requireActiveSharedWarehouse(overseasWarehouseId);
-        claimReceivingWarehouse(customerId, containerPlans, receivingWarehouse);
+        bindReceivingWarehouse(containerPlans, receivingWarehouse.warehouseId());
+        if (active != null) {
+            ReceivingContainerResponses.Session result = snapshot(active, containerPlans);
+            save(active, "PREPARE", request.idempotencyKey(), command, result); return result;
+        }
        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 +412,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 +444,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) return null;
+        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());
+        boolean warehouseSnapshotConsistent = warehouseCodes.size() == 1 && warehouseNames.size() == 1;
        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();
@@ -464,10 +469,11 @@ public class ReceivingContainerService {
            && containerPlans.stream().allMatch(plan -> "COMPLETED".equals(plan.getStatus()));
        String customerId = customers.size() == 1 ? customers.iterator().next() : null;
        boolean shippingReady = customerId != null && shippingGates.receivingAvailable(customerId, containerNo) == 1;
-        boolean operable = allPlansReady && shippingReady;
+        boolean operable = allPlansReady && shippingReady && warehouseSnapshotConsistent;
        int pending = Math.max(0, totalOrders - plannedOrders);
-        String blockReason = operable ? null : (!allPlansReady
-            ? plannedOrders + "个入仓码已生成计划，" + pending + "个订单未操作/缺入仓码"
+        String blockReason = operable ? null : (!warehouseSnapshotConsistent
+            ? "柜内接柜仓业务快照不一致"
+            : !allPlansReady ? plannedOrders + "个入仓码已生成计划，" + pending + "个订单未操作/缺入仓码"
            : "柜号尚未达到海外收货可操作节点");
        LocalDateTime arrival = orderFacts.stream().map(LastlegOrder::getEstimatedWarehouseAt)
            .filter(Objects::nonNull).min(LocalDateTime::compareTo).orElse(null);
@@ -488,7 +494,9 @@ 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.size() == 1 ? warehouseCodes.iterator().next() : null,
+            warehouseNames.size() == 1 ? warehouseNames.iterator().next() : null, totalOrders, inboundCodes,
            totalOrders - inboundCodes, planCount, plannedOrders, pending, allPlansReady, allPlansCompleted, shippingReady, operable,
            blockReason, arrival, factHash, totals);
    }
@@ -498,6 +506,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 +672,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 +873,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 +891,23 @@ public class ReceivingContainerService {
        if (assigned.size() > 1) {
            throw conflict("Container plans have inconsistent receiving warehouse assignments");
        }
-        return assigned.isEmpty() || assigned.contains(overseasWarehouseId);
+        return assigned.isEmpty() || assigned.size() == 1 && assigned.contains(overseasWarehouseId);
+    }
+
+    private void bindReceivingWarehouse(List<InboundPlan> containerPlans, long overseasWarehouseId) {
+        for (InboundPlan plan : containerPlans) {
+            if (plan.getOverseasWarehouseId() != null) {
+                if (!Objects.equals(plan.getOverseasWarehouseId(), overseasWarehouseId)) {
+                    throw conflict("当前柜已分配至其他海外接柜仓，无法在本仓操作");
+                }
+                continue;
+            }
+            plan.setOverseasWarehouseId(overseasWarehouseId);
+            plan.setUpdatedAt(LocalDateTime.now());
+            if (plans.updateById(plan) != 1) {
+                throw conflict("Receiving warehouse assignment changed concurrently");
+            }
+        }
    }

    private void requireReceivingAvailable(String customerId, String containerNo) {
@@ -890,30 +916,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 +992,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,
@@ -6,6 +6,7 @@ import com.baiyue.common.core.api.PageResult;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
+import com.baiyue.lastleg.inboundplan.dto.ManualInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.dto.SupplementPalletRequest;
 import com.baiyue.lastleg.inboundplan.dto.UpdateInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlan;
@@ -23,6 +24,11 @@ import com.baiyue.lastleg.inventory.mapper.InventoryBalanceMapper;
 import com.baiyue.lastleg.dropship.model.DropshipPalletSnapshot;
 import com.baiyue.lastleg.dropship.service.DropshipOrderService;
 import com.baiyue.common.event.ContainerNumbers;
+import com.baiyue.lastleg.entity.LastlegOrderCommandRecord;
+import com.baiyue.lastleg.mapper.LastlegOrderCommandRecordMapper;
+import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -31,6 +37,10 @@ import org.springframework.web.server.ResponseStatusException;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HexFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +60,65 @@ public class InboundPlanService {
    @Resource private InboundPlanQueryMapper queryMapper;
    @Resource private InventoryBalanceMapper inventoryBalanceMapper;
    @Resource private DropshipOrderService dropshipOrders;
+    @Resource private WarehouseResourceGateway warehouseGateway;
+    @Resource private LastlegOrderCommandRecordMapper commandMapper;
+    @Resource private ObjectMapper objectMapper;
+
+    @Transactional
+    public InboundPlanResponse convertManual(ManualInboundPlanRequest request, String idempotencyKey,
+                                             String operatorId) {
+        String customerId = trimToNull(request.customerId());
+        if (customerId == null || "0".equals(customerId)) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "平台人工计划必须指定客户");
+        }
+        String key = trimToNull(idempotencyKey);
+        if (key == null || key.length() > 128) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Idempotency-Key 必须为1至128个字符");
+        }
+        List<InboundPlanOrderMapper.ContainerWarehouseRef> containerFacts =
+            orderMapper.lockContainerWarehouseFacts(customerId, request.orderId());
+        if (containerFacts == null || containerFacts.isEmpty()) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "尾程订单不存在或未绑定来源柜");
+        }
+        String containerWarehouseId = requireSingleWarehouseId(containerFacts.stream()
+            .map(InboundPlanOrderMapper.ContainerWarehouseRef::overseasWarehouseId).toList());
+        List<SourceOrderSnapshot> snapshots = orderMapper.lockOrder(customerId, request.orderId());
+        if (snapshots == null || snapshots.size() != 1) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "尾程订单不存在");
+        }
+        SourceOrderSnapshot order = snapshots.get(0);
+        String requestHash = sha256(request);
+        LastlegOrderCommandRecord replay = commandMapper.find(customerId, request.orderId(), "MANUAL_PLAN", operatorId, key);
+        if (replay != null) {
+            if (!MessageDigest.isEqual(replay.getRequestHash().getBytes(StandardCharsets.UTF_8),
+                requestHash.getBytes(StandardCharsets.UTF_8))) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT, "同一幂等键不能用于不同请求");
+            }
+            return detailByPlanNo(customerId, replay.getResultRef());
+        }
+        if (planMapper.findBySourceOrder(customerId, request.orderId()) != null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "尾程订单已生成入库计划");
+        }
+        if (order.version() != request.expectedOrderVersion()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "尾程订单版本已变化，请刷新后重试");
+        }
+        if (order.detained()) throw new ResponseStatusException(HttpStatus.CONFLICT, "暂扣尾程订单不能生成入库计划");
+        if (!Objects.equals(containerWarehouseId, trimToNull(order.overseasWarehouseId()))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜接柜仓冻结事实已变化，请刷新后重试");
+        }
+        WarehouseResourceGateway.WarehouseReference receivingWarehouse =
+            requiredReceivingWarehouse(containerWarehouseId);
+        validateOrders(snapshots);
+        InboundPlanResponse response = createPlan(customerId, request.orderId(), snapshots, List.of(), null,
+            request, receivingWarehouse);
+        LastlegOrderCommandRecord command = new LastlegOrderCommandRecord();
+        command.setId(IdWorker.getId()); command.setCustomerId(customerId); command.setOrderId(request.orderId());
+        command.setAction("MANUAL_PLAN"); command.setOperatorId(operatorId); command.setIdempotencyKey(key);
+        command.setRequestHash(requestHash); command.setResultRef(response.planNo());
+        command.setResultJson(json(response)); command.setResultVersion(request.expectedOrderVersion() + 1);
+        command.setCreatedAt(LocalDateTime.now()); commandMapper.insert(command);
+        return response;
+    }

    @Transactional(readOnly = true)
    public PageResult<InboundPlanListResponse> page(String customerId, InboundPlanRequests.Query query) {
@@ -112,12 +181,13 @@ public class InboundPlanService {
            return detail(customerId, existing);
        }
        validateOrders(orders);
-        return createPlan(customerId, selectedOrderId, orders, sourcePalletNos, wholePallets);
+        return createPlan(customerId, selectedOrderId, orders, sourcePalletNos, wholePallets, null, null);
    }

    private InboundPlanResponse createPlan(String customerId, Long selectedOrderId,
                                           List<SourceOrderSnapshot> orders, List<String> sourcePalletNos,
-                                           List<WholePalletInput> wholePallets) {
+                                           List<WholePalletInput> wholePallets, ManualInboundPlanRequest manual,
+                                           WarehouseResourceGateway.WarehouseReference receivingWarehouse) {
        String containerNo = requiredContainerNo(orders.get(0).containerNo());
        LocalDateTime now = LocalDateTime.now();
        InboundPlan plan = new InboundPlan();
@@ -126,7 +196,23 @@ 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.setPlannedArrivalDate(manual == null ? null : manual.plannedArrivalDate());
+        plan.setPalletType(manual == null ? null : manual.palletType().trim().toUpperCase());
+        plan.setAssignedFlag(manual != null && manual.assigned());
+        plan.setMergeRequired(manual != null && manual.mergeRequired());
+        plan.setUrgentFlag(manual != null && manual.urgent());
+        plan.setCreationMode(manual == null ? "AUTO" : "MANUAL");
+        plan.setPlanRemark(manual == null ? null : trimToNull(manual.remark()));
        plan.setLineCount(orders.size());
        plan.setTotalVolumeCbm(orders.stream().map(SourceOrderSnapshot::volumeCbm)
            .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -136,16 +222,20 @@ public class InboundPlanService {
        Map<Long, SourceOrderSnapshot> orderById = orders.stream()
            .collect(Collectors.toMap(SourceOrderSnapshot::orderId, value -> value));
        Map<Long, InboundPlanLine> lineByOrder = createLines(plan, orders);
-        PalletAllocator.Result allocation = wholePallets == null ? PalletAllocator.allocate(orders.stream()
+        PalletAllocator.Result allocation = wholePallets == null && manual == null ? PalletAllocator.allocate(orders.stream()
            .map(order -> new PalletAllocator.LineInput(order.orderId(), warehouseKey(order), volume(order),
                order.packageCount(), order.recommendedPalletCount())).toList()) : null;
        if (wholePallets != null) validateWholePallets(orders, wholePallets);
-        plan.setPalletCount(wholePallets == null ? allocation.pallets().size() : wholePallets.size());
+        plan.setPalletCount(manual != null ? manual.palletCount()
+            : wholePallets == null ? allocation.pallets().size() : wholePallets.size());
        planMapper.insert(plan);

        lineByOrder.values().forEach(lineMapper::insert);
        Map<Long, Integer> palletCounts;
-        if (wholePallets == null) {
+        if (manual != null) {
+            createManualPallets(plan, orders.get(0), lineByOrder.get(orders.get(0).orderId()), manual);
+            palletCounts = Map.of(orders.get(0).orderId(), manual.palletCount());
+        } else if (wholePallets == null) {
            Map<PalletAllocator.PalletDraft, InboundPlanPallet> persistedPallets = createPallets(plan, allocation,
                orderById, sourcePalletNos == null ? List.of() : sourcePalletNos);
            createAllocations(plan, allocation, lineByOrder, persistedPallets);
@@ -162,15 +252,19 @@ public class InboundPlanService {
            InboundPlanLine line = lineByOrder.get(order.orderId());
            line.setPlannedPalletCount(count);
            lineMapper.updateById(line);
-            if (orderMapper.markPlanned(customerId, order.orderId(), plan.getPlanNo(), count, now) != 1) {
+            int updated = manual == null
+                ? orderMapper.markPlanned(customerId, order.orderId(), plan.getPlanNo(), count, now)
+                : orderMapper.markPlannedManual(customerId, order.orderId(), plan.getPlanNo(), count,
+                    manual.mergeRequired(), manual.expectedOrderVersion(), now);
+            if (updated != 1) {
                throw new IllegalStateException("Failed to update order " + order.orderId());
            }
-            inventoryBalanceMapper.bindInboundPlan(customerId, order.orderId(), order.inboundCode(),
-                plan.getPlanNo(), now);
+            inventoryBalanceMapper.bindInboundPlan(customerId, receivingWarehouseId, order.orderId(),
+                order.inboundCode(), plan.getPlanNo(), now);
            orderMapper.insertHistory(customerId, order.orderId(), order.currentStatus(),
                "Inbound order converted to inbound plan " + plan.getPlanNo(), now);
        }
-        return detail(customerId, plan);
+        return detail(customerId, plan, receivingWarehouse);
    }

    /** 同一来源柜的每个尾程订单独立建计划；整个柜级批次共用一个事务。 */
@@ -191,26 +285,24 @@ public class InboundPlanService {
        List<InboundPlan> existingPlans = refs.stream()
            .map(ref -> planMapper.findBySourceOrder(ref.customerId(), ref.orderId()))
            .toList();
-        long existingCount = existingPlans.stream().filter(Objects::nonNull).count();
-        if (existingCount == refs.size()) {
-            List<InboundPlanResponse> replay = new ArrayList<>(refs.size());
-            for (int index = 0; index < refs.size(); index++) {
-                requirePlanContainer(existingPlans.get(index), containerNo);
-                replay.add(detail(refs.get(index).customerId(), existingPlans.get(index)));
+        List<String> warehouseIds = new ArrayList<>(refs.size());
+        List<Integer> pendingIndexes = new ArrayList<>();
+        List<List<SourceOrderSnapshot>> snapshots = new ArrayList<>();
+        List<List<WholePalletInput>> wholePallets = new ArrayList<>();
+        for (int index = 0; index < refs.size(); index++) {
+            InboundPlanOrderMapper.ContainerOrderRef ref = refs.get(index);
+            InboundPlan existing = existingPlans.get(index);
+            if (existing != null) {
+                requireValidExistingPlan(existing, containerNo);
+                InboundPlanOrderMapper.ReceivingWarehouseSnapshot warehouse =
+                    orderMapper.findReceivingWarehouse(ref.customerId(), ref.orderId());
+                warehouseIds.add(warehouse == null ? null : warehouse.overseasWarehouseId());
+                continue;
+            }
+            if (!("PENDING_ASSIGNMENT".equals(ref.currentStatus())
+                || "DESTINATION_ASSIGNED".equals(ref.currentStatus()))) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜存在不能转换的尾程订单");
            }
-            return List.copyOf(replay);
-        }
-        if (existingCount != 0) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜仅部分尾程订单已有入库计划");
-        }
-        if (refs.stream().anyMatch(ref -> !("PENDING_ASSIGNMENT".equals(ref.currentStatus())
-            || "DESTINATION_ASSIGNED".equals(ref.currentStatus())))) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜存在不能转换的尾程订单");
-        }
-
-        List<List<SourceOrderSnapshot>> snapshots = new ArrayList<>(refs.size());
-        List<List<WholePalletInput>> wholePallets = new ArrayList<>(refs.size());
-        for (InboundPlanOrderMapper.ContainerOrderRef ref : refs) {
            List<SourceOrderSnapshot> orders = orderMapper.lockOrder(ref.customerId(), ref.orderId());
            if (orders == null || orders.isEmpty()) {
                throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜订单在锁定后不存在");
@@ -220,7 +312,9 @@ public class InboundPlanService {
            if (!Objects.equals(containerNo, currentContainerNo)) {
                throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜内尾程订单柜号不一致");
            }
+            pendingIndexes.add(index);
            snapshots.add(orders);
+            warehouseIds.addAll(orders.stream().map(SourceOrderSnapshot::overseasWarehouseId).toList());
            List<WholePalletInput> sourcePallets = "ONE_CLICK_DROPSHIP".equals(ref.orderType())
                ? dropshipOrders.palletSnapshots(ref.customerId(), ref.orderId()).stream()
                    .map(this::wholePallet).toList()
@@ -234,20 +328,64 @@ public class InboundPlanService {
            }
            wholePallets.add(sourcePallets);
        }
+        requireSingleWarehouseId(warehouseIds);

-        List<InboundPlanResponse> created = new ArrayList<>(refs.size());
-        for (int index = 0; index < refs.size(); index++) {
-            InboundPlanOrderMapper.ContainerOrderRef ref = refs.get(index);
-            created.add(createPlan(ref.customerId(), ref.orderId(), snapshots.get(index), List.of(),
-                wholePallets.get(index)));
+        Map<Integer, InboundPlanResponse> created = new HashMap<>();
+        for (int pendingIndex = 0; pendingIndex < pendingIndexes.size(); pendingIndex++) {
+            int refIndex = pendingIndexes.get(pendingIndex);
+            InboundPlanOrderMapper.ContainerOrderRef ref = refs.get(refIndex);
+            created.put(refIndex, createPlan(ref.customerId(), ref.orderId(), snapshots.get(pendingIndex), List.of(),
+                wholePallets.get(pendingIndex), null, null));
        }
-        return List.copyOf(created);
+        List<InboundPlanResponse> result = new ArrayList<>(refs.size());
+        for (int index = 0; index < refs.size(); index++) {
+            InboundPlan existing = existingPlans.get(index);
+            result.add(existing == null ? created.get(index) : detail(refs.get(index).customerId(), existing));
+        }
+        return List.copyOf(result);
    }

    private WholePalletInput wholePallet(DropshipPalletSnapshot pallet) {
        return new WholePalletInput(pallet.sourcePalletNo(), Math.toIntExact(pallet.packageCount()));
    }

+    private void createManualPallets(InboundPlan plan, SourceOrderSnapshot order, InboundPlanLine line,
+                                     ManualInboundPlanRequest request) {
+        if (order.packageCount() > 0 && request.palletCount() > order.packageCount()) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "人工计划托盘数不能大于订单箱数");
+        }
+        BigDecimal remainingVolume = volume(order);
+        int remainingPackages = order.packageCount();
+        for (int index = 0; index < request.palletCount(); index++) {
+            int slots = request.palletCount() - index;
+            int packages = slots == 1 ? remainingPackages : remainingPackages / slots;
+            BigDecimal palletVolume = slots == 1 ? remainingVolume
+                : remainingVolume.divide(BigDecimal.valueOf(slots), 4, java.math.RoundingMode.HALF_UP);
+            InboundPlanPallet pallet = new InboundPlanPallet();
+            pallet.setId(IdWorker.getId()); pallet.setCustomerId(plan.getCustomerId()); pallet.setPlanId(plan.getId());
+            pallet.setPalletNo(plan.getPlanNo() + "-P" + String.format("%03d", index + 1));
+            pallet.setPalletType(request.palletType().trim().toUpperCase());
+            pallet.setDestinationWarehouseId(order.destinationWarehouseId());
+            pallet.setDestinationWarehouseCode(order.destinationWarehouseCode());
+            pallet.setDestinationWarehouseName(order.destinationWarehouseName());
+            pallet.setCapacityCbm(PalletAllocator.PALLET_CAPACITY_CBM); pallet.setAllocatedVolumeCbm(palletVolume);
+            pallet.setSequenceNo(index + 1); pallet.setAssignmentStatus("UNASSIGNED");
+            pallet.setActualVolumeCbm(BigDecimal.ZERO); pallet.setActualPackageCount(0); palletMapper.insert(pallet);
+
+            InboundPlanPalletAllocation allocation = new InboundPlanPalletAllocation();
+            allocation.setId(IdWorker.getId()); allocation.setCustomerId(plan.getCustomerId()); allocation.setPlanId(plan.getId());
+            allocation.setLineId(line.getId()); allocation.setPalletId(pallet.getId());
+            allocation.setAllocatedVolumeCbm(palletVolume); allocation.setPlannedPackageCount(packages);
+            allocation.setCountedPackageCount(0); allocation.setPickedPackageCount(0);
+            allocation.setActualVolumeCbm(BigDecimal.ZERO); allocation.setStatus("PENDING_COUNT"); allocation.setVersion(0);
+            allocationMapper.insert(allocation);
+            remainingPackages -= packages; remainingVolume = remainingVolume.subtract(palletVolume);
+        }
+        if (remainingPackages != 0 || remainingVolume.signum() != 0) {
+            throw new IllegalStateException("人工计划托盘分配未保持箱数或体积守恒");
+        }
+    }
+
    private String requiredContainerNo(String value) {
        try {
            return ContainerNumbers.requireCanonical(value);
@@ -264,6 +402,13 @@ public class InboundPlanService {
        }
    }

+    private void requireValidExistingPlan(InboundPlan plan, String containerNo) {
+        requirePlanContainer(plan, containerNo);
+        if (trimToNull(plan.getPlanNo()) == null || trimToNull(plan.getStatus()) == null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜存在无效入库计划，不能继续按柜生成");
+        }
+    }
+
    private void validateWholePallets(List<SourceOrderSnapshot> orders, List<WholePalletInput> pallets) {
        if (orders.size() != 1) {
            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
@@ -288,7 +433,8 @@ public class InboundPlanService {
            if (palletVolume.compareTo(remainingVolume) > 0) palletVolume = remainingVolume;
            InboundPlanPallet pallet = new InboundPlanPallet();
            pallet.setId(IdWorker.getId()); pallet.setCustomerId(plan.getCustomerId()); pallet.setPlanId(plan.getId());
-            pallet.setPalletNo(source.palletNo().trim()); pallet.setDestinationWarehouseId(order.destinationWarehouseId());
+            pallet.setPalletNo(source.palletNo().trim()); pallet.setSourcePalletNo(source.palletNo().trim());
+            pallet.setDestinationWarehouseId(order.destinationWarehouseId());
            pallet.setDestinationWarehouseCode(order.destinationWarehouseCode());
            pallet.setDestinationWarehouseName(order.destinationWarehouseName());
            pallet.setCapacityCbm(PalletAllocator.PALLET_CAPACITY_CBM); pallet.setAllocatedVolumeCbm(palletVolume);
@@ -385,7 +531,7 @@ public class InboundPlanService {
        plan.setPalletCount(plan.getPalletCount() + 1); plan.setUpdatedAt(LocalDateTime.now()); planMapper.updateById(plan);
        return new InboundPlanResponse.Pallet(pallet.getId(), pallet.getPalletNo(), pallet.getDestinationWarehouseId(),
            pallet.getDestinationWarehouseCode(), pallet.getDestinationWarehouseName(), pallet.getCapacityCbm(),
-            pallet.getAllocatedVolumeCbm(), pallet.getSequenceNo(), null, null, null, pallet.getAssignmentStatus(),
+            pallet.getAllocatedVolumeCbm(), pallet.getSequenceNo(), null, null, null, pallet.getPalletType(), pallet.getAssignmentStatus(),
            null, pallet.getActualVolumeCbm(), pallet.getActualPackageCount());
    }

@@ -428,6 +574,7 @@ public class InboundPlanService {
            String sourcePalletNo = palletIndex < sourcePalletNos.size() ? sourcePalletNos.get(palletIndex) : null;
            pallet.setPalletNo(sourcePalletNo == null || sourcePalletNo.isBlank()
                ? plan.getPlanNo() + "-P" + String.format("%03d", palletIndex + 1) : sourcePalletNo.trim());
+            pallet.setSourcePalletNo(sourcePalletNo == null || sourcePalletNo.isBlank() ? null : sourcePalletNo.trim());
            pallet.setDestinationWarehouseId(sample.destinationWarehouseId());
            pallet.setDestinationWarehouseCode(sample.destinationWarehouseCode());
            pallet.setDestinationWarehouseName(sample.destinationWarehouseName());
@@ -492,9 +639,21 @@ public class InboundPlanService {
    }

    private InboundPlanResponse detail(String customerId, InboundPlan plan) {
+        return detail(customerId, plan, null);
+    }
+
+    private InboundPlanResponse detail(String customerId, InboundPlan plan,
+                                       WarehouseResourceGateway.WarehouseReference resolvedWarehouse) {
        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) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "入库计划关联订单缺少接柜仓预分配事实");
+        }
+        WarehouseResourceGateway.WarehouseReference authoritativeWarehouse = resolvedWarehouse == null
+            ? requiredReceivingWarehouse(receivingWarehouse.overseasWarehouseId()) : resolvedWarehouse;
        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 +663,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(), authoritativeWarehouse.warehouseCode(), authoritativeWarehouse.warehouseName(),
            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(),
@@ -513,12 +674,38 @@ public class InboundPlanService {
                pallet.getDestinationWarehouseId(), pallet.getDestinationWarehouseCode(), pallet.getDestinationWarehouseName(),
                pallet.getCapacityCbm(), pallet.getAllocatedVolumeCbm(), pallet.getSequenceNo(),
                pallet.getWarehousePalletId(), pallet.getWarehouseLocationId(), pallet.getWarehouseResourceLockId(),
-                pallet.getAssignmentStatus(), pallet.getLockedAt(), pallet.getActualVolumeCbm(),
+                pallet.getPalletType(), pallet.getAssignmentStatus(), pallet.getLockedAt(), pallet.getActualVolumeCbm(),
                pallet.getActualPackageCount())).toList(),
            allocations.stream().map(item -> new InboundPlanResponse.Allocation(item.getLineId(), item.getPalletId(),
                item.getAllocatedVolumeCbm(), item.getPlannedPackageCount(), item.getCountedPackageCount(),
                item.getPickedPackageCount(), item.getActualVolumeCbm(), item.getStatus(), item.getVersion())).toList(),
-            plan.getVersion() == null ? 0 : plan.getVersion());
+            plan.getVersion() == null ? 0 : plan.getVersion(), plan.getPlannedArrivalDate(), plan.getPalletType(),
+            Boolean.TRUE.equals(plan.getAssignedFlag()), Boolean.TRUE.equals(plan.getMergeRequired()),
+            Boolean.TRUE.equals(plan.getUrgentFlag()), plan.getCreationMode(), plan.getPlanRemark());
+    }
+
+    private WarehouseResourceGateway.WarehouseReference requiredReceivingWarehouse(String warehouseId) {
+        String stableId = trimToNull(warehouseId);
+        if (stableId == null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内接柜仓未预分配");
+        }
+        try {
+            return warehouseGateway.requireActiveSharedWarehouse(Long.parseLong(stableId));
+        } catch (NumberFormatException exception) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内接柜仓ID格式无效", exception);
+        }
+    }
+
+    private String requireSingleWarehouseId(List<String> warehouseIds) {
+        List<String> normalized = warehouseIds.stream().map(InboundPlanService::trimToNull).toList();
+        if (normalized.stream().anyMatch(Objects::isNull)) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜存在未分配接柜仓的尾程订单");
+        }
+        java.util.Set<String> distinct = new java.util.HashSet<>(normalized);
+        if (distinct.size() != 1) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜内尾程订单接柜仓不一致");
+        }
+        return distinct.iterator().next();
    }

    private BigDecimal volume(SourceOrderSnapshot order) {
@@ -534,4 +721,18 @@ public class InboundPlanService {
    private static String trimToNull(String value) {
        return value == null || value.isBlank() ? null : value.trim();
    }
+
+    private String sha256(Object value) {
+        try {
+            return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
+                .digest(objectMapper.writeValueAsBytes(value)));
+        } catch (NoSuchAlgorithmException | JsonProcessingException exception) {
+            throw new IllegalStateException("无法生成命令摘要", exception);
+        }
+    }
+
+    private String json(Object value) {
+        try { return objectMapper.writeValueAsString(value); }
+        catch (JsonProcessingException exception) { throw new IllegalStateException("无法保存命令结果", exception); }
+    }
 }