优化

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(),