Merge remote-tracking branch 'origin/test' into test

lastleg-service/src/main/java/com/baiyue/lastleg/config/LastlegRestClientProperties.java

@@ -14,6 +14,7 @@ public class LastlegRestClientProperties {
     private ClientTimeouts procurementFile = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(30));
     private ClientTimeouts warehouseResource = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(5));
     private ClientTimeouts palletPhysical = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(5));
+    private ClientTimeouts domesticLoadingEvidence = new ClientTimeouts(Duration.ofSeconds(3), Duration.ofSeconds(30));
 
     public ClientTimeouts getUnloadPhotoFile() { return unloadPhotoFile; }
     public void setUnloadPhotoFile(ClientTimeouts value) { unloadPhotoFile = required(value, "unload-photo-file"); }
@@ -27,6 +28,8 @@ public class LastlegRestClientProperties {
     public void setWarehouseResource(ClientTimeouts value) { warehouseResource = required(value, "warehouse-resource"); }
     public ClientTimeouts getPalletPhysical() { return palletPhysical; }
     public void setPalletPhysical(ClientTimeouts value) { palletPhysical = required(value, "pallet-physical"); }
+    public ClientTimeouts getDomesticLoadingEvidence() { return domesticLoadingEvidence; }
+    public void setDomesticLoadingEvidence(ClientTimeouts value) { domesticLoadingEvidence = required(value, "domestic-loading-evidence"); }
 
     private static ClientTimeouts required(ClientTimeouts value, String client) {
         if (value == null) throw new IllegalArgumentException(client + " HTTP timeouts are required");

lastleg-service/src/main/java/com/baiyue/lastleg/customervisit/controller/CustomerVisitController.java

@@ -64,14 +64,6 @@ public class CustomerVisitController {
         return ApiResponse.success(service.upload(requiredScope(user, customerId), user.userId(), visitId, file));
     }
 
-    @PostMapping("/delivery-orders/{deliveryNo}/complete")
-    @PreAuthorize("hasAuthority('" + OverseasPermissions.DELIVERY_STATUS + "')")
-    public ApiResponse<CustomerVisitResponses.Completed> completeDelivery(
-        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
-        @PathVariable String deliveryNo, @Valid @RequestBody CustomerVisitRequests.DeliveryStatus request) {
-        return ApiResponse.success(service.completeDelivery(requiredScope(user, customerId), operator(user), deliveryNo, request));
-    }
-
     @PutMapping("/delivery-orders/{deliveryNo}/status")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DELIVERY_STATUS + "')")
     public ApiResponse<CustomerVisitResponses.Completed> updateDeliveryStatus(

lastleg-service/src/main/java/com/baiyue/lastleg/customervisit/service/CustomerVisitService.java

@@ -76,39 +76,6 @@ public class CustomerVisitService {
         return detail(visit);
     }
 
-    @Transactional
-    public CustomerVisitResponses.Completed completeDelivery(String customerId, String operatorId, String deliveryNo,
-                                                              CustomerVisitRequests.DeliveryStatus request) {
-        if (!"DELIVERED".equals(trim(request.status()).toUpperCase(Locale.ROOT))) {
-            throw badRequest("派送完成接口只接受 DELIVERED 状态");
-        }
-        DeliveryOrder delivery = deliveryOrders.lockByNo(customerId, deliveryNo);
-        if (delivery == null) throw notFound("派送单不存在");
-        boolean replayed = "DELIVERED".equals(delivery.getStatus());
-        if (!replayed) {
-            requireVersion(delivery, request.expectedVersion());
-            requireDeliveryTransition(delivery.getStatus(), "DELIVERED");
-        }
-        LocalDateTime now = replayed && delivery.getSignedAt() != null ? delivery.getSignedAt() : LocalDateTime.now();
-        if (!replayed) {
-            delivery.setStatus("DELIVERED");
-            delivery.setSignedAt(now);
-            delivery.setUpdatedAt(now);
-            delivery.setVersion(version(delivery) + 1);
-            deliveryOrders.updateById(delivery);
-            for (LastlegOrder order : lastMileOrders.selectList(new LambdaQueryWrapper<LastlegOrder>()
-                .eq(LastlegOrder::getCustomerId, customerId)
-                .eq(LastlegOrder::getDeliveryOrderNo, deliveryNo))) {
-                order.setSubOrderStatus("DELIVERY:DELIVERED");
-                order.setUpdatedAt(now);
-                lastMileOrders.updateById(order);
-            }
-            recordOperation(delivery, operatorId, "COMPLETE_DELIVERY", "派送完成并生成客户回访记录", now);
-        }
-        CustomerVisit visit = ensureVisit(delivery, now);
-        return new CustomerVisitResponses.Completed(visit.getId(), deliveryNo, delivery.getStatus(), visit.getStatus(), replayed);
-    }
-
     @Transactional
     public CustomerVisitResponses.Completed updateDeliveryStatus(String customerId, String operatorId,
                                                                   String deliveryNo,
@@ -117,7 +84,6 @@ public class CustomerVisitService {
         if (!DeliveryStatusPolicy.isEditableTarget(target)) {
             throw badRequest("不支持的派送状态");
         }
-        if ("DELIVERED".equals(target)) return completeDelivery(customerId, operatorId, deliveryNo, request);
         DeliveryOrder delivery = deliveryOrders.lockByNo(customerId, deliveryNo);
         if (delivery == null) throw notFound("派送单不存在");
         if (target.equals(delivery.getStatus())) {
@@ -192,6 +158,10 @@ public class CustomerVisitService {
             uploaded.contentType(), uploaded.sizeBytes());
     }
 
+    public void ensureForCompletedDelivery(DeliveryOrder delivery, LocalDateTime completedAt) {
+        ensureVisit(delivery, completedAt);
+    }
+
     private CustomerVisit ensureVisit(DeliveryOrder delivery, LocalDateTime completedAt) {
         CustomerVisit existing = visits.findByDelivery(delivery.getCustomerId(), delivery.getId());
         if (existing != null) return existing;

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/controller/DeliveryTransferController.java

@@ -25,7 +25,7 @@ public class DeliveryTransferController {
 
     @PostMapping("/dispatches/{dispatchNo}/transfer-delivery")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_TRANSFER_DELIVERY + "')")
-    @Operation(summary = "Create one pending outbound order and one pending delivery order")
+    @Operation(summary = "Create one pending outbound order and one delivery order per destination FBA warehouse")
     public ApiResponse<DeliveryResponses.TransferResult> transfer(
         @AuthenticationPrincipal AuthenticatedUser user, @PathVariable String dispatchNo,
         @Valid @RequestBody DeliveryRequests.Transfer request) {
@@ -46,7 +46,7 @@ public class DeliveryTransferController {
     @PreAuthorize("hasAuthority('" + OverseasPermissions.OUTBOUND_CREATE + "')")
     @Operation(summary = "List server-authoritative one-click dropship outbound candidates")
     public ApiResponse<java.util.List<DeliveryResponses.OneClickCandidate>> oneClickCandidates(
-        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam String customerId,
+        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
         @RequestParam(required = false) String warehouseId) {
         requirePlatform(user);
         return ApiResponse.success(service.oneClickCandidates(customerId, warehouseId));

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/dto/DeliveryRequests.java

@@ -7,7 +7,6 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import jakarta.validation.Valid;
 import java.util.List;
-import java.util.Map;
 import java.util.Collections;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -24,26 +23,14 @@ public final class DeliveryRequests {
                            @NotBlank @Size(max = 64) String pickupMethod,
                            @NotBlank @Size(max = 64) String loadingType,
                            @Size(max = 64) String vehicleType,
-                           @Size(max = 64) String vehicleSize,
+                           @jakarta.validation.constraints.Pattern(regexp = "15托|30托") String vehicleSize,
                            @Size(max = 128) String driverName,
                            @Size(max = 64) String driverPhone,
                            @Size(max = 64) String vehiclePlate,
                            @Size(max = 128) String appointmentAccount,
                            @Size(max = 128) String sellerName,
                            @Size(max = 1000) String remark,
-                           @NotNull @Valid @Size(min = 1, max = 20) List<FeeItem> fees,
-                           Map<String, List<@NotBlank @Size(max = 128) String>> palletCartonMarks) {
-        public Transfer(String idempotencyKey, LocalDateTime plannedDeliveryAt, String deliveryMethod, String waybillNo,
-                        String carrierName, String pickupMethod, String loadingType, String vehicleType, String vehicleSize,
-                        String driverName, String driverPhone, String vehiclePlate, String appointmentAccount,
-                        String sellerName, String remark, List<FeeItem> fees) {
-            this(idempotencyKey, plannedDeliveryAt, deliveryMethod, waybillNo, carrierName, pickupMethod, loadingType,
-                vehicleType, vehicleSize, driverName, driverPhone, vehiclePlate, appointmentAccount, sellerName, remark, fees, Map.of());
-        }
-    }
-
-    public record PalletCartonSelection(@NotBlank @Size(max = 128) String palletNo,
-                                        @NotNull @Size(min = 1, max = 500) List<@NotBlank @Size(max = 128) String> cartonMarks) {}
+                           @NotNull @Valid @Size(min = 1, max = 20) List<FeeItem> fees) {}
 
     public record FeeItem(@NotBlank @Size(max = 64) String feeType,
                           @NotBlank @Size(max = 128) String feeName,

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/dto/DeliveryResponses.java

@@ -7,9 +7,13 @@ import java.util.List;
 public final class DeliveryResponses {
     private DeliveryResponses() {}
 
+    public record TransferDelivery(String deliveryNo, String deliveryStatus,
+                                   String destinationWarehouseId, String destinationWarehouseCode,
+                                   String destinationWarehouseName, int palletCount, int packageCount) {}
+
     public record TransferResult(String dispatchNo, String outboundNo, String outboundStatus,
-                                 String deliveryNo, String deliveryStatus, int palletCount,
-                                 int packageCount, boolean replayed) {}
+                                 int palletCount, int packageCount,
+                                 List<TransferDelivery> deliveries, boolean replayed) {}
 
     public record OutboundRow(Long id, String outboundNo, String dispatchNo, String overseasWarehouseId, String lxCodes,
                               String status, int palletCount, int packageCount, LocalDateTime createdAt, String outboundType) {}
@@ -25,7 +29,9 @@ public final class DeliveryResponses {
                               LocalDateTime plannedDeliveryAt, LocalDateTime dispatchedAt,
                               LocalDateTime expectedArrivalAt, LocalDateTime signedAt,
                               String remark, LocalDateTime createdAt, long version, List<String> allowedActions,
-                              String bolNo, DeliveryDocumentDtos.Summary documentSummary) {}
+                              String bolNo, DeliveryDocumentDtos.Summary documentSummary,
+                              String destinationWarehouseId, String destinationWarehouseCode,
+                              String destinationWarehouseName) {}
 
     public record DeliverySku(String inboundCode, String customerName, String destinationWarehouseCode,
                               String receivingAddress, String shipmentNo, String fbaTrackingNo,
@@ -45,7 +51,7 @@ public final class DeliveryResponses {
     public record OutboundPalletRow(Long id, String palletNo, String cartonMarks, String inboundCode,
                                     String destinationWarehouseCode, String destinationWarehouseName,
                                     String skuCode, int packageCount, int pickedPackageCount, String status) {}
-    public record OutboundDetail(OutboundRow outbound, DeliveryRow delivery, List<OutboundPalletRow> pallets) {}
+    public record OutboundDetail(OutboundRow outbound, List<DeliveryRow> deliveries, List<OutboundPalletRow> pallets) {}
     public record OneClickCandidate(Long inventoryPositionId, String orderNo, String customerId, String customerName, String overseasWarehouseId,
                                     String overseasWarehouseName, String palletNo, String inboundCode,
                                     String skuCode, String productName, long availablePackages) {}

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/entity/DeliveryOrder.java

@@ -23,6 +23,10 @@ public class DeliveryOrder {
     private String overseasWarehouseId;
     private String overseasWarehouseName;
     private String customerName;
+    private String destinationWarehouseId;
+    private String destinationWarehouseCode;
+    private String destinationWarehouseName;
+    private String deliveryGroupKey;
     private String status;
     private String waybillNo;
     private String bolNo;

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/entity/OutboundOrder.java

@@ -25,6 +25,7 @@ public class OutboundOrder {
     private Integer packageCount;
     private Integer palletCount;
     private String idempotencyKey;
+    private String requestHash;
     private String createdBy;
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/mapper/DeliveryOrderMapper.java

@@ -5,6 +5,7 @@ import com.baiyue.lastleg.delivery.entity.DeliveryOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import java.util.List;
 
 @Mapper
 public interface DeliveryOrderMapper extends BaseMapper<DeliveryOrder> {
@@ -14,6 +15,6 @@ public interface DeliveryOrderMapper extends BaseMapper<DeliveryOrder> {
     DeliveryOrder lockByNo(@Param("customerId") String customerId, @Param("deliveryNo") String deliveryNo);
     @Select("SELECT * FROM ll_delivery_order WHERE customer_id=#{customerId} AND idempotency_key=#{key} LIMIT 1")
     DeliveryOrder findByIdempotency(@Param("customerId") String customerId, @Param("key") String key);
-    @Select("SELECT * FROM ll_delivery_order WHERE customer_id=#{customerId} AND outbound_order_id=#{outboundOrderId} LIMIT 1 FOR UPDATE")
-    DeliveryOrder lockByOutbound(@Param("customerId") String customerId, @Param("outboundOrderId") Long outboundOrderId);
+    @Select("SELECT * FROM ll_delivery_order WHERE customer_id=#{customerId} AND outbound_order_id=#{outboundOrderId} ORDER BY id FOR UPDATE")
+    List<DeliveryOrder> lockByOutbound(@Param("customerId") String customerId, @Param("outboundOrderId") Long outboundOrderId);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/mapper/OutboundOrderMapper.java

@@ -15,6 +15,8 @@ public interface OutboundOrderMapper extends BaseMapper<OutboundOrder> {
     OutboundOrder findGlobalByNo(@Param("outboundNo") String outboundNo);
     @Select("SELECT * FROM ll_outbound_order WHERE customer_id=#{customerId} AND idempotency_key=#{key} LIMIT 1")
     OutboundOrder findByIdempotency(@Param("customerId") String customerId, @Param("key") String key);
+    @Select("SELECT * FROM ll_outbound_order WHERE customer_id=#{customerId} AND idempotency_key=#{key} LIMIT 1 FOR UPDATE")
+    OutboundOrder lockByIdempotency(@Param("customerId") String customerId, @Param("key") String key);
     @Select("SELECT * FROM ll_outbound_order WHERE customer_id=#{customerId} AND dispatch_order_id=#{dispatchOrderId} LIMIT 1")
     OutboundOrder findByDispatch(@Param("customerId") String customerId, @Param("dispatchOrderId") Long dispatchOrderId);
     @Select("SELECT * FROM ll_outbound_order WHERE customer_id=#{customerId} AND dispatch_order_id=#{dispatchOrderId} LIMIT 1 FOR UPDATE")

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/model/DeliveryStatusPolicy.java

@@ -6,7 +6,7 @@ import java.util.Set;
 
 public final class DeliveryStatusPolicy {
     private static final Set<String> EDITABLE_TARGETS = Set.of(
-        "WAIT_DELIVERY", "DELIVERING", "DELIVERED", "REJECTED", "CANCELLED");
+        "WAIT_DELIVERY", "DELIVERING", "REJECTED", "CANCELLED");
     private static final Map<String, Set<String>> TRANSITIONS = Map.of(
         "WAIT_DELIVERY", Set.of("DELIVERING", "DELIVERED", "REJECTED", "CANCELLED"),
         "DELIVERING", Set.of("DELIVERED", "REJECTED"),
@@ -29,8 +29,8 @@ public final class DeliveryStatusPolicy {
     public static List<String> allowedActions(String status) {
         return switch (status == null ? "" : status) {
             case "WAIT_DELIVERY" -> List.of(
-                "START_DELIVERY", "COMPLETE_DELIVERY", "REJECT_DELIVERY", "CANCEL_DELIVERY");
-            case "DELIVERING" -> List.of("COMPLETE_DELIVERY", "REJECT_DELIVERY", "MARK_RETURN");
+                "START_DELIVERY", "REJECT_DELIVERY", "CANCEL_DELIVERY");
+            case "DELIVERING" -> List.of("REJECT_DELIVERY", "MARK_RETURN");
             case "DELIVERED", "REJECTED" -> List.of("MARK_RETURN");
             default -> List.of();
         };

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxService.java

@@ -0,0 +1,95 @@
+package com.baiyue.lastleg.delivery.service;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baiyue.common.event.EventEnvelope;
+import com.baiyue.common.event.EventIdentifiers;
+import com.baiyue.common.event.EventPayloadCanonicalizer;
+import com.baiyue.common.event.EventPayloadHash;
+import com.baiyue.common.event.EventTypes;
+import com.baiyue.common.event.OverseasDeliveryCompletedV1;
+import com.baiyue.common.event.RegionCode;
+import com.baiyue.lastleg.delivery.entity.DeliveryOrder;
+import com.baiyue.lastleg.entity.LastlegEventOutbox;
+import com.baiyue.lastleg.entity.LastlegOrder;
+import com.baiyue.lastleg.mapper.LastlegEventOutboxMapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.Resource;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** 在派送完成事务内按来源入仓单冻结海外到国内的完成事件。 */
+@Service
+public class DeliveryCompletedOutboxService {
+    @Resource private LastlegEventOutboxMapper outbox;
+    @Resource private ObjectMapper objectMapper;
+
+    public void publish(DeliveryOrder delivery, List<LastlegOrder> orders, Instant completedAt) {
+        Objects.requireNonNull(delivery, "delivery");
+        Objects.requireNonNull(completedAt, "completedAt");
+        Map<String, LastlegOrder> bySourceInbound = new LinkedHashMap<>();
+        for (LastlegOrder order : orders == null ? List.<LastlegOrder>of() : orders) {
+            if (!StringUtils.hasText(order.getSourceInboundId())) continue;
+            requireText(order.getSourceOrderId(), "sourceOrderId");
+            requireText(order.getInboundCode(), "inboundCode");
+            requireText(order.getCustomerId(), "customerId");
+            LastlegOrder existing = bySourceInbound.putIfAbsent(order.getSourceInboundId(), order);
+            if (existing != null && (!Objects.equals(existing.getSourceOrderId(), order.getSourceOrderId())
+                || !Objects.equals(existing.getInboundCode(), order.getInboundCode()))) {
+                throw new IllegalStateException("同一来源入仓单对应的派送完成快照冲突");
+            }
+        }
+        for (LastlegOrder order : bySourceInbound.values()) publishOne(delivery, order, completedAt);
+    }
+
+    private void publishOne(DeliveryOrder delivery, LastlegOrder order, Instant completedAt) {
+        long aggregateVersion = Math.max(1L, delivery.getVersion() == null ? 1L : delivery.getVersion());
+        String eventKey = EventTypes.OVERSEAS_DELIVERY_COMPLETED + ':' + delivery.getDeliveryNo()
+            + ':' + order.getSourceInboundId();
+        var payload = new OverseasDeliveryCompletedV1(String.valueOf(delivery.getId()), delivery.getDeliveryNo(),
+            String.valueOf(order.getId()), order.getOrderNo(), order.getSourceInboundId(), order.getInboundCode(),
+            order.getSourceOrderId(), order.getSourceOrderNo(), order.getRootOrderId(),
+            order.getFbaWarehouseCode(), completedAt);
+        JsonNode node = objectMapper.valueToTree(payload);
+        EventEnvelope envelope = new EventEnvelope(EventIdentifiers.newUuid(),
+            EventTypes.OVERSEAS_DELIVERY_COMPLETED, 1, completedAt, RegionCode.OVERSEAS, RegionCode.CN,
+            order.getCustomerId(), "INBOUND_ORDER", order.getSourceInboundId(), aggregateVersion, 1L,
+            EventIdentifiers.newUuid(), eventKey,
+            EventIdentifiers.isSupported(order.getSourceEventId()) ? order.getSourceEventId() : null,
+            node, EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node))).requireValid();
+        LastlegEventOutbox row = new LastlegEventOutbox();
+        row.setId(IdWorker.getId()); row.setCustomerId(order.getCustomerId());
+        row.setAggregateType(envelope.aggregateType()); row.setAggregateId(envelope.aggregateId());
+        row.setEventType(envelope.eventType()); row.setEventVersion(envelope.eventVersion());
+        row.setEventKey(eventKey); row.setPayloadJson(json(envelope)); row.setStatus("PENDING");
+        row.setRetryCount(0); row.setCreatedAt(LocalDateTime.ofInstant(completedAt, ZoneOffset.UTC));
+        try {
+            outbox.insert(row);
+        } catch (DuplicateKeyException duplicate) {
+            LastlegEventOutbox existing = outbox.findByEventKey(eventKey);
+            if (existing == null || !Objects.equals(existing.getAggregateId(), order.getSourceInboundId())
+                || !Objects.equals(existing.getCustomerId(), order.getCustomerId())) throw duplicate;
+        }
+    }
+
+    private static void requireText(String value, String field) {
+        if (!StringUtils.hasText(value)) throw new IllegalStateException(field + " is required");
+    }
+
+    private String json(Object value) {
+        try { return objectMapper.writeValueAsString(value); }
+        catch (JsonProcessingException exception) {
+            throw new IllegalStateException("Cannot serialize delivery-completed event", exception);
+        }
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryDocumentService.java

@@ -6,6 +6,10 @@ import com.baiyue.lastleg.delivery.entity.*;
 import com.baiyue.lastleg.delivery.gateway.DeliveryDocumentFileGateway;
 import com.baiyue.lastleg.delivery.mapper.*;
 import com.baiyue.lastleg.delivery.model.*;
+import com.baiyue.lastleg.customervisit.service.CustomerVisitService;
+import com.baiyue.lastleg.entity.LastlegOrder;
+import com.baiyue.lastleg.mapper.LastlegOrderMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
@@ -17,6 +21,7 @@ import org.springframework.web.server.ResponseStatusException;
 import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 
 @Service
@@ -26,6 +31,9 @@ public class DeliveryDocumentService {
     @Resource private DeliveryOperationMapper operations;
     @Resource private DeliveryDocumentFileGateway files;
     @Resource private ObjectMapper objectMapper;
+    @Resource private LastlegOrderMapper lastlegOrders;
+    @Resource private DeliveryCompletedOutboxService deliveryCompletedOutbox;
+    @Resource private CustomerVisitService customerVisits;
 
     public Detail detail(String customerId, String deliveryNo) { return detail(require(customerId, deliveryNo), false); }
 
@@ -69,7 +77,21 @@ public class DeliveryDocumentService {
         order.setDocumentsJson(write(categories));
         order.setVersion(version(order) + 1);
         order.setUpdatedAt(now);
+        boolean receiptSaved = !bindings.getOrDefault(DeliveryDocumentCategory.RECEIPT, List.of()).isEmpty();
+        boolean autoCompleted = receiptSaved && !"DELIVERED".equals(order.getStatus());
+        if (autoCompleted) {
+            if (!DeliveryStatusPolicy.canTransition(order.getStatus(), "DELIVERED")) {
+                throw conflict("当前派送状态不允许通过签收文件完成");
+            }
+            order.setStatus("DELIVERED");
+            order.setSignedAt(now);
+        }
         orders.updateById(order);
+        if (autoCompleted) {
+            List<LastlegOrder> completedOrders = completeRelatedOrders(order, now);
+            deliveryCompletedOutbox.publish(order, completedOrders, now.toInstant(ZoneOffset.UTC));
+            customerVisits.ensureForCompletedDelivery(order, now);
+        }
         Detail result = detail(order, false);
         DeliveryDocumentRevision revision = new DeliveryDocumentRevision();
         revision.setCustomerId(customerId); revision.setDeliveryOrderId(order.getId()); revision.setVersion(order.getVersion());
@@ -79,6 +101,7 @@ public class DeliveryDocumentService {
         operation.setCustomerId(customerId); operation.setDeliveryOrderId(order.getId()); operation.setOperatorId(operatorId);
         operation.setOperationNode("SAVE_DOCUMENTS"); operation.setResult("保存派送资料：" + result.uploadedCategoryCount() + "/3类");
         operation.setCreatedAt(now); operations.insert(operation);
+        if (autoCompleted) recordAutomaticCompletion(order, operatorId, now);
         return result;
     }
     public List<History> history(String customerId, String deliveryNo) {
@@ -110,6 +133,25 @@ public class DeliveryDocumentService {
             (int) categories.stream().filter(c -> !c.files().isEmpty()).count(), 3, categories, List.of("MANAGE_DOCUMENTS"), replayed);
     }
     private static long version(DeliveryOrder order) { return Objects.requireNonNullElse(order.getVersion(), 0L); }
+    private List<LastlegOrder> completeRelatedOrders(DeliveryOrder delivery, LocalDateTime now) {
+        List<LastlegOrder> completedOrders = lastlegOrders.selectList(new LambdaQueryWrapper<LastlegOrder>()
+            .eq(LastlegOrder::getCustomerId, delivery.getCustomerId())
+            .eq(LastlegOrder::getDeliveryOrderNo, delivery.getDeliveryNo()));
+        for (LastlegOrder order : completedOrders) {
+            order.setSubOrderStatus("DELIVERY:DELIVERED");
+            order.setUpdatedAt(now);
+            lastlegOrders.updateById(order);
+        }
+        return completedOrders;
+    }
+    private void recordAutomaticCompletion(DeliveryOrder order, String operatorId, LocalDateTime now) {
+        DeliveryOperation operation = new DeliveryOperation();
+        operation.setCustomerId(order.getCustomerId()); operation.setDeliveryOrderId(order.getId());
+        operation.setOperatorId(operatorId); operation.setOperatorName(operatorId);
+        operation.setOperationNode("RECEIPT_AUTO_COMPLETE");
+        operation.setResult("签收文件保存成功，派送单自动完成");
+        operation.setCreatedAt(now); operations.insert(operation);
+    }
     private String hash(Object value) {
         try { return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(write(value).getBytes(StandardCharsets.UTF_8))); }
         catch (NoSuchAlgorithmException e) { throw new IllegalStateException(e); }

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryTransferService.java

@@ -73,6 +73,11 @@ import java.time.format.DateTimeFormatter;
 import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
 import java.math.BigDecimal;
 import java.util.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 
 @Service
 public class DeliveryTransferService {
@@ -103,6 +108,7 @@ public class DeliveryTransferService {
     @Resource private RelabelItemMapper relabelItems;
     @Resource private RelabelApplicationService relabelService;
     @Resource private LastlegOrderNoGenerator orderNoGenerator;
+    @Resource private ObjectMapper objectMapper;
 
     @Transactional
     public DeliveryResponses.TransferResult platformTransfer(String dispatchNo, String operatorId,
@@ -128,10 +134,10 @@ public class DeliveryTransferService {
         OutboundOrder replay = outboundOrders.findByIdempotency(customerId, request.idempotencyKey().trim());
         if (replay != null) {
             if (!dispatch.getId().equals(replay.getDispatchOrderId())) throw conflict("Idempotency key belongs to another dispatch");
-            return result(replay, requireDelivery(customerId, replay.getId()), true);
+            return result(replay, requireDeliveries(customerId, replay.getId()), true);
         }
         OutboundOrder existing = outboundOrders.lockByDispatch(customerId, dispatch.getId());
-        if (existing != null) return result(existing, requireDelivery(customerId, existing.getId()), true);
+        if (existing != null) return result(existing, requireDeliveries(customerId, existing.getId()), true);
         if (Set.of("CANCELLED", "DEPARTED", "PARTIAL_DEPARTED", "COMPLETED").contains(dispatch.getStatus())) {
             throw conflict("Dispatch cannot be transferred to delivery in its current status");
         }
@@ -161,11 +167,11 @@ public class DeliveryTransferService {
             // the document created by the winning transaction rather than receive a false failure.
             OutboundOrder concurrent = outboundOrders.findByIdempotency(customerId, request.idempotencyKey().trim());
             if (concurrent != null && dispatch.getId().equals(concurrent.getDispatchOrderId())) {
-                return result(concurrent, requireDelivery(customerId, concurrent.getId()), true);
+                return result(concurrent, requireDeliveries(customerId, concurrent.getId()), true);
             }
             concurrent = outboundOrders.lockByDispatch(customerId, dispatch.getId());
             if (concurrent != null) {
-                return result(concurrent, requireDelivery(customerId, concurrent.getId()), true);
+                return result(concurrent, requireDeliveries(customerId, concurrent.getId()), true);
             }
             throw conflict("Dispatch was concurrently transferred to delivery");
         }
@@ -189,43 +195,61 @@ public class DeliveryTransferService {
             outboundPallets.insert(item);
         }
 
-        DeliveryOrder delivery = new DeliveryOrder();
-        delivery.setId(IdWorker.getId()); delivery.setCustomerId(customerId);
-        delivery.setDeliveryNo(orderNoGenerator.next("DELIVERY", dispatch.getOverseasWarehouseId(), delivery.getId()));
-        delivery.setOutboundOrderId(outbound.getId()); delivery.setOutboundNo(outbound.getOutboundNo());
-        delivery.setDispatchOrderId(dispatch.getId()); delivery.setDispatchNo(dispatch.getDispatchNo());
-        delivery.setOverseasWarehouseId(dispatch.getOverseasWarehouseId()); delivery.setOverseasWarehouseName(dispatch.getOverseasWarehouseName());
+        Map<String, List<DispatchItem>> destinationGroups = items.stream().collect(java.util.stream.Collectors.groupingBy(
+            this::deliveryGroupKey, LinkedHashMap::new, java.util.stream.Collectors.toList()));
+        List<DeliveryOrder> deliveries = new ArrayList<>();
+        int groupIndex = 0;
+        for (Map.Entry<String, List<DispatchItem>> entry : destinationGroups.entrySet()) {
+            List<DispatchItem> groupItems = entry.getValue();
+            DispatchItem destination = groupItems.get(0);
+            DeliveryOrder delivery = new DeliveryOrder();
+            delivery.setId(IdWorker.getId()); delivery.setCustomerId(customerId);
+            delivery.setDeliveryNo(orderNoGenerator.next("DELIVERY", dispatch.getOverseasWarehouseId(), delivery.getId()));
+            delivery.setOutboundOrderId(outbound.getId()); delivery.setOutboundNo(outbound.getOutboundNo());
+            delivery.setDispatchOrderId(dispatch.getId()); delivery.setDispatchNo(dispatch.getDispatchNo());
+            delivery.setOverseasWarehouseId(dispatch.getOverseasWarehouseId()); delivery.setOverseasWarehouseName(dispatch.getOverseasWarehouseName());
+            delivery.setDestinationWarehouseId(trim(destination.getDestinationWarehouseId()));
+            delivery.setDestinationWarehouseCode(firstText(
+                firstText(destination.getDestinationWarehouseCode(), destination.getFbaWarehouseCode()),
+                destination.getDestinationWarehouseId()));
+            delivery.setDestinationWarehouseName(trim(destination.getDestinationWarehouseName()));
+            delivery.setDeliveryGroupKey(entry.getKey());
+            LastlegOrder firstOrder = firstTailOrder(customerId, groupItems);
+            delivery.setCustomerName(firstOrder == null ? null : firstOrder.getCustomerName()); delivery.setStatus("WAIT_DELIVERY"); delivery.setVersion(0L);
+            delivery.setWaybillNo(trim(request.waybillNo())); delivery.setDeliveryMethod(request.deliveryMethod().trim());
+            delivery.setCarrierName(firstText(request.carrierName(), dispatch.getCarrierName())); delivery.setPickupMethod(trim(request.pickupMethod()));
+            delivery.setLoadingType(trim(request.loadingType())); delivery.setVehicleType(trim(request.vehicleType())); delivery.setVehicleSize(trim(request.vehicleSize()));
+            delivery.setVehiclePlate(firstText(request.vehiclePlate(), dispatch.getVehiclePlate())); delivery.setDriverName(firstText(request.driverName(), dispatch.getDriverName()));
+            delivery.setDriverPhone(firstText(request.driverPhone(), dispatch.getDriverPhone())); delivery.setAppointmentAccount(trim(request.appointmentAccount()));
+            delivery.setSellerName(trim(request.sellerName())); delivery.setPlannedDeliveryAt(request.plannedDeliveryAt());
+            delivery.setPackageCount(groupItems.stream().map(DispatchItem::getPackageCount).filter(Objects::nonNull).mapToInt(Integer::intValue).sum());
+            delivery.setPalletCount(groupItems.size());
+            delivery.setTotalVolumeCbm(groupItems.stream().map(DispatchItem::getVolumeCbm).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+            delivery.setTotalWeightKg(totalWeight(customerId, groupItems)); delivery.setExpectedArrivalAt(dispatch.getEstimatedArrivalAt()); delivery.setRemark(trim(request.remark()));
+            delivery.setIdempotencyKey(childKey(request.idempotencyKey(), "DEST-" + groupIndex++)); delivery.setCreatedBy(operatorId);
+            delivery.setCreatedAt(now); delivery.setUpdatedAt(now); deliveryOrders.insert(delivery);
+            recordOperation(customerId, delivery.getId(), operatorId, "CREATE_DELIVERY", "按目的FBA仓生成派送单", now);
+            bindTailOrders(customerId, groupItems, outbound.getOutboundNo(), delivery.getDeliveryNo(), request.remark(), now);
+            deliveries.add(delivery);
+        }
+        DeliveryOrder feeDelivery = deliveries.get(0);
         LastlegOrder firstOrder = firstTailOrder(customerId, items);
-        delivery.setCustomerName(firstOrder == null ? null : firstOrder.getCustomerName()); delivery.setStatus("WAIT_DELIVERY"); delivery.setVersion(0L);
-        delivery.setWaybillNo(trim(request.waybillNo())); delivery.setDeliveryMethod(request.deliveryMethod().trim());
-        delivery.setCarrierName(firstText(request.carrierName(), dispatch.getCarrierName())); delivery.setPickupMethod(trim(request.pickupMethod()));
-        delivery.setLoadingType(trim(request.loadingType())); delivery.setVehicleType(trim(request.vehicleType())); delivery.setVehicleSize(trim(request.vehicleSize()));
-        delivery.setVehiclePlate(firstText(request.vehiclePlate(), dispatch.getVehiclePlate())); delivery.setDriverName(firstText(request.driverName(), dispatch.getDriverName()));
-        delivery.setDriverPhone(firstText(request.driverPhone(), dispatch.getDriverPhone())); delivery.setAppointmentAccount(trim(request.appointmentAccount()));
-        delivery.setSellerName(trim(request.sellerName())); delivery.setPlannedDeliveryAt(request.plannedDeliveryAt());
-        delivery.setPackageCount(outbound.getPackageCount()); delivery.setPalletCount(outbound.getPalletCount());
-        delivery.setTotalVolumeCbm(items.stream().map(DispatchItem::getVolumeCbm).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-        delivery.setTotalWeightKg(totalWeight(customerId, items)); delivery.setExpectedArrivalAt(dispatch.getEstimatedArrivalAt()); delivery.setRemark(trim(request.remark()));
-        delivery.setIdempotencyKey(request.idempotencyKey().trim()); delivery.setCreatedBy(operatorId);
-        delivery.setCreatedAt(now); delivery.setUpdatedAt(now); deliveryOrders.insert(delivery);
         List<DeliveryRequests.FeeItem> feeInputs = request.fees() == null ? List.of() : request.fees();
         for (DeliveryRequests.FeeItem input : feeInputs) {
             feeSources.publishApproved(operatorId, childKey(request.idempotencyKey(), input.feeType()),
-                new OverseasFeeSourceDtos.SaveRequest(customerId, delivery.getCustomerName(),
-                    "OVERSEAS_DELIVERY_FEE", "DELIVERY_ORDER", delivery.getId(), delivery.getDeliveryNo(),
+                new OverseasFeeSourceDtos.SaveRequest(customerId, feeDelivery.getCustomerName(),
+                    "OVERSEAS_DELIVERY_FEE", "DELIVERY_ORDER", feeDelivery.getId(), feeDelivery.getDeliveryNo(),
                     firstOrder == null ? null : firstOrder.getId(), null,
                     firstOrder == null ? null : firstOrder.getInboundCode(), null,
                     firstOrder == null ? null : parseLong(firstOrder.getSourceContainerBookingId()),
-                    firstOrder == null ? null : firstOrder.getContainerNo(), parseLong(delivery.getOverseasWarehouseId()),
+                    firstOrder == null ? null : firstOrder.getContainerNo(), parseLong(feeDelivery.getOverseasWarehouseId()),
                     input.feeType().trim(), input.feeName().trim(), input.direction(), input.supplierId(),
                     input.supplierName(), input.supplierCategory(), input.settlementMode(), input.paidAt(),
                     input.paymentMethod(), input.paymentReferenceNo(), input.paymentVoucherFileIds(), LocalDate.now(),
                     input.currency(), input.amount(), input.chargeableQuantity(), input.quantityUnit(), input.unitPrice(),
                     input.periodStart(), input.periodEnd()));
         }
-        recordOperation(customerId, delivery.getId(), operatorId, "CREATE_DELIVERY", "CREATED", now);
-        bindTailOrders(customerId, items, outbound.getOutboundNo(), delivery.getDeliveryNo(), request.remark(), now);
-        return result(outbound, delivery, false);
+        return result(outbound, deliveries, false);
     }
 
     private void validateTransferFees(DeliveryRequests.Transfer request) {
@@ -254,17 +278,33 @@ public class DeliveryTransferService {
 
     @Transactional
     public DeliveryResponses.PdaTask createOneClick(String customerId, String operatorId, DeliveryRequests.OneClickOutbound request) {
+        String requestHash = oneClickRequestHash(request);
         OutboundOrder existing = outboundOrders.findByIdempotency(customerId, request.idempotencyKey().trim());
-        if (existing != null) return taskResult(existing, pdaTasks.lockByOutbound(customerId, existing.getId()));
+        if (existing != null) return replayOneClick(existing, requestHash);
         LocalDateTime now = LocalDateTime.now();
-        String selectedWarehouseId = validateOneClickItems(customerId, request.items());
+        InventoryPosition firstPosition = inventoryPositions.selectById(request.items().get(0).inventoryPositionId());
+        if (firstPosition == null || !customerId.equals(firstPosition.getCustomerId())) {
+            throw conflict("所选库存不是可用的一件代发库存，或已被其他作业占用");
+        }
+        String selectedWarehouseId = required(firstPosition.getOverseasWarehouseId(), "库存缺少所属海外仓");
         OutboundOrder outbound = new OutboundOrder();
         outbound.setId(IdWorker.getId()); outbound.setCustomerId(customerId);
         outbound.setOutboundNo(orderNoGenerator.next("ONE_CLICK_DROPSHIP", selectedWarehouseId, outbound.getId()));
         outbound.setOutboundType("ONE_CLICK_DROPSHIP"); outbound.setStatus("WAIT_PICK"); outbound.setRecipientInfo(request.recipient().trim());
         outbound.setPackageCount(request.items().stream().mapToInt(i -> i.packages().intValue()).sum()); outbound.setPalletCount(request.items().size());
         outbound.setIdempotencyKey(request.idempotencyKey().trim()); outbound.setCreatedBy(operatorId); outbound.setCreatedAt(now); outbound.setUpdatedAt(now);
-        outboundOrders.insert(outbound);
+        outbound.setRequestHash(requestHash);
+        // Claim the unique command key before taking inventory locks. A racing insert
+        // waits for the first transaction; use a current read after it commits, not
+        // the REPEATABLE READ snapshot established by the initial lookup.
+        try {
+            outboundOrders.insert(outbound);
+        } catch (DuplicateKeyException duplicate) {
+            OutboundOrder concurrent = outboundOrders.lockByIdempotency(customerId, request.idempotencyKey().trim());
+            if (concurrent == null) throw duplicate;
+            return replayOneClick(concurrent, requestHash);
+        }
+        selectedWarehouseId = validateOneClickItems(customerId, request.items());
         Set<Long> physicalPalletIds = new HashSet<>();
         for (DeliveryRequests.OneClickItem input : request.items()) {
             InventoryPosition position = inventoryPositions.selectById(input.inventoryPositionId());
@@ -286,6 +326,23 @@ public class DeliveryTransferService {
         return taskResult(outbound, task);
     }
 
+    private DeliveryResponses.PdaTask replayOneClick(OutboundOrder existing, String requestHash) {
+        if (!"ONE_CLICK_DROPSHIP".equals(existing.getOutboundType())
+            || !requestHash.equals(existing.getRequestHash())) {
+            throw conflict("相同幂等键不能用于不同的一件代发出库请求");
+        }
+        return taskResult(existing, pdaTasks.lockByOutbound(existing.getCustomerId(), existing.getId()));
+    }
+
+    String oneClickRequestHash(DeliveryRequests.OneClickOutbound request) {
+        try {
+            return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
+                .digest(objectMapper.writeValueAsString(request).getBytes(StandardCharsets.UTF_8)));
+        } catch (JsonProcessingException | NoSuchAlgorithmException error) {
+            throw new IllegalStateException("无法生成一件代发出库请求摘要", error);
+        }
+    }
+
     public List<DeliveryResponses.OneClickCandidate> oneClickCandidates(String customerId, String warehouseId) {
         return dropshipProfiles.listOutboundCandidates(customerId,
                 StringUtils.hasText(warehouseId) ? warehouseId.trim() : null).stream()
@@ -491,8 +548,19 @@ public class DeliveryTransferService {
         }
         DropshipOrderProfile profile = dropshipProfiles.findPosition(customerId, request.inventoryPositionId());
         if (profile == null) throw conflict("Scanned pallet is not one-click dropship inventory");
-        List<DropshipCarton> cartons = StringUtils.hasText(item.getCartonMarks())
-            ? Arrays.stream(item.getCartonMarks().split(",")).map(String::trim).filter(StringUtils::hasText)
+        List<String> submittedMarks = request.cartonMarks() == null ? List.of() : request.cartonMarks();
+        List<String> selectedMarks = submittedMarks.stream().map(String::trim).filter(StringUtils::hasText).distinct().sorted().toList();
+        Set<String> frozenMarks = new HashSet<>(Arrays.asList(Optional.ofNullable(item.getCartonMarks()).orElse("").split(",")));
+        if (!submittedMarks.isEmpty() && (selectedMarks.size() != submittedMarks.size()
+            || selectedMarks.size() != request.packages()
+            || StringUtils.hasText(item.getCartonMarks()) && !frozenMarks.containsAll(selectedMarks))) {
+            throw conflict("拣货箱唛必须唯一、数量一致且属于当前出库明细");
+        }
+        if (StringUtils.hasText(item.getCartonMarks()) && selectedMarks.isEmpty()) {
+            throw conflict("请提交本次实际拣货的指定箱唛");
+        }
+        List<DropshipCarton> cartons = !selectedMarks.isEmpty()
+            ? selectedMarks.stream()
                 .map(mark -> dropshipCartons.findByProfileAndMark(customerId, profile.getId(), mark)).filter(Objects::nonNull)
                 .filter(carton -> "AVAILABLE".equals(carton.getStatus()) && item.getSkuCode().equals(carton.getSkuCode())).toList()
             : dropshipCartons.lockAvailable(customerId, profile.getId(), item.getSkuCode(), request.packages());
@@ -572,17 +640,19 @@ public class DeliveryTransferService {
             || !Set.of("WAIT_PICK", "WAIT_OUTBOUND").contains(i.getStatus()))) {
             throw conflict("Outbound order cannot be cancelled after execution has started");
         }
-        DeliveryOrder existingDelivery = deliveryOrders.lockByOutbound(customerId, outbound.getId());
-        if (existingDelivery != null && !"WAIT_DELIVERY".equals(existingDelivery.getStatus()))
+        List<DeliveryOrder> existingDeliveries = deliveryOrders.lockByOutbound(customerId, outbound.getId());
+        if (existingDeliveries.stream().anyMatch(delivery -> !"WAIT_DELIVERY".equals(delivery.getStatus())))
             throw conflict("Outbound order cannot be cancelled while delivery is in progress");
         LocalDateTime now = LocalDateTime.now();
-        DeliveryOrder delivery = existingDelivery;
-        if (delivery != null) { delivery.setStatus("CANCELLED"); delivery.setVersion(value(delivery.getVersion()) + 1); delivery.setUpdatedAt(now); deliveryOrders.updateById(delivery); }
+        for (DeliveryOrder delivery : existingDeliveries) {
+            delivery.setStatus("CANCELLED"); delivery.setVersion(value(delivery.getVersion()) + 1);
+            delivery.setUpdatedAt(now); deliveryOrders.updateById(delivery);
+        }
         OutboundPdaTask task = pdaTasks.lockByOutbound(customerId, outbound.getId());
         if (task != null) { task.setStatus("CANCELLED"); task.setUpdatedAt(now); pdaTasks.updateById(task); }
         outbound.setStatus("CANCELLED"); outbound.setUpdatedAt(now); outboundOrders.updateById(outbound);
         for (OutboundPalletItem item : outboundItems) { item.setStatus("CANCELLED"); outboundPallets.updateById(item); }
-        if (delivery != null) {
+        if (!existingDeliveries.isEmpty()) {
             for (LastlegOrder order : tailOrders.selectList(new LambdaQueryWrapper<LastlegOrder>().eq(LastlegOrder::getCustomerId, customerId).eq(LastlegOrder::getOutboundOrderNo, outboundNo))) {
                 String from = order.getCurrentStatus(); order.setCurrentStatus("RECEIVED"); order.setSubOrderStatus(null); order.setOutboundOrderNo(null); order.setDeliveryOrderNo(null); order.setUpdatedAt(now); tailOrders.updateById(order);
                 LastlegOrderStatusHistory history = new LastlegOrderStatusHistory(); history.setCustomerId(customerId); history.setOrderId(order.getId()); history.setFromStatus(from); history.setToStatus("RECEIVED"); history.setEventId("CANCEL_OUTBOUND:" + outboundNo); history.setRemark(request.reason().trim()); history.setCreatedAt(now); histories.insert(history);
@@ -644,6 +714,8 @@ public class DeliveryTransferService {
                                                                       OutboundPalletItem item) {
         if (item.getWarehousePalletId() == null) return List.of();
         List<DeliveryResponses.PdaPickPosition> result = new ArrayList<>();
+        Set<String> frozenMarks = new HashSet<>(Arrays.asList(
+            Optional.ofNullable(item.getCartonMarks()).orElse("").split(",")));
         for (InventoryPosition position : inventoryPositions.listPallet(customerId, item.getWarehousePalletId())) {
             long available = value(position.getAvailablePackages());
             if (available <= 0 || !warehouseId.equals(position.getOverseasWarehouseId())) continue;
@@ -654,7 +726,9 @@ public class DeliveryTransferService {
             List<String> marks = profile == null ? List.of() : dropshipCartons.listProfile(customerId, profile.getId())
                 .stream().filter(carton -> "AVAILABLE".equals(carton.getStatus()))
                 .filter(carton -> Objects.equals(item.getSkuCode(), carton.getSkuCode()))
+                .filter(carton -> !StringUtils.hasText(item.getCartonMarks()) || frozenMarks.contains(carton.getCartonMark()))
                 .map(DropshipCarton::getCartonMark).filter(StringUtils::hasText).distinct().limit(available).toList();
+            if (profile != null && marks.isEmpty()) continue;
             if (!matchesOutboundItem(customerId, warehouseId, item, balance) && marks.isEmpty()) continue;
             if (marks.isEmpty()) {
                 result.add(pdaPosition(position, item, balance, null, available, value(position.getPickedPackages())));
@@ -669,7 +743,7 @@ public class DeliveryTransferService {
                                                             InventoryBalance balance, String cartonMark,
                                                             long available, long picked) {
         return new DeliveryResponses.PdaPickPosition(position.getId(), position.getPalletNo(), cartonMark,
-            balance.getSkuCode(), balance.getInboundCode(), available, picked);
+            item.getSkuCode(), balance.getInboundCode(), available, picked);
     }
 
     private boolean matchesOutboundItem(String customerId, String warehouseId, OutboundPalletItem item,
@@ -718,13 +792,13 @@ public class DeliveryTransferService {
         OutboundOrder outbound = outboundOrders.findGlobalByNo(trim(outboundNo));
         if (outbound == null) throw notFound("Outbound order not found");
         String customerId = outbound.getCustomerId();
-        DeliveryOrder delivery = deliveryOrders.lockByOutbound(customerId, outbound.getId());
-        if (delivery == null && "DISPATCH_DELIVERY".equals(outbound.getOutboundType())) {
+        List<DeliveryOrder> deliveries = deliveryOrders.lockByOutbound(customerId, outbound.getId());
+        if (deliveries.isEmpty() && "DISPATCH_DELIVERY".equals(outbound.getOutboundType())) {
             throw new IllegalStateException("Delivery document is missing for dispatch outbound order");
         }
         List<DeliveryResponses.OutboundPalletRow> pallets = outboundPallets.findByOutbound(customerId, outbound.getId()).stream()
             .map(this::outboundPalletRow).toList();
-        return new DeliveryResponses.OutboundDetail(outboundRow(outbound), delivery == null ? null : deliveryRow(delivery), pallets);
+        return new DeliveryResponses.OutboundDetail(outboundRow(outbound), deliveries.stream().map(this::deliveryRow).toList(), pallets);
     }
 
     public PageResult<DeliveryResponses.DeliveryRow> deliveryPage(String customerId, DeliveryRequests.Query query) {
@@ -747,7 +821,8 @@ public class DeliveryTransferService {
     public DeliveryResponses.DeliveryDetail deliveryDetail(String customerId, String deliveryNo) {
         DeliveryOrder delivery = deliveryOrders.findByNo(customerId, deliveryNo);
         if (delivery == null) throw notFound("Delivery order not found");
-        List<DispatchItem> items = dispatchItems.findByDispatchOrder(customerId, delivery.getDispatchOrderId());
+        List<DispatchItem> items = dispatchItems.findByDispatchOrder(customerId, delivery.getDispatchOrderId()).stream()
+            .filter(item -> delivery.getDeliveryGroupKey().equals(deliveryGroupKey(item))).toList();
         List<Long> orderIds = items.stream().map(DispatchItem::getOrderId).filter(Objects::nonNull).distinct().toList();
         Map<Long, LastlegOrder> ordersById = orderIds.isEmpty() ? Map.of() : tailOrders.selectBatchIds(orderIds).stream()
             .filter(order -> customerId.equals(order.getCustomerId())).collect(java.util.stream.Collectors.toMap(LastlegOrder::getId, order -> order));
@@ -789,14 +864,16 @@ public class DeliveryTransferService {
         }
     }
 
-    private DeliveryOrder requireDelivery(String customerId, Long outboundId) {
-        DeliveryOrder value = deliveryOrders.lockByOutbound(customerId, outboundId);
-        if (value == null) throw new IllegalStateException("Delivery document is missing for outbound order");
-        return value;
+    private List<DeliveryOrder> requireDeliveries(String customerId, Long outboundId) {
+        List<DeliveryOrder> values = deliveryOrders.lockByOutbound(customerId, outboundId);
+        if (values.isEmpty()) throw new IllegalStateException("Delivery documents are missing for outbound order");
+        return values;
     }
-    private DeliveryResponses.TransferResult result(OutboundOrder o, DeliveryOrder d, boolean replayed) {
+    private DeliveryResponses.TransferResult result(OutboundOrder o, List<DeliveryOrder> deliveries, boolean replayed) {
         return new DeliveryResponses.TransferResult(o.getDispatchNo(), o.getOutboundNo(), o.getStatus(),
-            d.getDeliveryNo(), d.getStatus(), o.getPalletCount(), o.getPackageCount(), replayed);
+            o.getPalletCount(), o.getPackageCount(), deliveries.stream().map(d -> new DeliveryResponses.TransferDelivery(
+                d.getDeliveryNo(), d.getStatus(), d.getDestinationWarehouseId(), d.getDestinationWarehouseCode(),
+                d.getDestinationWarehouseName(), value(d.getPalletCount()), value(d.getPackageCount()))).toList(), replayed);
     }
     private DeliveryResponses.OutboundRow outboundRow(OutboundOrder o) { return new DeliveryResponses.OutboundRow(o.getId(), o.getOutboundNo(), o.getDispatchNo(), o.getOverseasWarehouseId(), o.getLxCodes(), o.getStatus(), o.getPalletCount(), o.getPackageCount(), o.getCreatedAt(), o.getOutboundType()); }
     private DeliveryResponses.OutboundPalletRow outboundPalletRow(OutboundPalletItem item) {
@@ -810,12 +887,18 @@ public class DeliveryTransferService {
             candidate.getInboundCode(), candidate.getSkuCode(), candidate.getProductName(),
             value(candidate.getAvailablePackages()));
     }
-    private DeliveryResponses.DeliveryRow deliveryRow(DeliveryOrder d) { return new DeliveryResponses.DeliveryRow(d.getId(), d.getCustomerId(), d.getCustomerName(), d.getDeliveryNo(), d.getOutboundNo(), d.getDispatchNo(), d.getOverseasWarehouseId(), d.getOverseasWarehouseName(), d.getStatus(), d.getWaybillNo(), d.getDeliveryMethod(), d.getCarrierName(), d.getPickupMethod(), d.getLoadingType(), d.getVehicleType(), d.getVehicleSize(), d.getVehiclePlate(), d.getDriverName(), d.getDriverPhone(), d.getAppointmentAccount(), d.getSellerName(), value(d.getPalletCount()), value(d.getPackageCount()), d.getTotalWeightKg(), d.getTotalVolumeCbm(), d.getPlannedDeliveryAt(), d.getDispatchedAt(), d.getExpectedArrivalAt(), d.getSignedAt(), d.getRemark(), d.getCreatedAt(), value(d.getVersion()), DeliveryStatusPolicy.allowedActions(d.getStatus()), d.getBolNo(), com.baiyue.lastleg.delivery.model.DeliveryDocumentSnapshot.summary(d.getDocumentsJson())); }
+    private DeliveryResponses.DeliveryRow deliveryRow(DeliveryOrder d) { return new DeliveryResponses.DeliveryRow(d.getId(), d.getCustomerId(), d.getCustomerName(), d.getDeliveryNo(), d.getOutboundNo(), d.getDispatchNo(), d.getOverseasWarehouseId(), d.getOverseasWarehouseName(), d.getStatus(), d.getWaybillNo(), d.getDeliveryMethod(), d.getCarrierName(), d.getPickupMethod(), d.getLoadingType(), d.getVehicleType(), d.getVehicleSize(), d.getVehiclePlate(), d.getDriverName(), d.getDriverPhone(), d.getAppointmentAccount(), d.getSellerName(), value(d.getPalletCount()), value(d.getPackageCount()), d.getTotalWeightKg(), d.getTotalVolumeCbm(), d.getPlannedDeliveryAt(), d.getDispatchedAt(), d.getExpectedArrivalAt(), d.getSignedAt(), d.getRemark(), d.getCreatedAt(), value(d.getVersion()), DeliveryStatusPolicy.allowedActions(d.getStatus()), d.getBolNo(), com.baiyue.lastleg.delivery.model.DeliveryDocumentSnapshot.summary(d.getDocumentsJson()), d.getDestinationWarehouseId(), d.getDestinationWarehouseCode(), d.getDestinationWarehouseName()); }
     private DeliveryResponses.DeliverySku sku(LastlegOrderDetail d, LastlegOrder order) { return new DeliveryResponses.DeliverySku(order == null ? null : order.getInboundCode(), order == null ? null : order.getCustomerName(), d.getDestinationWarehouseCode(), null, d.getShipmentNo(), d.getFbaTrackingNo(), d.getSkuCode(), firstText(d.getProductNameZh(), d.getProductNameEn()), value(d.getPackageCount()), d.getGrossWeightKg(), d.getVolumeCbm()); }
     private DeliveryResponses.DeliveryFeeRow feeRow(OverseasFeeSource f) { return new DeliveryResponses.DeliveryFeeRow(f.getId(), f.getDirection(), f.getFeeItemCode(), f.getOriginalCurrency(), f.getOriginalAmount(), f.getReviewReason()); }
     private DeliveryResponses.DeliveryOperationRow operationRow(DeliveryOperation o) { return new DeliveryResponses.DeliveryOperationRow(o.getId(), o.getCreatedAt(), o.getOperationNode(), firstText(o.getOperatorName(), o.getOperatorId()), o.getResult()); }
     private void recordOperation(String customerId, Long deliveryId, String operatorId, String node, String result, LocalDateTime now) { DeliveryOperation operation = new DeliveryOperation(); operation.setCustomerId(customerId); operation.setDeliveryOrderId(deliveryId); operation.setOperationNode(node); operation.setOperatorId(operatorId); operation.setOperatorName(operatorId); operation.setResult(result); operation.setCreatedAt(now); deliveryOperations.insert(operation); }
     private LastlegOrder firstTailOrder(String customerId, List<DispatchItem> items) { return items.stream().map(DispatchItem::getOrderId).filter(Objects::nonNull).map(tailOrders::selectById).filter(Objects::nonNull).filter(order -> customerId.equals(order.getCustomerId())).findFirst().orElse(null); }
+    private String deliveryGroupKey(DispatchItem item) {
+        String code = firstText(item.getDestinationWarehouseCode(), item.getFbaWarehouseCode());
+        if (StringUtils.hasText(code)) return "CODE:" + code.toUpperCase(Locale.ROOT);
+        if (StringUtils.hasText(item.getDestinationWarehouseId())) return "ID:" + item.getDestinationWarehouseId().trim();
+        throw conflict("Dispatch pallet is missing its destination FBA warehouse");
+    }
     private String resolveLxCodes(String customerId, List<DispatchItem> items) {
         List<String> inboundCodes = items.stream().map(DispatchItem::getInboundCode)
             .filter(StringUtils::hasText).map(String::trim).distinct().toList();

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchController.java

@@ -29,7 +29,7 @@ public class DispatchController {
 
     @PutMapping("/{dispatchNo}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_EDIT + "')")
-    @Operation(summary = "Edit vehicle, driver, appointment and route data")
+    @Operation(summary = "Edit vehicle, driver and appointment data; route is derived from assigned FBA warehouses")
     public ApiResponse<DispatchResponse> update(
         @AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String dispatchNo,

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchRequests.java

@@ -20,18 +20,18 @@ public final class DispatchRequests {
     }
 
     public record PreArrange(@NotEmpty @Size(max = 500) List<@NotNull Long> planPalletIds,
-                             @Size(max = 255) String route, @Size(max = 64) String fbaAppointmentNo,
+                             @Size(max = 64) String fbaAppointmentNo,
                              @Size(max = 32) String fbaAppointmentStatus,
                              @Size(max = 32) String vehicleAppointmentStatus,
                              @Size(max = 64) String draftToken,
                              @Size(max = 64) String relabelNo) {
-        public PreArrange(List<Long> planPalletIds, String route, String fbaAppointmentNo,
+        public PreArrange(List<Long> planPalletIds, String fbaAppointmentNo,
                           String fbaAppointmentStatus, String vehicleAppointmentStatus) {
-            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, null, null);
+            this(planPalletIds, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, null, null);
         }
-        public PreArrange(List<Long> planPalletIds, String route, String fbaAppointmentNo,
+        public PreArrange(List<Long> planPalletIds, String fbaAppointmentNo,
                           String fbaAppointmentStatus, String vehicleAppointmentStatus, String draftToken) {
-            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, draftToken, null);
+            this(planPalletIds, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, draftToken, null);
         }
     }
 
@@ -39,7 +39,7 @@ public final class DispatchRequests {
         public DraftPallet(Long planPalletId, String draftToken) { this(planPalletId, draftToken, null); }
     }
 
-    public record DraftContainer(@NotBlank @Size(max = 64) String draftToken, @NotNull @Min(1) @Max(500) Integer capacity) {}
+    public record DraftContainer(@NotBlank @Size(max = 64) String draftToken, @NotNull Integer capacity) {}
 
     public record DraftRelease(@NotBlank @Size(max = 64) String draftToken) {
     }
@@ -51,7 +51,6 @@ public final class DispatchRequests {
 
     public record Update(@Size(max = 64) String vehiclePlate, @Size(max = 128) String driverName,
                          @Size(max = 64) String driverPhone, @Size(max = 255) String carrierName,
-                         @Size(max = 255) String route,
                          @Size(max = 64) String fbaAppointmentNo,
                          @Size(max = 32) String fbaAppointmentStatus,
                          @Size(max = 32) String vehicleAppointmentStatus,

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

@@ -134,6 +134,9 @@ public class DispatchService {
 
     @Transactional
     public DispatchContainerResponse createDraftContainer(String operatorId, DispatchRequests.DraftContainer request) {
+        if (!Set.of(15, 30).contains(request.capacity())) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "车辆大小仅支持15托或30托");
+        }
         DispatchDraft draft = ensureDraft(operatorId, request.draftToken());
         int next = draftContainers.findByToken(request.draftToken()).stream().mapToInt(DispatchDraftContainer::getSequenceNo).max().orElse(0) + 1;
         DispatchDraftContainer c = new DispatchDraftContainer(); c.setId(IdWorker.getId()); c.setDraftId(draft.getId()); c.setDraftToken(request.draftToken()); c.setSequenceNo(next); c.setCapacity(request.capacity()); c.setCreatedAt(LocalDateTime.now()); c.setUpdatedAt(LocalDateTime.now()); draftContainers.insert(c);
@@ -313,7 +316,7 @@ public class DispatchService {
             dispatch.setCreatedBy(trimToNull(operatorId));
             dispatch.setCreatedAt(now);
         }
-        dispatch.setRoute(StringUtils.hasText(request.route()) ? request.route().trim() : route(selected));
+        dispatch.setRoute(candidateRoute(selected));
         dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo()));
         dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus()));
         dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus()));
@@ -439,7 +442,7 @@ public class DispatchService {
         LocalDateTime now = LocalDateTime.now();
         DispatchOrder dispatch = new DispatchOrder(); dispatch.setId(IdWorker.getId()); dispatch.setCustomerId(customerId);
         dispatch.setDispatchNo(orderNoGenerator.next("DISPATCH", warehouse, dispatch.getId())); dispatch.setOverseasWarehouseId(warehouse); dispatch.setOverseasWarehouseName(selected.get(0).overseasWarehouseName());
-        dispatch.setRoute(StringUtils.hasText(request.route()) ? request.route().trim() : route(selected)); dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo())); dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus())); dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus())); dispatch.setStatus(PENDING_DEPARTURE); dispatch.setItemCount(selected.size()); dispatch.setPalletCount(selected.size()); dispatch.setPackageCount(selected.stream().map(DispatchPalletCandidate::packageCount).filter(Objects::nonNull).mapToInt(Integer::intValue).sum()); dispatch.setPickedPackageCount(0); dispatch.setShippedPackageCount(0); dispatch.setCreatedBy(trimToNull(operatorId)); dispatch.setCreatedAt(now); dispatch.setUpdatedAt(now); orders.insert(dispatch);
+        dispatch.setRoute(candidateRoute(selected)); dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo())); dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus())); dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus())); dispatch.setStatus(PENDING_DEPARTURE); dispatch.setItemCount(selected.size()); dispatch.setPalletCount(selected.size()); dispatch.setPackageCount(selected.stream().map(DispatchPalletCandidate::packageCount).filter(Objects::nonNull).mapToInt(Integer::intValue).sum()); dispatch.setPickedPackageCount(0); dispatch.setShippedPackageCount(0); dispatch.setCreatedBy(trimToNull(operatorId)); dispatch.setCreatedAt(now); dispatch.setUpdatedAt(now); orders.insert(dispatch);
         for (DispatchPalletCandidate candidate : selected) { DispatchItem item = new DispatchItem(); item.setId(IdWorker.getId()); item.setDispatchOrderId(dispatch.getId()); item.setCustomerId(customerId); item.setWarehousePalletId(candidate.warehousePalletId()); item.setOrderId(candidate.orderId()); item.setOverseasWarehouseId(candidate.overseasWarehouseId()); item.setOverseasWarehouseName(candidate.overseasWarehouseName()); item.setOrderNo(candidate.orderNo()); item.setOrderRefs(candidate.orderRefs()); item.setInboundCode(candidate.inboundCode()); item.setPalletNo(candidate.palletNo()); item.setDestinationWarehouseCode(candidate.destinationWarehouseCode()); item.setDestinationWarehouseName(candidate.destinationWarehouseName()); item.setFbaWarehouseCode(candidate.fbaWarehouseCode()); item.setPackageCount(Objects.requireNonNullElse(candidate.packageCount(), 0)); item.setVolumeCbm(Objects.requireNonNullElse(candidate.volumeCbm(), BigDecimal.ZERO)); item.setSourceStage("RELABEL"); item.setCartonMarks(candidate.relabelCartonMarks()); item.setSourceBusinessType("RELABEL_ORDER"); item.setSourceBusinessNo(request.relabelNo()); item.setCreatedAt(now); items.insert(item); }
         DispatchPdaTask task = new DispatchPdaTask(); task.setId(IdWorker.getId()); task.setCustomerId(customerId); task.setDispatchOrderId(dispatch.getId()); task.setTaskNo("DPDA" + task.getId()); task.setStatus("PDA_PENDING"); task.setWarehouseId(warehouse); task.setPushedAt(now); task.setCreatedAt(now); task.setUpdatedAt(now); pdaTasks.insert(task);
         if (candidates.markRelabelPreDispatched(customerId, request.relabelNo()) != 1) throw new ResponseStatusException(HttpStatus.CONFLICT, "换标订单已被其他排车占用");
@@ -514,18 +517,19 @@ public class DispatchService {
                 "Only a pending dispatch can be edited");
         }
         String customerId = dispatch.getCustomerId();
+        List<DispatchItem> assignedItems = items.findByDispatchOrder(customerId, dispatch.getId());
         dispatch.setVehiclePlate(trimToNull(request.vehiclePlate()));
         dispatch.setDriverName(trimToNull(request.driverName()));
         dispatch.setDriverPhone(trimToNull(request.driverPhone()));
         dispatch.setCarrierName(trimToNull(request.carrierName()));
-        dispatch.setRoute(trimToNull(request.route()));
+        dispatch.setRoute(itemRoute(assignedItems));
         dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo()));
         dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus()));
         dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus()));
         dispatch.setEstimatedArrivalAt(request.estimatedArrivalAt());
         dispatch.setUpdatedAt(LocalDateTime.now());
         orders.updateById(dispatch);
-        return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
+        return response(dispatch, assignedItems);
     }
 
     @Transactional
@@ -557,6 +561,7 @@ public class DispatchService {
         dispatch.setPalletCount(remaining.size());
         dispatch.setPackageCount(remaining.stream().map(DispatchItem::getPackageCount).filter(Objects::nonNull)
             .mapToInt(Integer::intValue).sum());
+        dispatch.setRoute(itemRoute(remaining));
         dispatch.setUpdatedAt(now);
         orders.updateById(dispatch);
         return response(dispatch, remaining);
@@ -620,7 +625,7 @@ public class DispatchService {
         String orderNos = itemList.stream().flatMap(item -> splitOrderRefs(item.getOrderRefs(), item.getOrderNo()).stream())
             .distinct().collect(Collectors.joining(","));
         return new DispatchResponse(order.getId(), order.getDispatchNo(), order.getVehiclePlate(), order.getDriverName(),
-            order.getDriverPhone(), order.getCarrierName(), orderNos, order.getRoute(),
+            order.getDriverPhone(), order.getCarrierName(), orderNos, itemRoute(itemList),
             order.getOverseasWarehouseId(), order.getOverseasWarehouseName(), order.getDepartAt(),
             order.getFbaAppointmentNo(), order.getFbaAppointmentStatus(), order.getVehicleAppointmentStatus(),
             order.getEstimatedArrivalAt(), order.getStatus(), Objects.requireNonNullElse(order.getItemCount(), 0),
@@ -637,9 +642,24 @@ public class DispatchService {
             bolLineList == null ? List.of() : bolLineList);
     }
 
-    private static String route(List<DispatchPalletCandidate> selected) {
-        return selected.stream().map(DispatchPalletCandidate::destinationWarehouseCode).filter(StringUtils::hasText)
-            .distinct().collect(Collectors.joining(" -> "));
+    private static String candidateRoute(List<DispatchPalletCandidate> selected) {
+        return selected.stream().map(DispatchService::candidateFbaCode).filter(StringUtils::hasText)
+            .distinct().collect(Collectors.joining(","));
+    }
+
+    private static String itemRoute(List<DispatchItem> assignedItems) {
+        return assignedItems.stream().map(DispatchService::itemFbaCode).filter(StringUtils::hasText)
+            .distinct().collect(Collectors.joining(","));
+    }
+
+    private static String candidateFbaCode(DispatchPalletCandidate candidate) {
+        return StringUtils.hasText(candidate.fbaWarehouseCode())
+            ? candidate.fbaWarehouseCode().trim() : trimToNull(candidate.destinationWarehouseCode());
+    }
+
+    private static String itemFbaCode(DispatchItem item) {
+        return StringUtils.hasText(item.getFbaWarehouseCode())
+            ? item.getFbaWarehouseCode().trim() : trimToNull(item.getDestinationWarehouseCode());
     }
 
     private DispatchPalletCandidate requireDraftCandidate(String customerId, Long planPalletId) {

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

@@ -5,13 +5,11 @@ 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,

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

@@ -75,6 +75,11 @@ public interface InboundPlanOrderMapper {
     String findSourceContainerBookingId(@Param("customerId") String customerId,
                                         @Param("orderId") Long orderId);
 
+    @Select("SELECT estimated_warehouse_at FROM ll_order " +
+        "WHERE source_container_booking_id=#{sourceContainerBookingId} ORDER BY customer_id,id")
+    List<LocalDateTime> containerEstimatedWarehouseTimes(
+        @Param("sourceContainerBookingId") String sourceContainerBookingId);
+
     @Select("SELECT order_type FROM ll_order WHERE customer_id=#{customerId} AND id=#{orderId} LIMIT 1")
     String findOrderType(@Param("customerId") String customerId,
                          @Param("orderId") Long orderId);

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

@@ -91,6 +91,18 @@ public class ReceivingContainerController {
             .contentLength(download.content().length).body(download.content());
     }
 
+    @GetMapping("/current/domestic-loading-photos/{evidenceType}/content")
+    public ResponseEntity<byte[]> downloadDomesticLoadingPhoto(@AuthenticationPrincipal AuthenticatedUser user,
+                                                                @PathVariable String evidenceType) {
+        PdaWarehouseIdentity identity = currentIdentity(user);
+        var download = service.downloadDomesticLoadingPhoto(identity.operatorKey(), evidenceType);
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore())
+            .header(HttpHeaders.CONTENT_DISPOSITION,
+                ContentDisposition.inline().filename(download.fileName(), StandardCharsets.UTF_8).build().toString())
+            .contentType(MediaType.parseMediaType(download.contentType()))
+            .contentLength(download.content().length).body(download.content());
+    }
+
     @PostMapping("/current/sign")
     public ApiResponse<ReceivingContainerResponses.Session> sign(@AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody ReceivingContainerRequests.Sign request) {

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

@@ -32,7 +32,8 @@ public final class ReceivingContainerResponses {
     public record Session(String containerNo, Long overseasWarehouseId, String overseasWarehouseCode,
                           String overseasWarehouseName,
                           String status, String operatorName, int version,
-                          List<SignedPhoto> photos, LocalDateTime preparedAt, LocalDateTime signedAt,
+                          List<SignedPhoto> photos, List<DomesticLoadingPhoto> domesticLoadingPhotos,
+                          LocalDateTime preparedAt, LocalDateTime signedAt,
                           LocalDateTime receivingAt, LocalDateTime completedAt,
                           int totalPackages, int receivedPackages, int pendingPackages,
                           boolean hasDifference, List<Inbound> inbounds) {
@@ -42,7 +43,7 @@ public final class ReceivingContainerResponses {
                        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,
+                version, photos, List.of(), preparedAt, signedAt, receivingAt, completedAt, totalPackages,
                 receivedPackages, pendingPackages, false, inbounds);
         }
 
@@ -52,13 +53,15 @@ public final class ReceivingContainerResponses {
                        LocalDateTime receivingAt, LocalDateTime completedAt, int totalPackages,
                        int receivedPackages, int pendingPackages, List<Inbound> inbounds) {
             this(containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName,
-                status, operatorName, version, photos, preparedAt, signedAt, receivingAt,
+                status, operatorName, version, photos, List.of(), preparedAt, signedAt, receivingAt,
                 completedAt, totalPackages, receivedPackages, pendingPackages, false, inbounds);
         }
     }
 
     public record SignedPhoto(ReceivingPhotoRole role, String fileId, String downloadPath) { }
 
+    public record DomesticLoadingPhoto(String evidenceType, String label, String downloadPath) { }
+
     public record Inbound(String inboundCode, String destinationType,
                           String overseasWarehouseId, String overseasWarehouseName,
                           String destinationWarehouseId,

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

@@ -0,0 +1,22 @@
+package com.baiyue.lastleg.inboundplan.pda.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@TableName("ll_container_loading_evidence")
+public class ContainerLoadingEvidence {
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    private String sourceContainerBookingId;
+    private String evidenceType;
+    private Long sourceFileId;
+    private String fileName;
+    private LocalDateTime createdAt;
+}

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

@@ -0,0 +1,7 @@
+package com.baiyue.lastleg.inboundplan.pda.gateway;
+
+public interface DomesticLoadingEvidenceGateway {
+    DownloadedFile download(long containerBookingId, long fileId);
+
+    record DownloadedFile(byte[] content, String fileName, String contentType) { }
+}

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

@@ -0,0 +1,55 @@
+package com.baiyue.lastleg.inboundplan.pda.gateway;
+
+import com.baiyue.lastleg.config.LastlegRestClientFactory;
+import com.baiyue.lastleg.config.LastlegRestClientProperties;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
+import org.springframework.web.server.ResponseStatusException;
+
+@Component
+public class HttpDomesticLoadingEvidenceGateway implements DomesticLoadingEvidenceGateway {
+    @Resource private RestClient.Builder restClientBuilder;
+    @Resource private LastlegRestClientFactory restClientFactory;
+    @Resource private LastlegRestClientProperties restClientProperties;
+    @Value("${baiyue.clients.domestic-file.url:http://127.0.0.1:9205}") private String baseUrl;
+    @Value("${baiyue.security.internal-service-token:}") private String internalToken;
+    private RestClient client;
+
+    @PostConstruct
+    void initializeClient() {
+        client = restClientFactory.build(restClientBuilder, baseUrl,
+            restClientProperties.getDomesticLoadingEvidence());
+    }
+
+    @Override
+    public DownloadedFile download(long containerBookingId, long fileId) {
+        ResponseEntity<byte[]> response = client.get()
+            .uri("/internal/file/v1/loading-evidence/{containerBookingId}/{fileId}/content",
+                containerBookingId, fileId)
+            .header("X-Internal-Service-Token", internalToken).retrieve()
+            .onStatus(HttpStatusCode::is4xxClientError, (request, result) -> {
+                throw new ResponseStatusException(result.getStatusCode().value() == 404
+                    ? HttpStatus.NOT_FOUND : HttpStatus.BAD_REQUEST, "国内装柜照片不可用");
+            })
+            .onStatus(HttpStatusCode::is5xxServerError, (request, result) -> {
+                throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, "国内装柜照片暂时无法加载");
+            }).toEntity(byte[].class);
+        byte[] content = response.getBody() == null ? new byte[0] : response.getBody();
+        String disposition = response.getHeaders().getFirst(HttpHeaders.CONTENT_DISPOSITION);
+        String fileName = null;
+        try { fileName = disposition == null ? null : ContentDisposition.parse(disposition).getFilename(); }
+        catch (IllegalArgumentException ignored) { }
+        String contentType = response.getHeaders().getContentType() == null
+            ? MediaType.APPLICATION_OCTET_STREAM_VALUE : response.getHeaders().getContentType().toString();
+        return new DownloadedFile(content, fileName == null ? fileId + ".bin" : fileName, contentType);
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.baiyue.lastleg.inboundplan.pda.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface ContainerLoadingEvidenceMapper extends BaseMapper<ContainerLoadingEvidence> {
+    @Select("SELECT * FROM ll_container_loading_evidence WHERE source_container_booking_id=#{bookingId} ORDER BY CASE evidence_type WHEN 'PHOTO_STEP_1' THEN 1 WHEN 'PHOTO_STEP_2' THEN 2 WHEN 'PHOTO_STEP_3' THEN 3 WHEN 'PHOTO_STEP_4' THEN 4 ELSE 5 END")
+    List<ContainerLoadingEvidence> listByContainer(@Param("bookingId") String bookingId);
+
+    @Select("SELECT * FROM ll_container_loading_evidence WHERE source_container_booking_id=#{bookingId} AND evidence_type=#{type} LIMIT 1")
+    ContainerLoadingEvidence find(@Param("bookingId") String bookingId, @Param("type") String type);
+}

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

@@ -23,11 +23,13 @@ import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerSession;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingFbaPalletCount;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingSkuReceipt;
 import com.baiyue.lastleg.inboundplan.pda.gateway.UnloadPhotoFileGateway;
+import com.baiyue.lastleg.inboundplan.pda.gateway.DomesticLoadingEvidenceGateway;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerOperationMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerSessionMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingFbaPalletCountMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingSkuReceiptMapper;
+import com.baiyue.lastleg.inboundplan.pda.mapper.ContainerLoadingEvidenceMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper;
@@ -67,6 +69,8 @@ public class ReceivingContainerService {
     private static final String PLATFORM_SCOPE = "0";
     private static final String PHOTO_DOWNLOAD_PATH =
         "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/{fileId}/download";
+    private static final String DOMESTIC_PHOTO_DOWNLOAD_PATH =
+        "/api/pda/v1/last-leg/receiving-containers/current/domestic-loading-photos/{type}/content";
     private static final String PALLET_MERGE_HINT =
         "该入库计划可选择合托：合托时扫描同目的仓已使用的托盘码，独立收货时扫描新托盘码；不强制合托";
 
@@ -86,6 +90,8 @@ public class ReceivingContainerService {
     @Resource private DropshipOrderProfileMapper dropshipProfiles;
     @Resource private WarehouseResourceGateway warehouse;
     @Resource private UnloadPhotoFileGateway unloadPhotos;
+    @Resource private DomesticLoadingEvidenceGateway domesticEvidenceFiles;
+    @Resource private ContainerLoadingEvidenceMapper domesticEvidence;
     @Resource private InboundPdaWorkflowService workflow;
     @Resource private ObjectMapper sourceObjectMapper;
 
@@ -247,6 +253,19 @@ public class ReceivingContainerService {
         return unloadPhotos.download(PLATFORM_SCOPE, session.getId(), parsedFileId);
     }
 
+    public DomesticLoadingEvidenceGateway.DownloadedFile downloadDomesticLoadingPhoto(
+        String operatorKey, String evidenceType) {
+        ReceivingContainerSession session = requireCurrent(operatorKey, false);
+        String type = requiredEvidenceType(evidenceType);
+        var evidence = domesticEvidence.find(session.getSourceContainerBookingId(), type);
+        if (evidence == null) throw notFound("当前柜没有该国内装柜照片");
+        long bookingId;
+        try { bookingId = Long.parseLong(session.getSourceContainerBookingId()); }
+        catch (NumberFormatException exception) { throw new ResponseStatusException(
+            HttpStatus.SERVICE_UNAVAILABLE, "当前柜国内照片来源无效", exception); }
+        return domesticEvidenceFiles.download(bookingId, evidence.getSourceFileId());
+    }
+
     public void requireCurrentWarehouse(String operatorKey, long overseasWarehouseId) {
         requireSessionWarehouse(sessions.findActiveByOperator(activeOperatorKey(operatorKey)), overseasWarehouseId);
     }
@@ -488,8 +507,8 @@ public class ReceivingContainerService {
                 accepted += packages;
                 match.allocation().setPickedPackageCount(packages);
             }
+            markReceiving(session);
         }
-        markReceiving(session);
         List<InboundRef> group = matches.stream().map(DropshipPalletRef::ref).distinct().toList();
         List<String> inboundCodes = group.stream().map(value -> value.line().getInboundCode()).distinct().sorted().toList();
         int total = matches.stream().mapToInt(value -> value(value.allocation().getPlannedPackageCount())).sum();
@@ -983,11 +1002,41 @@ public class ReceivingContainerService {
         int received = inbounds.stream().mapToInt(ReceivingContainerResponses.Inbound::receivedPackages).sum();
         return new ReceivingContainerResponses.Session(session.getContainerNo(), session.getOverseasWarehouseId(),
             session.getOverseasWarehouseCode(), session.getOverseasWarehouseName(), session.getStatus(), session.getOperatorName(),
-            value(session.getVersion()), signPhotos(session), session.getPreparedAt(), session.getSignedAt(),
+            value(session.getVersion()), signPhotos(session), domesticLoadingPhotos(session),
+            session.getPreparedAt(), session.getSignedAt(),
             session.getReceivingAt(), session.getCompletedAt(), total, received, Math.max(0, total - received),
             hasFbaOverReceipt(session, containerPlans), inbounds);
     }
 
+    private List<ReceivingContainerResponses.DomesticLoadingPhoto> domesticLoadingPhotos(
+        ReceivingContainerSession session) {
+        String bookingId = trim(session.getSourceContainerBookingId());
+        if (bookingId == null) return List.of();
+        return domesticEvidence.listByContainer(bookingId).stream()
+            .map(value -> new ReceivingContainerResponses.DomesticLoadingPhoto(value.getEvidenceType(),
+                evidenceLabel(value.getEvidenceType()), DOMESTIC_PHOTO_DOWNLOAD_PATH.replace("{type}", value.getEvidenceType())))
+            .toList();
+    }
+
+    private static String requiredEvidenceType(String value) {
+        String type = trim(value);
+        if (type == null || !Set.of("PHOTO_STEP_1", "PHOTO_STEP_2", "PHOTO_STEP_3", "PHOTO_STEP_4", "SEAL").contains(type)) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "不支持的国内装柜照片类型");
+        }
+        return type;
+    }
+
+    private static String evidenceLabel(String type) {
+        return switch (type) {
+            case "PHOTO_STEP_1" -> "空仓";
+            case "PHOTO_STEP_2" -> "半仓";
+            case "PHOTO_STEP_3" -> "满仓";
+            case "PHOTO_STEP_4" -> "锁仓";
+            case "SEAL" -> "带锁码";
+            default -> type;
+        };
+    }
+
     private void savePhysicalFbaCount(long sessionId, String groupKey, String palletCode, int actualPackages,
                                       ReceivingFbaPalletCount existing) {
         LocalDateTime now = LocalDateTime.now();

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

@@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -103,6 +104,8 @@ public class InboundPlanService {
         }
         String containerWarehouseId = requireSingleWarehouseId(containerFacts.stream()
             .map(InboundPlanOrderMapper.ContainerWarehouseRef::overseasWarehouseId).toList());
+        LocalDate plannedArrivalDate = requiredContainerPlannedArrivalDate(
+            containerFacts.get(0).sourceContainerBookingId());
         List<SourceOrderSnapshot> snapshots = orderMapper.lockOrder(customerId, request.orderId());
         if (snapshots == null || snapshots.size() != 1) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "尾程订单不存在");
@@ -152,7 +155,7 @@ public class InboundPlanService {
                 "人工计划托数不能少于柜级预览建议托数 " + minimumPalletCount);
         }
         InboundPlanResponse response = createPlan(customerId, request.orderId(), snapshots, List.of(), null,
-            request, receivingWarehouse);
+            request, receivingWarehouse, plannedArrivalDate);
         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);
@@ -426,21 +429,25 @@ public class InboundPlanService {
             return detail(customerId, existing);
         }
         validateOrders(orders);
-        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, ManualInboundPlanRequest manual,
-                                           WarehouseResourceGateway.WarehouseReference receivingWarehouse) {
-        return createPlan(customerId, selectedOrderId, orders, sourcePalletNos, wholePallets, manual,
-            receivingWarehouse, null, Map.of());
+        String sourceContainerBookingId = trimToNull(orderMapper.findSourceContainerBookingId(customerId, selectedOrderId));
+        return createPlan(customerId, selectedOrderId, orders, sourcePalletNos, wholePallets, null, null,
+            requiredContainerPlannedArrivalDate(sourceContainerBookingId));
     }
 
     private InboundPlanResponse createPlan(String customerId, Long selectedOrderId,
                                            List<SourceOrderSnapshot> orders, List<String> sourcePalletNos,
                                            List<WholePalletInput> wholePallets, ManualInboundPlanRequest manual,
                                            WarehouseResourceGateway.WarehouseReference receivingWarehouse,
+                                           LocalDate plannedArrivalDate) {
+        return createPlan(customerId, selectedOrderId, orders, sourcePalletNos, wholePallets, manual,
+            receivingWarehouse, plannedArrivalDate, null, Map.of());
+    }
+
+    private InboundPlanResponse createPlan(String customerId, Long selectedOrderId,
+                                           List<SourceOrderSnapshot> orders, List<String> sourcePalletNos,
+                                           List<WholePalletInput> wholePallets, ManualInboundPlanRequest manual,
+                                           WarehouseResourceGateway.WarehouseReference receivingWarehouse,
+                                           LocalDate plannedArrivalDate,
                                            PreparedPlan preparedPlan,
                                            Map<Integer, WarehouseResourceGateway.PalletBatchItem> reservedPallets) {
         String containerNo = requiredContainerNo(orders.get(0).containerNo());
@@ -463,7 +470,7 @@ public class InboundPlanService {
             throw new ResponseStatusException(HttpStatus.CONFLICT, "接柜仓ID格式无效", exception);
         }
         plan.setStatus("PENDING_ASSIGNMENT");
-        plan.setPlannedArrivalDate(manual == null ? null : manual.plannedArrivalDate());
+        plan.setPlannedArrivalDate(plannedArrivalDate);
         plan.setPalletType(manual == null ? null : manual.palletType().trim().toUpperCase());
         plan.setAssignedFlag(manual != null && manual.assigned());
         plan.setMergeRequired(manual != null && manual.mergeRequired());
@@ -550,6 +557,7 @@ public class InboundPlanService {
         if (bookingId == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "来源柜预订 ID 不能为空");
         List<InboundPlanOrderMapper.ContainerOrderRef> refs = orderMapper.lockContainerOrders(bookingId);
         if (refs.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜没有尾程订单");
+        LocalDate plannedArrivalDate = requiredContainerPlannedArrivalDate(bookingId);
         if (snapshotVersion != null) {
             ContainerInboundPlanPreviewResponse current = previewContainer(bookingId);
             if (current.snapshotVersion() != snapshotVersion || !Objects.equals(current.snapshotHash(), snapshotHash)
@@ -639,7 +647,7 @@ public class InboundPlanService {
                     .map(value -> value.reservation().palletCode()).toList();
             }
             created.put(refIndex, createPlan(ref.customerId(), ref.orderId(), snapshots.get(pendingIndex), effectivePalletNos,
-                wholePallets.get(pendingIndex), null, null, prepared, reserved));
+                wholePallets.get(pendingIndex), null, null, plannedArrivalDate, prepared, reserved));
         }
         for (int index = 0; index < refs.size(); index++) {
             InboundPlan existing = existingPlans.get(index);
@@ -752,6 +760,22 @@ public class InboundPlanService {
         }
     }
 
+    private LocalDate requiredContainerPlannedArrivalDate(String sourceContainerBookingId) {
+        String bookingId = trimToNull(sourceContainerBookingId);
+        if (bookingId == null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "尾程订单未绑定来源柜，无法取得预计到仓时间");
+        }
+        List<LocalDateTime> values = orderMapper.containerEstimatedWarehouseTimes(bookingId);
+        if (values == null || values.isEmpty() || values.stream().anyMatch(Objects::isNull)) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜预计到仓时间缺失，请先补齐柜级时间");
+        }
+        LocalDateTime expected = values.get(0);
+        if (values.stream().anyMatch(value -> !Objects.equals(expected, value))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜预计到仓时间不一致，请先修正柜级时间");
+        }
+        return expected.toLocalDate();
+    }
+
     private void requirePlanContainer(InboundPlan plan, String containerNo) {
         String frozen = requiredContainerNo(plan.getContainerNo());
         if (!Objects.equals(containerNo, frozen)) {

lastleg-service/src/main/java/com/baiyue/lastleg/looseboard/service/LocalLooseboardService.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.looseboard.service;
 
+import com.baiyue.common.core.container.ContainerSpecificationCatalog;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -203,7 +205,9 @@ public class LocalLooseboardService {
         order.setOriginAddress(trim(originAddress));
         order.setDestination(destination.trim());
         order.setDestinationAddress(trim(destinationAddress));
-        order.setContainerType(trim(containerType));
+        order.setContainerType(StringUtils.hasText(containerType)
+            ? ContainerSpecificationCatalog.require(containerType).containerType()
+            : ContainerSpecificationCatalog.DEFAULT_CONTAINER_TYPE);
         order.setPackageCount(packageCount);
         order.setTotalWeightKg(totalWeightKg);
         order.setTotalVolumeCbm(totalVolumeCbm);

lastleg-service/src/main/java/com/baiyue/lastleg/repository/UnloadCompletedOutboxRepository.java

@@ -16,6 +16,7 @@ public class UnloadCompletedOutboxRepository {
     private static final List<String> OVERSEAS_TO_CN_TYPES = List.of(
         EventTypes.OVERSEAS_CONTAINER_UNLOADED,
         EventTypes.OVERSEAS_INBOUND_ORDER_DETAINED_CHANGED,
+        EventTypes.OVERSEAS_DELIVERY_COMPLETED,
         EventTypes.WALLET_COMMAND_REQUESTED);
     @Resource private LastlegEventOutboxMapper mapper;
 

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

@@ -7,6 +7,8 @@ import com.baiyue.lastleg.dropship.dto.DropshipRequests;
 import com.baiyue.lastleg.dropship.service.DropshipOrderService;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanCarton;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanCartonMapper;
+import com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence;
+import com.baiyue.lastleg.inboundplan.pda.mapper.ContainerLoadingEvidenceMapper;
 import com.baiyue.lastleg.inventory.command.dto.InventoryCommandRequests;
 import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
 import com.baiyue.lastleg.shipping.entity.ContainerShippingGate;
@@ -46,12 +48,13 @@ public class LoadingCompletedConsumer {
     @Resource private InventoryCommandService inventory;
     @Resource private ContainerShippingGateMapper shippingGates;
     @Resource private LastlegSourcePalletMapper sourcePallets;
+    @Resource private ContainerLoadingEvidenceMapper loadingEvidence;
 
     @Transactional(isolation = Isolation.READ_COMMITTED)
     public int consume(EventEnvelope envelope) {
         envelope.requireValid();
         if (!EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED.equals(envelope.eventType())
-            || (envelope.eventVersion() != 1 && envelope.eventVersion() != 2))
+            || (envelope.eventVersion() != 1 && envelope.eventVersion() != 2 && envelope.eventVersion() != 3))
             throw new IllegalArgumentException("不支持的尾程交接事件");
         if (envelope.sourceRegion() != RegionCode.CN || envelope.targetRegion() != RegionCode.OVERSEAS)
             throw new IllegalArgumentException("尾程交接事件区域无效");
@@ -64,7 +67,7 @@ public class LoadingCompletedConsumer {
         String sourceContainerBookingId = sourceContainerBookingId(envelope, payload);
         if(payload.orders()==null||payload.orders().isEmpty()) throw new IllegalArgumentException("事件没有入仓单");
         OwnerSnapshot owner = requireOwnerSnapshot(payload.orders(), envelope.tenantId());
-        if (envelope.eventVersion() == 2) validateCartonSkuMappings(payload, envelope.payload());
+        if (envelope.eventVersion() >= 2) validateCartonSkuMappings(payload, envelope.payload());
         freezeContainerIdentity(envelope, sourceContainerBookingId, containerNo);
         LastlegEventInbox existing=inboxMapper.selectById(envelope.eventId());
         if(existing!=null) {
@@ -85,6 +88,8 @@ public class LoadingCompletedConsumer {
             return countOrders(envelope,containerNo);
         }
 
+        projectLoadingEvidence(envelope, sourceContainerBookingId);
+
         // The loading-plan and container-shipping events are independent aggregate streams.
         // Seeding the shipping version from the loading-plan version makes a valid first node
         // (aggregateVersion=0) look stale whenever the loading plan has a higher version.
@@ -100,6 +105,45 @@ public class LoadingCompletedConsumer {
         return payload.orders().size();
     }
 
+    private void projectLoadingEvidence(EventEnvelope envelope, String sourceContainerBookingId) {
+        if (envelope.eventVersion() < 3) return;
+        JsonNode values = envelope.payload().path("loadingEvidence");
+        if (!values.isArray() || values.size() != 5) {
+            throw new IllegalArgumentException("V3 尾程交接事件必须包含五类国内装柜照片");
+        }
+        Set<String> expected = Set.of("PHOTO_STEP_1", "PHOTO_STEP_2", "PHOTO_STEP_3", "PHOTO_STEP_4", "SEAL");
+        Set<String> actual = new HashSet<>();
+        for (JsonNode value : values) {
+            String type = value.path("evidenceType").asText("").trim();
+            long fileId = value.path("fileId").asLong(0);
+            String fileName = value.path("fileName").asText("").trim();
+            if (!expected.contains(type) || !actual.add(type) || fileId <= 0
+                || fileName.isBlank() || fileName.length() > 255) {
+                throw new IllegalArgumentException("V3 尾程交接事件的国内装柜照片引用无效");
+            }
+            ContainerLoadingEvidence existing = loadingEvidence.find(sourceContainerBookingId, type);
+            if (existing != null) {
+                if (!Objects.equals(existing.getSourceFileId(), fileId)
+                    || !Objects.equals(existing.getFileName(), fileName)) {
+                    throw new IllegalStateException("同一来源柜的国内装柜照片快照冲突");
+                }
+                continue;
+            }
+            ContainerLoadingEvidence row = new ContainerLoadingEvidence();
+            row.setId(IdWorker.getId());
+            row.setSourceContainerBookingId(sourceContainerBookingId);
+            row.setEvidenceType(type); row.setSourceFileId(fileId); row.setFileName(fileName);
+            row.setCreatedAt(LocalDateTime.now());
+            try { loadingEvidence.insert(row); }
+            catch (DuplicateKeyException duplicate) {
+                ContainerLoadingEvidence raced = loadingEvidence.find(sourceContainerBookingId, type);
+                if (raced == null || !Objects.equals(raced.getSourceFileId(), fileId)
+                    || !Objects.equals(raced.getFileName(), fileName)) throw duplicate;
+            }
+        }
+        if (!actual.equals(expected)) throw new IllegalArgumentException("V3 尾程交接事件的国内装柜照片类型不完整");
+    }
+
     private FirstLegLoadingPlanCompletedV1 parsePayload(EventEnvelope envelope) {
         try {
             ObjectMapper compatibleMapper = objectMapper.copy()
@@ -134,7 +178,7 @@ public class LoadingCompletedConsumer {
     }
 
     private String sourceContainerBookingId(EventEnvelope envelope, FirstLegLoadingPlanCompletedV1 payload) {
-        String value = envelope.eventVersion() == 2
+        String value = envelope.eventVersion() >= 2
             ? envelope.payload().path("sourceContainerBookingId").asText(null)
             : payload.containerBookingId();
         if (value == null || value.isBlank() || value.trim().length() > 128) {

lastleg-service/src/main/java/com/baiyue/lastleg/trucking/service/UsTruckOrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.core.container.ContainerSpecificationCatalog;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderRequests;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderResponses;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrder;
@@ -84,7 +85,9 @@ public class UsTruckOrderService {
         order.setTransportType(StringUtils.hasText(request.transportType()) ? norm(request.transportType()) : null);
         order.setOrigin(trim(request.origin())); order.setOriginAddress(trim(request.originAddress()));
         order.setDestination(trim(request.destination())); order.setDestinationAddress(trim(request.destinationAddress()));
-        order.setContainerType(StringUtils.hasText(request.containerType()) ? norm(request.containerType()) : null);
+        order.setContainerType(StringUtils.hasText(request.containerType())
+            ? ContainerSpecificationCatalog.require(request.containerType()).containerType()
+            : ContainerSpecificationCatalog.DEFAULT_CONTAINER_TYPE);
         order.setPalletCount(request.palletCount()); order.setPackageCount(value(request.packageCount()));
         order.setReceivedPalletCount(0); order.setAllocatedPalletCount(0);
         order.setTotalWeightKg(request.totalWeightKg()); order.setTotalVolumeCbm(request.totalVolumeCbm());
@@ -138,7 +141,8 @@ public class UsTruckOrderService {
         if (request.transportType() != null) { validateTransport(request.transportType()); order.setTransportType(norm(request.transportType())); }
         setText(request.origin(), order::setOrigin); setPresent(request.originAddress(), order::setOriginAddress);
         setText(request.destination(), order::setDestination); setPresent(request.destinationAddress(), order::setDestinationAddress);
-        setText(request.containerType(), v -> order.setContainerType(norm(v)));
+        setText(request.containerType(), v -> order.setContainerType(
+            ContainerSpecificationCatalog.require(v).containerType()));
         if (request.palletCount() != null) order.setPalletCount(request.palletCount());
         if (request.packageCount() != null) order.setPackageCount(request.packageCount());
         if (request.totalWeightKg() != null) order.setTotalWeightKg(request.totalWeightKg()); if (request.totalVolumeCbm() != null) order.setTotalVolumeCbm(request.totalVolumeCbm());

lastleg-service/src/main/resources/application.yml

@@ -66,6 +66,9 @@ baiyue:
       pallet-physical:
         connect-timeout: ${LASTLEG_PALLET_PHYSICAL_CONNECT_TIMEOUT:3s}
         read-timeout: ${LASTLEG_PALLET_PHYSICAL_READ_TIMEOUT:5s}
+      domestic-loading-evidence:
+        connect-timeout: ${LASTLEG_DOMESTIC_LOADING_EVIDENCE_CONNECT_TIMEOUT:3s}
+        read-timeout: ${LASTLEG_DOMESTIC_LOADING_EVIDENCE_READ_TIMEOUT:30s}
   clients:
     print:
       url: ${PRINT_SERVICE_URL:}
@@ -74,6 +77,8 @@ baiyue:
       cache-ttl: ${DOMESTIC_WAREHOUSE_CACHE_TTL:30m}
     file:
       url: ${FILE_SERVICE_URL:http://127.0.0.1:9205}
+    domestic-file:
+      url: ${DOMESTIC_FILE_SERVICE_URL:http://127.0.0.1:9205}
     event-bridge:
       url: ${CN_EVENT_BRIDGE_URL:${FIRSTLEG_EVENT_BRIDGE_URL:}}
   firstleg:

lastleg-service/src/main/resources/db/lastleg.sql

@@ -257,6 +257,10 @@ CREATE TABLE IF NOT EXISTS ll_delivery_order (
   overseas_warehouse_id VARCHAR(128) NULL COMMENT '海外仓ID',
   overseas_warehouse_name VARCHAR(255) NULL COMMENT '海外仓名称快照',
   customer_name VARCHAR(255) NULL COMMENT '客户名称快照',
+  destination_warehouse_id VARCHAR(128) NULL COMMENT '本派送单目的FBA仓ID快照',
+  destination_warehouse_code VARCHAR(128) NOT NULL COMMENT '本派送单目的FBA仓编码快照',
+  destination_warehouse_name VARCHAR(255) NULL COMMENT '本派送单目的FBA仓名称快照',
+  delivery_group_key VARCHAR(255) NOT NULL COMMENT '同一出库单内按目的FBA仓拆单的稳定分组键',
   status VARCHAR(32) NOT NULL DEFAULT 'WAIT_DELIVERY' COMMENT '派送状态：WAIT_DELIVERY待派送及后续正式状态',
   waybill_no VARCHAR(128) NULL COMMENT '承运运单号',
   bol_no VARCHAR(128) NULL COMMENT '派送资料BOL号，不作为文件归属标识',
@@ -289,7 +293,7 @@ CREATE TABLE IF NOT EXISTS ll_delivery_order (
   PRIMARY KEY (id),
   UNIQUE KEY uk_ll_delivery_no (customer_id,delivery_no),
   UNIQUE KEY uk_ll_delivery_idempotency (customer_id,idempotency_key),
-  UNIQUE KEY uk_ll_delivery_outbound (customer_id,outbound_order_id),
+  UNIQUE KEY uk_ll_delivery_outbound_destination (customer_id,outbound_order_id,delivery_group_key),
   KEY idx_ll_delivery_list (customer_id,status,created_at)
 ) ENGINE=InnoDB COMMENT='尾程派送单';
 
@@ -297,6 +301,12 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE delivery_detail_stmt FROM @ddl; EXECUTE delivery_detail_stmt; DEALLOCATE PREPARE delivery_detail_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND column_name='customer_name'), 'SELECT 1', 'ALTER TABLE ll_delivery_order ADD COLUMN customer_name VARCHAR(255) NULL COMMENT ''客户名称快照'' AFTER overseas_warehouse_name'));
 PREPARE delivery_detail_stmt FROM @ddl; EXECUTE delivery_detail_stmt; DEALLOCATE PREPARE delivery_detail_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND column_name='destination_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_delivery_order ADD COLUMN destination_warehouse_id VARCHAR(128) NULL COMMENT ''本派送单目的FBA仓ID快照'' AFTER customer_name, ADD COLUMN destination_warehouse_code VARCHAR(128) NULL COMMENT ''本派送单目的FBA仓编码快照'' AFTER destination_warehouse_id, ADD COLUMN destination_warehouse_name VARCHAR(255) NULL COMMENT ''本派送单目的FBA仓名称快照'' AFTER destination_warehouse_code, ADD COLUMN delivery_group_key VARCHAR(255) NULL COMMENT ''同一出库单内按目的FBA仓拆单的稳定分组键'' AFTER destination_warehouse_name'));
+PREPARE delivery_destination_stmt FROM @ddl; EXECUTE delivery_destination_stmt; DEALLOCATE PREPARE delivery_destination_stmt;
+SET @old_delivery_outbound_index = (SELECT COUNT(*) FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND index_name='uk_ll_delivery_outbound');
+SET @new_delivery_destination_index = (SELECT COUNT(*) FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND index_name='uk_ll_delivery_outbound_destination');
+SET @ddl = IF(@new_delivery_destination_index > 0, 'SELECT 1', IF(@old_delivery_outbound_index > 0, 'ALTER TABLE ll_delivery_order DROP INDEX uk_ll_delivery_outbound, ADD UNIQUE KEY uk_ll_delivery_outbound_destination (customer_id,outbound_order_id,delivery_group_key)', 'ALTER TABLE ll_delivery_order ADD UNIQUE KEY uk_ll_delivery_outbound_destination (customer_id,outbound_order_id,delivery_group_key)'));
+PREPARE delivery_destination_index_stmt FROM @ddl; EXECUTE delivery_destination_index_stmt; DEALLOCATE PREPARE delivery_destination_index_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND column_name='waybill_no'), 'SELECT 1', 'ALTER TABLE ll_delivery_order ADD COLUMN waybill_no VARCHAR(128) NULL COMMENT ''承运运单号'', ADD COLUMN delivery_method VARCHAR(32) NULL COMMENT ''派送方式'', ADD COLUMN carrier_name VARCHAR(255) NULL COMMENT ''派送承运商'', ADD COLUMN pickup_method VARCHAR(64) NULL COMMENT ''提货方式'', ADD COLUMN loading_type VARCHAR(64) NULL COMMENT ''装车类型'', ADD COLUMN vehicle_type VARCHAR(64) NULL COMMENT ''车辆类型'', ADD COLUMN vehicle_size VARCHAR(64) NULL COMMENT ''车辆大小'', ADD COLUMN vehicle_plate VARCHAR(64) NULL COMMENT ''车牌号'', ADD COLUMN driver_name VARCHAR(128) NULL COMMENT ''司机或车队名称'', ADD COLUMN driver_phone VARCHAR(64) NULL COMMENT ''车队联系电话'', ADD COLUMN appointment_account VARCHAR(128) NULL COMMENT ''预约账号'', ADD COLUMN seller_name VARCHAR(128) NULL COMMENT ''卖家姓名'' AFTER status'));
 PREPARE delivery_detail_stmt FROM @ddl; EXECUTE delivery_detail_stmt; DEALLOCATE PREPARE delivery_detail_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND column_name='total_weight_kg'), 'SELECT 1', 'ALTER TABLE ll_delivery_order ADD COLUMN total_weight_kg DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''总重量（千克）'', ADD COLUMN total_volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''总体积（立方米）'', ADD COLUMN planned_delivery_at DATETIME(3) NULL COMMENT ''预计派送时间'', ADD COLUMN dispatched_at DATETIME(3) NULL COMMENT ''实际派送时间'', ADD COLUMN expected_arrival_at DATETIME(3) NULL COMMENT ''预计到达时间'', ADD COLUMN signed_at DATETIME(3) NULL COMMENT ''签收时间'', ADD COLUMN remark VARCHAR(1000) NULL COMMENT ''派送备注'' AFTER pallet_count'));
@@ -1424,6 +1434,7 @@ CREATE TABLE IF NOT EXISTS ll_outbound_order (
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   outbound_type VARCHAR(32) NOT NULL DEFAULT 'DISPATCH_DELIVERY' COMMENT '出库类型：派送转出库、一件代发', lx_codes VARCHAR(1000) NULL COMMENT '关联一件代发领星入库单代码汇总',
   recipient_info VARCHAR(1000) NULL COMMENT '一件代发收件信息',
+  request_hash CHAR(64) NULL COMMENT '一件代发创建请求摘要，其他出库类型为空',
   PRIMARY KEY (id), UNIQUE KEY uk_ll_outbound_no (outbound_no),
   UNIQUE KEY uk_ll_outbound_idempotency (customer_id,idempotency_key), UNIQUE KEY uk_ll_outbound_dispatch (customer_id,dispatch_order_id),
   KEY idx_ll_outbound_list (customer_id,status,created_at)
@@ -1929,7 +1940,7 @@ CREATE TABLE IF NOT EXISTS ll_cargo_discard_item (
   order_id BIGINT NOT NULL COMMENT '订单ID', inbound_code VARCHAR(128) NOT NULL COMMENT '入仓单号快照', profile_id BIGINT NOT NULL COMMENT '托盘档案ID',
   sku_inventory_id BIGINT NOT NULL COMMENT 'SKU库存记录ID', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', product_name VARCHAR(255) NULL COMMENT '产品名称',
   available_packages_snapshot INT NOT NULL COMMENT '可用箱数快照', discard_packages INT NOT NULL COMMENT '申请废弃箱数',
-  actual_discard_packages INT NULL COMMENT 'PDA确认实际废弃箱数', pda_status VARCHAR(32) NOT NULL DEFAULT 'PENDING' COMMENT 'PENDING/COMPLETED',
+  actual_discard_packages INT NULL COMMENT 'PDA确认实际废弃箱数', pda_status VARCHAR(32) NOT NULL DEFAULT 'PENDING' COMMENT 'PDA处理状态：待处理PENDING、已完成COMPLETED',
   pda_operator_id VARCHAR(128) NULL COMMENT 'PDA操作人', pda_completed_at DATETIME(3) NULL COMMENT 'PDA完成时间',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', PRIMARY KEY(id),
   UNIQUE KEY uk_ll_cargo_discard_item(application_id,profile_id,sku_code),
@@ -1953,20 +1964,6 @@ CREATE TABLE IF NOT EXISTS ll_cargo_discard_status_history (
   KEY idx_ll_cargo_discard_history(customer_id,application_id,created_at)
 ) ENGINE=InnoDB COMMENT='货物废弃审批历史';
 
--- Backfill applications created before cargo discard became a first-class tail-leg order.
-INSERT IGNORE INTO ll_order (
-  id,order_no,customer_id,order_type,inbound_code,inbound_order_no,source_region,source_inbound_id,
-  source_order_id,source_order_no,overseas_warehouse_id,overseas_warehouse_name,package_count,
-  current_status,version,source_event_id,source_loading_plan_id,source_payload_hash,created_at,updated_at
-)
-SELECT a.id,a.discard_no,a.customer_id,'CARGO_DISCARD',a.inbound_codes,a.discard_no,'LASTLEG_DISCARD',
-  CONCAT('CARGO_DISCARD:',a.id),CAST(a.id AS CHAR),a.discard_no,a.overseas_warehouse_id,a.overseas_warehouse_name,
-  a.total_packages,a.status,0,CONCAT('CARGO_DISCARD:',a.id),'CARGO_DISCARD',a.request_hash,a.created_at,a.updated_at
-FROM ll_cargo_discard_application a
-LEFT JOIN ll_order o ON o.customer_id=a.customer_id AND o.source_region='LASTLEG_DISCARD'
-  AND o.source_inbound_id=CONCAT('CARGO_DISCARD:',a.id)
-WHERE o.id IS NULL;
-
 CREATE TABLE IF NOT EXISTS ll_overseas_procurement_order (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID',
   customer_name VARCHAR(255) NULL COMMENT '客户名称快照', order_no VARCHAR(64) NOT NULL COMMENT '订单号',
@@ -2010,7 +2007,7 @@ CREATE TABLE IF NOT EXISTS ll_us_truck_order (
   origin_address VARCHAR(500) NULL COMMENT '起运地址',
   destination VARCHAR(255) NOT NULL COMMENT '目的地',
   destination_address VARCHAR(500) NULL COMMENT '目的地址',
-  container_type VARCHAR(32) NULL COMMENT '历史兼容设备类型，零担托盘业务不采集',
+  container_type VARCHAR(32) NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ',
   pallet_count INT NOT NULL DEFAULT 1 COMMENT '客户申报托盘数',
   package_count INT NULL COMMENT '可选箱数，零或空值均有效',
   received_pallet_count INT NOT NULL DEFAULT 0 COMMENT 'PDA实收托盘数',
@@ -2088,7 +2085,7 @@ CREATE TABLE IF NOT EXISTS ll_local_looseboard_order (
   pallet_required VARCHAR(8) NOT NULL COMMENT '是否需要打盘：YES或NO', transport_type VARCHAR(32) NOT NULL COMMENT '运输类型',
   origin VARCHAR(255) NOT NULL COMMENT '起运地', origin_address VARCHAR(500) NULL COMMENT '起运详细地址',
   destination VARCHAR(255) NOT NULL COMMENT '目的地', destination_address VARCHAR(500) NULL COMMENT '目的详细地址、码头或仓号',
-  container_type VARCHAR(32) NULL COMMENT '柜型', package_count INT NOT NULL DEFAULT 0 COMMENT '货物件数',
+  container_type VARCHAR(32) NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ', package_count INT NOT NULL DEFAULT 0 COMMENT '货物件数',
   total_weight_kg DECIMAL(18,3) NOT NULL DEFAULT 0 COMMENT '总重量（千克）',
   total_volume_cbm DECIMAL(18,6) NOT NULL DEFAULT 0 COMMENT '总体积（立方米）',
   budget_amount DECIMAL(18,2) NULL COMMENT '预算总价', currency CHAR(3) NOT NULL DEFAULT 'USD' COMMENT '预算币种',
@@ -2536,3 +2533,15 @@ CREATE TABLE IF NOT EXISTS ll_return_inventory_operation (
  id BIGINT NOT NULL COMMENT '退货库存PDA操作ID', operator_id VARCHAR(128) NOT NULL COMMENT 'PDA操作人ID', idempotency_key VARCHAR(255) NOT NULL COMMENT '操作幂等键', request_hash CHAR(64) NOT NULL COMMENT '请求内容SHA-256', operation_type VARCHAR(32) NOT NULL COMMENT '操作类型，当前MERGE', result_carton_id BIGINT NULL COMMENT '合箱结果退货库存箱ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_operation_operator_key(operator_id,idempotency_key), KEY idx_ll_return_inventory_operation_result(result_carton_id)
 ) ENGINE=InnoDB COMMENT='退货库存PDA合箱幂等操作审计';
+
+CREATE TABLE IF NOT EXISTS ll_container_loading_evidence (
+ id BIGINT NOT NULL COMMENT '海外整柜装柜照片投影ID',
+ source_container_booking_id VARCHAR(128) NOT NULL COMMENT '国内稳定来源柜预订ID',
+ evidence_type VARCHAR(32) NOT NULL COMMENT 'PHOTO_STEP_1至PHOTO_STEP_4或SEAL',
+ source_file_id BIGINT NOT NULL COMMENT '国内File服务文件ID',
+ file_name VARCHAR(255) NOT NULL COMMENT '国内文件名快照',
+ created_at DATETIME(3) NOT NULL COMMENT '投影创建时间',
+ PRIMARY KEY(id),
+ UNIQUE KEY uk_ll_container_loading_evidence_type(source_container_booking_id,evidence_type),
+ UNIQUE KEY uk_ll_container_loading_evidence_file(source_container_booking_id,source_file_id)
+) ENGINE=InnoDB COMMENT='海外拆柜只读国内装柜照片引用';

lastleg-service/src/main/resources/openapi/delivery-documents-v1.yaml

@@ -5,7 +5,7 @@ info:
   description: |
     所有入口只允许平台，customerId 必须为真实派送所属客户；不得按 BOL 文本查找或复用其他客户/派送单文件。
     GET /delivery-orders 及 GET /delivery-orders/{deliveryNo} 的 order 行新增 bolNo 和 documentSummary，version/allowedActions 保持原契约。
-    状态 PUT /delivery-orders/{deliveryNo}/status 请求保持 {status,expectedVersion,remark}，expectedVersion 必传。
+    RECEIPT 签收文件只有在 PUT 保存进入权威资料快照后才自动完成当前派送单；仅上传未保存不会完成。allowedActions 不再返回人工 COMPLETE_DELIVERY。
     START_DELIVERY=DELIVERING（派送中）；COMPLETE_DELIVERY=DELIVERED（完成并记录签收时间、生成待回访）。同状态重放不重复副作用。
     资料不设必传门禁，不以三类齐全作为派送完成条件。业务失败使用统一 ApiResponse（A0422参数、A0409冲突），通常HTTP200。
 security: [{ bearerAuth: [] }]

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -80,6 +80,22 @@ paths:
             application/octet-stream: { schema: { type: string, format: binary } }
         '403': { description: fileId 未绑定到当前操作员的当前柜会话三类签收照片 }
         '404': { description: 当前柜会话或照片不存在 }
+  /api/pda/v1/last-leg/receiving-containers/current/domestic-loading-photos/{evidenceType}/content:
+    get:
+      summary: 查看当前柜国内装柜照片
+      description: 权限 lastleg:pda:operate；只按当前操作员已锁定的物理柜读取国内装柜完成快照，不返回客户或内部文件ID，加载失败不改变拆柜状态。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: evidenceType, in: path, required: true, schema: { type: string, enum: [PHOTO_STEP_1, PHOTO_STEP_2, PHOTO_STEP_3, PHOTO_STEP_4, SEAL] } }
+      responses:
+        '200':
+          description: 国内装柜照片字节流；禁止缓存。
+          content:
+            image/jpeg: { schema: { type: string, format: binary } }
+            image/png: { schema: { type: string, format: binary } }
+            application/octet-stream: { schema: { type: string, format: binary } }
+        '404': { description: 当前柜或指定类型照片不存在 }
+        '503': { description: 国内照片服务暂不可用 }
   /api/pda/v1/last-leg/receiving-containers/current/sign:
     post:
       summary: 签收当前柜
@@ -434,7 +450,7 @@ paths:
   /api/platform/v1/last-leg/inbound-plans/manual:
     post:
       summary: 平台按单票手工生成入库计划
-      description: 权限 platform:overseas-warehouse:inbound-order:create；按 customerId 与 orderId 锁定单票，校验订单版本、状态、暂扣状态、真实入仓码、客户归属及有效公共接柜仓。一次只生成当前票的独立计划，不改变同柜其他订单；命令原子且幂等。
+      description: 权限 platform:overseas-warehouse:inbound-order:create；按 customerId 与 orderId 锁定单票，校验订单版本、状态、暂扣状态、真实入仓码、客户归属及有效公共接柜仓。预计到仓日期由服务端锁定读取来源柜全部订单的 estimatedWarehouseAt，缺失或同柜不一致时拒绝生成，不接受调用方提交。一次只生成当前票的独立计划，不改变同柜其他订单；命令原子且幂等。
       security: [{ bearerAuth: [] }]
       parameters:
         - { name: Idempotency-Key, in: header, required: true, schema: { type: string, minLength: 1, maxLength: 128 } }
@@ -446,7 +462,7 @@ paths:
       responses:
         '200': { description: 统一 ApiResponse 包装的入库计划详情 }
         '400': { description: 客户、入仓码、仓库主数据或请求字段无效 }
-        '409': { description: 订单版本、状态、暂扣状态、重复计划或幂等键冲突 }
+        '409': { description: 订单版本、状态、暂扣状态、柜级预计到仓时间、重复计划或幂等键冲突 }
   /api/platform/v1/last-leg/inbound-plans/convert-container:
     post:
       summary: 按整柜批量生成剩余入库计划
@@ -620,11 +636,11 @@ paths:
   /api/platform/v1/last-leg/dispatches/{dispatchNo}/transfer-delivery:
     post:
       summary: 排车转出库与派送单
-      description: 权限 platform:overseas-warehouse:dispatch:transfer-delivery；只按全局唯一 dispatchNo 锁定记录并从记录解析客户范围，不接收 customerId；同一幂等键或已转换排车重复调用返回既有单据。
+      description: 权限 platform:overseas-warehouse:dispatch:transfer-delivery；只按全局唯一 dispatchNo 锁定记录并从记录解析客户范围，不接收 customerId；一个排车仍生成一张出库单，并按目的FBA仓分别生成派送单，返回 deliveries 数组；同一幂等键或已转换排车重复调用返回全部既有单据。派送费用只发布一次，避免按拆分派送单重复计费。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/DeliveryTransfer' } } } }
-      responses: { '200': { description: 出库与派送单转换结果 }, '404': { description: 排车单不存在 }, '409': { description: 状态、托盘或幂等冲突 } }
+      responses: { '200': { description: 一张出库单与按目的FBA仓拆分的派送单转换结果 }, '404': { description: 排车单不存在 }, '409': { description: 状态、托盘、目的FBA仓或幂等冲突 } }
   /api/platform/v1/last-leg/outbound-orders:
     get:
       summary: 分页查询出库单
@@ -649,10 +665,10 @@ paths:
   /api/platform/v1/last-leg/outbound-orders/one-click-dropship/candidates:
     get:
       summary: 查询一件代发出库候选库存
-      description: 权限 platform:overseas-warehouse:outbound:create；按客户及可选海外仓一次查询服务端权威候选，仅返回 ACTIVE 一件代发档案、OCCUPIED 正可用库存、AVAILABLE 箱唛与 SKU 余额共同覆盖且未被排车、转仓或待执行出库占用的维度。创建命令会再次校验，不信任前端候选快照。
+      description: 权限 platform:overseas-warehouse:outbound:create；仅平台身份可查询，customerId 为可选客户筛选条件，未传时跨客户查询，可按海外仓筛选。仅返回 ACTIVE 一件代发档案、OCCUPIED 正可用库存、AVAILABLE 箱唛与 SKU 余额共同覆盖且未被排车、转仓或待执行出库占用的维度。创建命令仍必须指定唯一客户并再次校验客户与仓库，不信任前端候选快照。
       security: [{ bearerAuth: [] }]
       parameters:
-        - { name: customerId, in: query, required: true, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
+        - { name: customerId, in: query, required: false, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
         - { name: warehouseId, in: query, required: false, schema: { type: string } }
       responses:
         '200':
@@ -664,7 +680,7 @@ paths:
       description: 权限 platform:overseas-warehouse:outbound:list；只按全局唯一 outboundNo 定位并从记录解析客户范围，不接收 customerId。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: outboundNo, in: path, required: true, schema: { type: string } }]
-      responses: { '200': { description: '出库单、出库托盘及关联派送单详情；一件代发等独立出库无派送单时 delivery 为 null，排车转派送必须存在派送单；pallets[].palletNo 为 Warehouse 权威实物托盘码' }, '404': { description: 出库单不存在 } }
+      responses: { '200': { description: '出库单、出库托盘及关联 deliveries 派送单数组；一件代发等独立出库时数组为空，排车转派送按目的FBA仓返回一项或多项；pallets[].palletNo 为 Warehouse 权威实物托盘码' }, '404': { description: 出库单不存在 } }
   /api/platform/v1/last-leg/outbound-orders/{outboundNo}/cancel:
     post:
       summary: 取消未执行出库单
@@ -676,7 +692,7 @@ paths:
   /api/platform/v1/last-leg/delivery-orders:
     get:
       summary: 分页查询平台派送单
-      description: 权限 platform:overseas-warehouse:delivery:list；customerId 仅为可选平台筛选条件。每行返回服务端计算的 allowedActions，页面不得自行推导状态门禁。
+      description: 权限 platform:overseas-warehouse:delivery:list；customerId 仅为可选平台筛选条件。同一排车按目的FBA仓显示为不同派送单，每行返回目的仓快照和服务端计算的 allowedActions，页面不得自行推导状态门禁；完成动作不再由人工触发。
       security: [{ bearerAuth: [] }]
       responses: { '200': { description: 派送单分页 } }
   /api/platform/v1/last-leg/delivery-orders/{deliveryNo}:
@@ -685,7 +701,7 @@ paths:
       description: 权限 platform:overseas-warehouse:delivery:list；列表权限包含详情只读；order.allowedActions 为当前可执行动作。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: deliveryNo, in: path, required: true, schema: { type: string } }]
-      responses: { '200': { description: 派送单详情 }, '404': { description: 派送单不存在 } }
+      responses: { '200': { description: 派送单详情，SKU与BOL打印数据只包含当前派送单目的FBA仓 }, '404': { description: 派送单不存在 } }
   /api/platform/v1/last-leg/exception-orders:
     get:
       summary: 分页查询异常订单
@@ -762,18 +778,10 @@ paths:
       parameters: [{ name: deliveryNo, in: path, required: true, schema: { type: string } }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/DeliveryMarkReturn' } } } }
       responses: { '200': { description: 已创建退回异常单 } }
-  /api/platform/v1/last-leg/delivery-orders/{deliveryNo}/complete:
-    post:
-      summary: 标记派送完成并生成回访记录
-      description: 权限 platform:overseas-warehouse:delivery:status。仅 WAIT_DELIVERY/DELIVERING 可完成；DELIVERED 同状态重放成功，其他终态或倒退返回 409。
-      security: [{ bearerAuth: [] }]
-      parameters: [{ name: deliveryNo, in: path, required: true, schema: { type: string } }]
-      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/DeliveryStatusChange' } } } }
-      responses: { '200': { description: 派送状态与回访记录 }, '409': { description: 版本或状态冲突 } }
   /api/platform/v1/last-leg/delivery-orders/{deliveryNo}/status:
     put:
       summary: 更新派送状态
-      description: 权限 platform:overseas-warehouse:delivery:status。只允许 WAIT_DELIVERY→DELIVERING/DELIVERED/REJECTED/CANCELLED、DELIVERING→DELIVERED/REJECTED；同状态幂等，终态不可倒退。
+      description: 权限 platform:overseas-warehouse:delivery:status。人工只允许 WAIT_DELIVERY→DELIVERING/REJECTED/CANCELLED、DELIVERING→REJECTED；DELIVERED 仅由签收资料保存成功自动触发，同状态幂等，终态不可倒退。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: deliveryNo, in: path, required: true, schema: { type: string } }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/DeliveryStatusChange' } } } }
@@ -1949,7 +1957,7 @@ components:
         currentAccount: { type: boolean }
     ReceivingSession:
       type: object
-      required: [containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName, status, version, photos, totalPackages, receivedPackages, pendingPackages, hasDifference, inbounds]
+      required: [containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName, status, version, photos, domesticLoadingPhotos, totalPackages, receivedPackages, pendingPackages, hasDifference, inbounds]
       properties:
         containerNo: { type: string }
         overseasWarehouseId: { type: string, pattern: '^\d+$', description: 平台预分配并与PDA Token匹配的海外接柜仓ID }
@@ -1959,6 +1967,7 @@ components:
         operatorName: { type: string, nullable: true }
         version: { type: integer }
         photos: { type: array, maxItems: 3, items: { $ref: '#/components/schemas/ReceivingSignedSessionPhoto' } }
+        domesticLoadingPhotos: { type: array, maxItems: 5, items: { $ref: '#/components/schemas/DomesticLoadingPhoto' }, description: 当前物理柜国内装柜五类只读照片，不含客户信息与内部文件ID }
         preparedAt: { type: string, format: date-time, nullable: true }
         signedAt: { type: string, format: date-time, nullable: true }
         receivingAt: { type: string, format: date-time, nullable: true }
@@ -1976,6 +1985,13 @@ components:
         fileName: { type: string }
         contentType: { type: string }
         sizeBytes: { type: integer, format: int64 }
+    DomesticLoadingPhoto:
+      type: object
+      required: [evidenceType, label, downloadPath]
+      properties:
+        evidenceType: { type: string, enum: [PHOTO_STEP_1, PHOTO_STEP_2, PHOTO_STEP_3, PHOTO_STEP_4, SEAL] }
+        label: { type: string, enum: [空仓, 半仓, 满仓, 锁仓, 带锁码] }
+        downloadPath: { type: string, description: 当前接柜会话鉴权下载路径 }
     ReceivingCartonResolved:
       allOf:
         - { $ref: '#/components/schemas/ReceivingInbound' }
@@ -2097,7 +2113,6 @@ components:
       required: [planPalletIds]
       properties:
         planPalletIds: { type: array, minItems: 1, maxItems: 500, uniqueItems: true, items: { type: string } }
-        route: { type: string, nullable: true, maxLength: 255 }
         fbaAppointmentNo: { type: string, nullable: true, maxLength: 64 }
         fbaAppointmentStatus: { type: string, nullable: true, maxLength: 32, default: PENDING }
         vehicleAppointmentStatus: { type: string, nullable: true, maxLength: 32, default: PENDING }
@@ -2126,7 +2141,7 @@ components:
       required: [draftToken, capacity]
       properties:
         draftToken: { type: string, minLength: 1, maxLength: 64 }
-        capacity: { type: integer, minimum: 1, maximum: 500 }
+        capacity: { type: integer, enum: [15, 30] }
     SmartDispatchDraft:
       type: object
       required: [draftToken, containers]
@@ -2144,13 +2159,12 @@ components:
         palletIds: { type: array, items: { type: string } }
     DispatchUpdate:
       type: object
-      description: 普通编辑字段；不包含 status 或 departAt。
+      description: 普通编辑字段；不包含 status、departAt 或路线，路线由已排托盘关联的 FBA 仓自动汇总。
       properties:
         vehiclePlate: { type: string, nullable: true, maxLength: 64 }
         driverName: { type: string, nullable: true, maxLength: 128 }
         driverPhone: { type: string, nullable: true, maxLength: 64 }
         carrierName: { type: string, nullable: true, maxLength: 255 }
-        route: { type: string, nullable: true, maxLength: 255 }
         fbaAppointmentNo: { type: string, nullable: true, maxLength: 64 }
         fbaAppointmentStatus: { type: string, nullable: true, maxLength: 32 }
         vehicleAppointmentStatus: { type: string, nullable: true, maxLength: 32 }
@@ -2167,7 +2181,7 @@ components:
         pickupMethod: { type: string, maxLength: 64 }
         loadingType: { type: string, maxLength: 64 }
         vehicleType: { type: string, nullable: true, maxLength: 64 }
-        vehicleSize: { type: string, nullable: true, maxLength: 64 }
+        vehicleSize: { type: string, nullable: true, enum: [15托, 30托] }
         driverName: { type: string, nullable: true, maxLength: 128 }
         driverPhone: { type: string, nullable: true, maxLength: 64 }
         vehiclePlate: { type: string, nullable: true, maxLength: 64 }
@@ -2179,13 +2193,13 @@ components:
       type: object
       required: [status, expectedVersion]
       properties:
-        status: { type: string, enum: [WAIT_DELIVERY, DELIVERING, DELIVERED, REJECTED, CANCELLED] }
+        status: { type: string, enum: [WAIT_DELIVERY, DELIVERING, REJECTED, CANCELLED] }
         expectedVersion: { type: integer, format: int64, minimum: 0 }
         remark: { type: string, nullable: true, maxLength: 500 }
     DeliveryAllowedAction:
       type: string
-      enum: [START_DELIVERY, COMPLETE_DELIVERY, REJECT_DELIVERY, CANCEL_DELIVERY, MARK_RETURN]
-      description: START/COMPLETE/REJECT/CANCEL 使用通用 status 接口；MARK_RETURN 使用 mark-return 接口。
+      enum: [START_DELIVERY, REJECT_DELIVERY, CANCEL_DELIVERY, MARK_RETURN]
+      description: START/REJECT/CANCEL 使用通用 status 接口；MARK_RETURN 使用 mark-return 接口；派送完成由签收资料保存成功自动触发。
     DeliveryMarkReturn:
       type: object
       required: [inboundOrderId, reason, returnDirection, items, idempotencyKey]
@@ -2266,6 +2280,7 @@ components:
         remark: { type: string, nullable: true, maxLength: 500 }
     OneClickOutboundCreate:
       type: object
+      description: 同一幂等键只重放相同请求；收件人、明细、箱唛或备注变化返回 A0409。
       required: [recipient, items, idempotencyKey]
       properties:
         recipient: { type: string, maxLength: 1000 }
@@ -2282,6 +2297,11 @@ components:
               inventoryPositionId: { type: string, pattern: '^[1-9][0-9]*$' }
               packages: { type: integer, format: int64, minimum: 1 }
               sku: { type: string, maxLength: 128 }
+              cartonMarks:
+                type: array
+                maxItems: 200
+                description: 指定出库箱唛，提供时必须唯一且与箱数一致。
+                items: { type: string, minLength: 1, maxLength: 128 }
     OneClickOutboundCandidate:
       type: object
       required: [inventoryPositionId, overseasWarehouseId, palletNo, skuCode, availablePackages]
@@ -2608,13 +2628,12 @@ components:
           items: { $ref: '#/components/schemas/LastlegOrderManualNode' }
     ManualInboundPlanRequest:
       type: object
-      description: 单票人工计划只能使用所属柜已冻结的接柜仓；接柜仓变更必须通过柜级接口完成。
-      required: [customerId, orderId, expectedOrderVersion, plannedArrivalDate, palletCount, palletType, assigned, mergeRequired, urgent]
+      description: 单票人工计划只能使用所属柜已冻结的接柜仓；接柜仓变更必须通过柜级接口完成。预计到仓日期由服务端读取来源柜冻结的 estimatedWarehouseArrivalAt，同柜所有计划保持一致，不接受人工提交。
+      required: [customerId, orderId, expectedOrderVersion, palletCount, palletType, assigned, mergeRequired, urgent]
       properties:
         customerId: { type: string, pattern: '^[1-9][0-9]*$' }
         orderId: { type: integer, format: int64, minimum: 1 }
         expectedOrderVersion: { type: integer, minimum: 0 }
-        plannedArrivalDate: { type: string, format: date }
         palletCount: { type: integer, minimum: 1, maximum: 999 }
         palletType: { type: string, minLength: 1, maxLength: 64 }
         assigned: { type: boolean }
@@ -2704,7 +2723,7 @@ components:
         transportType: { type: string, nullable: true }
         origin: { type: string }
         destination: { type: string }
-        containerType: { type: string, nullable: true }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], description: 平台统一柜型 }
         palletCount: { type: integer }
         packageCount: { type: integer }
         receivedPalletCount: { type: integer }
@@ -2760,7 +2779,7 @@ components:
         transportType: { type: string }
         origin: { type: string }
         destination: { type: string }
-        containerType: { type: string, nullable: true }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], description: 平台统一柜型 }
         packageCount: { type: integer }
         totalWeightKg: { type: number }
         totalVolumeCbm: { type: number }
@@ -3101,7 +3120,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], default: 40HQ, maxLength: 32 }
         palletCount: { type: integer, minimum: 1 }
         packageCount: { type: integer, nullable: true, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
@@ -3123,7 +3142,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], maxLength: 32 }
         palletCount: { type: integer, minimum: 1 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
@@ -3154,7 +3173,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], default: 40HQ, maxLength: 32 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
         totalVolumeCbm: { type: number, minimum: 0 }
@@ -3177,7 +3196,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], maxLength: 32 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
         totalVolumeCbm: { type: number, minimum: 0 }

lastleg-service/src/main/resources/openapi/overseas-pda-operations-v1.yaml

@@ -603,6 +603,11 @@ components:
         inventoryPositionId: { type: string, pattern: '^[0-9]+$' }
         packages: { type: integer, format: int64, minimum: 1 }
         idempotencyKey: { type: string, minLength: 1, maxLength: 255 }
+        cartonMarks:
+          type: array
+          maxItems: 500
+          description: 本次实际扫描的箱唛。一件代发指定箱唛任务分批拣货时必须提交本次子集，数量与 packages 一致；换标任务仍须提交全部指定箱唛。
+          items: { type: string, minLength: 1, maxLength: 255 }
     PdaOutboundTaskDetail:
       type: object
       required: [task, items]

lastleg-service/src/test/java/com/baiyue/lastleg/customervisit/service/CustomerVisitServiceTest.java

@@ -6,7 +6,6 @@ import com.baiyue.lastleg.customervisit.mapper.CustomerVisitMapper;
 import com.baiyue.lastleg.delivery.entity.DeliveryOrder;
 import com.baiyue.lastleg.delivery.mapper.DeliveryOperationMapper;
 import com.baiyue.lastleg.delivery.mapper.DeliveryOrderMapper;
-import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -56,22 +55,12 @@ class CustomerVisitServiceTest {
     }
 
     @Test
-    void replaysDeliveredToDeliveredWithoutChangingDeliveryOrAddingHistory() {
-        DeliveryOrder delivery = delivery("DELIVERED");
-        CustomerVisit visit = new CustomerVisit();
-        visit.setId(33L);
-        visit.setStatus("PENDING");
-        when(deliveryOrders.lockByNo("1001", "DL-1")).thenReturn(delivery);
-        when(visits.findByDelivery("1001", 11L)).thenReturn(visit);
+    void rejectsManualDeliveryCompletionBeforeLoadingTheOrder() {
+        assertThatThrownBy(() -> service.updateDeliveryStatus("1001", "9001", "DL-1",
+            new CustomerVisitRequests.DeliveryStatus("DELIVERED", 0L, null)))
+            .isInstanceOf(ResponseStatusException.class).hasMessageContaining("不支持");
 
-        var result = service.updateDeliveryStatus("1001", "9001", "DL-1",
-            new CustomerVisitRequests.DeliveryStatus("DELIVERED", 0L, null));
-
-        assertThat(result.replayed()).isTrue();
-        assertThat(result.deliveryStatus()).isEqualTo("DELIVERED");
-        assertThat(result.visitId()).isEqualTo(33L);
-        verify(deliveryOrders, never()).updateById(delivery);
-        verifyNoInteractions(deliveryOperations);
+        verifyNoInteractions(deliveryOrders, deliveryOperations);
     }
 
     @Test
@@ -89,26 +78,7 @@ class CustomerVisitServiceTest {
     }
 
     @Test
-    void completingDeliveryUpdatesOnlySubOrderStatusAndKeepsMainFlowStatus() {
-        DeliveryOrder delivery = delivery("DELIVERING");
-        delivery.setVersion(1L);
-        LastlegOrder tail = new LastlegOrder();
-        tail.setId(21L); tail.setCustomerId("1001"); tail.setCurrentStatus("INBOUND_COMPLETED");
-        CustomerVisit visit = new CustomerVisit(); visit.setId(33L); visit.setStatus("PENDING");
-        when(deliveryOrders.lockByNo("1001", "DL-1")).thenReturn(delivery);
-        when(lastMileOrders.selectList(org.mockito.ArgumentMatchers.any())).thenReturn(java.util.List.of(tail));
-        when(visits.findByDelivery("1001", 11L)).thenReturn(visit);
-
-        var result = service.updateDeliveryStatus("1001", "9001", "DL-1",
-            new CustomerVisitRequests.DeliveryStatus("DELIVERED", 1L, null));
-
-        assertThat(result.replayed()).isFalse();
-        assertThat(tail.getCurrentStatus()).isEqualTo("INBOUND_COMPLETED");
-        assertThat(tail.getSubOrderStatus()).isEqualTo("DELIVERY:DELIVERED");
-    }
-
-    @Test
-    void startMeansDeliveringAndOnlyCompleteSignsAndCreatesVisit() {
+    void startMeansDeliveringWithoutSigningOrCreatingVisit() {
         DeliveryOrder delivery = delivery("WAIT_DELIVERY"); delivery.setVersion(0L);
         when(deliveryOrders.lockByNo("1001", "DL-1")).thenReturn(delivery);
         var started = service.updateDeliveryStatus("1001", "9001", "DL-1",
@@ -118,17 +88,7 @@ class CustomerVisitServiceTest {
         assertThat(delivery.getDispatchedAt()).isNotNull();
         assertThat(delivery.getSignedAt()).isNull();
         verify(visits, never()).insert(org.mockito.ArgumentMatchers.any(CustomerVisit.class));
-        CustomerVisit visit = new CustomerVisit(); visit.setId(33L); visit.setStatus("PENDING");
-        when(visits.findByDelivery("1001", 11L)).thenReturn(visit);
-        var completed = service.updateDeliveryStatus("1001", "9001", "DL-1",
-            new CustomerVisitRequests.DeliveryStatus("DELIVERED", 1L, null));
-        assertThat(completed.deliveryStatus()).isEqualTo("DELIVERED");
-        assertThat(delivery.getSignedAt()).isNotNull();
-        assertThat(delivery.getVersion()).isEqualTo(2);
-        assertThat(completed.visitId()).isEqualTo(33);
-        assertThat(service.updateDeliveryStatus("1001", "9001", "DL-1",
-            new CustomerVisitRequests.DeliveryStatus("DELIVERED", 1L, null)).replayed()).isTrue();
-        verify(deliveryOrders, org.mockito.Mockito.times(2)).updateById(delivery);
+        verify(deliveryOrders).updateById(delivery);
     }
 
     private DeliveryOrder delivery(String status) {

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/DeliveryLongIdJsonContractTest.java

@@ -67,6 +67,6 @@ class DeliveryLongIdJsonContractTest {
                 null, null, "PS-1", null, null, null, null, "CREATED", null,
                 null, null, null, null, null, null, null, null, null, null, null,
                 0, 0, null, null, null, null, null, null, null, null, 0, java.util.List.of(), null,
-                com.baiyue.lastleg.delivery.model.DeliveryDocumentSnapshot.summary(null));
+                com.baiyue.lastleg.delivery.model.DeliveryDocumentSnapshot.summary(null), null, null, null);
     }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/DeliverySchemaContractTest.java

@@ -25,6 +25,7 @@ class DeliverySchemaContractTest {
         assertTrue(schema.contains("create table if not exists ll_outbound_order"));
         assertTrue(schema.contains("status varchar(32) not null default 'wait_outbound'"));
         assertTrue(schema.contains("unique key uk_ll_outbound_idempotency (customer_id,idempotency_key)"));
+        assertTrue(schema.contains("request_hash char(64) null"));
         assertTrue(schema.contains("unique key uk_ll_outbound_dispatch (customer_id,dispatch_order_id)"));
         assertTrue(schema.contains("create table if not exists ll_outbound_pallet_item"));
         assertTrue(schema.contains("unique key uk_ll_outbound_pallet (customer_id,outbound_order_id,warehouse_pallet_id,inbound_code,sku_code)"));
@@ -34,7 +35,9 @@ class DeliverySchemaContractTest {
         assertTrue(schema.contains("create table if not exists ll_delivery_order"));
         assertTrue(schema.contains("status varchar(32) not null default 'wait_delivery'"));
         assertTrue(schema.contains("unique key uk_ll_delivery_idempotency (customer_id,idempotency_key)"));
-        assertTrue(schema.contains("unique key uk_ll_delivery_outbound (customer_id,outbound_order_id)"));
+        assertTrue(schema.contains("unique key uk_ll_delivery_outbound_destination (customer_id,outbound_order_id,delivery_group_key)"));
+        assertTrue(schema.contains("destination_warehouse_code varchar(128) not null"));
+        assertTrue(schema.contains("delivery_group_key varchar(255) not null"));
     }
 
     @Test
@@ -52,7 +55,8 @@ class DeliverySchemaContractTest {
         assertTrue(createEnd > create);
         String definition = schema.substring(create, createEnd);
         for (String column : new String[] {
-            "overseas_warehouse_name", "customer_name", "waybill_no", "delivery_method",
+            "overseas_warehouse_name", "customer_name", "destination_warehouse_id",
+            "destination_warehouse_code", "destination_warehouse_name", "delivery_group_key", "waybill_no", "delivery_method",
             "carrier_name", "pickup_method", "loading_type", "vehicle_type", "vehicle_size",
             "vehicle_plate", "driver_name", "driver_phone", "appointment_account", "seller_name",
             "total_weight_kg", "total_volume_cbm", "planned_delivery_at", "dispatched_at",
@@ -66,6 +70,7 @@ class DeliverySchemaContractTest {
             StandardCharsets.UTF_8).toLowerCase();
         assertTrue(overseas.contains("begin inline empty-database baseline: lastleg"));
         assertTrue(overseas.contains(createToken));
+        assertTrue(overseas.contains("request_hash char(64) null"));
         assertTrue(overseas.indexOf(createToken) < overseas.indexOf("assert_phase5_lastleg_identifiers_migratable"));
         assertTrue(overseas.contains("alter table ll_delivery_order add column overseas_warehouse_name"));
     }

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/DropshipOutboundCandidateMapperContractTest.java

@@ -19,6 +19,7 @@ class DropshipOutboundCandidateMapperContractTest {
             assertTrue(sql.contains(token), token);
         }
         assertTrue(sql.contains("LEAST(pos.available_packages,s.package_count"));
+        assertTrue(sql.contains("#{customerId} IS NULL OR #{customerId}='' OR p.customer_id=#{customerId}"));
     }
 
     @Test

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/PlatformDispatchOutboundContractTest.java

@@ -36,6 +36,37 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 class PlatformDispatchOutboundContractTest {
+    @Test
+    void candidateHttpQueryAcceptsWarehouseWithoutCustomerAndPreservesExplicitFilter() throws Exception {
+        DeliveryTransferController controller = new DeliveryTransferController();
+        var service = mock(com.baiyue.lastleg.delivery.service.DeliveryTransferService.class);
+        ReflectionTestUtils.setField(controller, "service", service);
+        MockMvc mvc = MockMvcBuilders.standaloneSetup(controller)
+            .setCustomArgumentResolvers(new AuthenticationPrincipalArgumentResolver()).build();
+        AuthenticatedUser platform = new AuthenticatedUser(1000001L, 0L, 0L, 1L, "platform_admin",
+            "PLATFORM", "WEB", Set.of(OverseasPermissions.OUTBOUND_CREATE));
+        SecurityContextHolder.getContext().setAuthentication(
+            new UsernamePasswordAuthenticationToken(platform, null, Set.of()));
+        String path = "/api/platform/v1/last-leg/outbound-orders/one-click-dropship/candidates";
+        try {
+            mvc.perform(get(path).param("warehouseId", "WH-1")).andExpect(status().isOk());
+            org.mockito.Mockito.verify(service).oneClickCandidates(null, "WH-1");
+            mvc.perform(get(path).param("customerId", "101").param("warehouseId", "WH-1"))
+                .andExpect(status().isOk());
+            org.mockito.Mockito.verify(service).oneClickCandidates("101", "WH-1");
+            SecurityContextHolder.clearContext();
+            mvc.perform(get(path).param("warehouseId", "WH-1")).andExpect(status().isUnauthorized());
+            AuthenticatedUser merchant = new AuthenticatedUser(7L, 100L, 100L, 8L, "merchant",
+                "MERCHANT", "WEB", Set.of(OverseasPermissions.OUTBOUND_CREATE));
+            SecurityContextHolder.getContext().setAuthentication(
+                new UsernamePasswordAuthenticationToken(merchant, null, Set.of()));
+            mvc.perform(get(path).param("warehouseId", "WH-1")).andExpect(status().isForbidden());
+            org.mockito.Mockito.verifyNoMoreInteractions(service);
+        } finally {
+            SecurityContextHolder.clearContext();
+        }
+    }
+
     @Test
     void outboundDetailAcceptsTheDocumentUrlWithoutPagingParameters() throws Exception {
         DeliveryTransferController controller = new DeliveryTransferController();
@@ -80,14 +111,14 @@ class PlatformDispatchOutboundContractTest {
         }
         assertTrue(Arrays.stream(DispatchController.class.getDeclaredMethods())
             .noneMatch(method -> "depart".equals(method.getName())));
-        assertEquals(Set.of("vehiclePlate", "driverName", "driverPhone", "carrierName", "route",
+        assertEquals(Set.of("vehiclePlate", "driverName", "driverPhone", "carrierName",
                 "fbaAppointmentNo", "fbaAppointmentStatus", "vehicleAppointmentStatus", "estimatedArrivalAt"),
             Arrays.stream(DispatchRequests.Update.class.getRecordComponents())
                 .map(component -> component.getName()).collect(java.util.stream.Collectors.toSet()));
     }
 
     @Test
-    void oneClickRequiresCustomerWhileOutboundListKeepsOptionalFilter() throws Exception {
+    void oneClickCreationRequiresCustomerWhileCandidateAndListFiltersAreOptional() throws Exception {
         Method create = DeliveryTransferController.class.getMethod("createOneClick", AuthenticatedUser.class,
             String.class, DeliveryRequests.OneClickOutbound.class);
         Method candidates = DeliveryTransferController.class.getMethod("oneClickCandidates", AuthenticatedUser.class,
@@ -102,7 +133,7 @@ class PlatformDispatchOutboundContractTest {
         RequestParam pageCustomer = page.getParameters()[1].getAnnotation(RequestParam.class);
         assertNotNull(createCustomer);
         assertTrue(createCustomer.required());
-        assertTrue(candidates.getParameters()[1].getAnnotation(RequestParam.class).required());
+        assertFalse(candidates.getParameters()[1].getAnnotation(RequestParam.class).required());
         assertFalse(candidates.getParameters()[2].getAnnotation(RequestParam.class).required());
         assertNotNull(pageCustomer);
         assertFalse(pageCustomer.required());
@@ -181,6 +212,7 @@ class PlatformDispatchOutboundContractTest {
         assertTrue(yaml.contains("platform:overseas-warehouse:outbound:list"));
         assertTrue(yaml.contains("platform:overseas-warehouse:outbound:create"));
         assertTrue(yaml.contains("platform:overseas-warehouse:outbound:cancel"));
+        assertTrue(yaml.contains("vehicleSize: { type: string, nullable: true, enum: [15托, 30托] }"));
     }
 
     private static void assertPermission(Method method, String permission) {

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/model/DeliveryStatusPolicyTest.java

@@ -8,10 +8,11 @@ class DeliveryStatusPolicyTest {
     @Test
     void exposesOnlyServerAuthorizedActionsForEachState() {
         assertThat(DeliveryStatusPolicy.allowedActions("WAIT_DELIVERY"))
-            .containsExactly("START_DELIVERY", "COMPLETE_DELIVERY", "REJECT_DELIVERY", "CANCEL_DELIVERY");
+            .containsExactly("START_DELIVERY", "REJECT_DELIVERY", "CANCEL_DELIVERY");
         assertThat(DeliveryStatusPolicy.allowedActions("DELIVERING"))
-            .containsExactly("COMPLETE_DELIVERY", "REJECT_DELIVERY", "MARK_RETURN");
+            .containsExactly("REJECT_DELIVERY", "MARK_RETURN");
         assertThat(DeliveryStatusPolicy.allowedActions("DELIVERED")).containsExactly("MARK_RETURN");
+        assertThat(DeliveryStatusPolicy.isEditableTarget("DELIVERED")).isFalse();
         assertThat(DeliveryStatusPolicy.allowedActions("RETURN_PENDING")).isEmpty();
         assertThat(DeliveryStatusPolicy.allowedActions("CANCELLED")).isEmpty();
     }

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxServiceTest.java

@@ -0,0 +1,59 @@
+package com.baiyue.lastleg.delivery.service;
+
+import com.baiyue.common.event.EventEnvelope;
+import com.baiyue.common.event.OverseasDeliveryCompletedV1;
+import com.baiyue.lastleg.delivery.entity.DeliveryOrder;
+import com.baiyue.lastleg.entity.LastlegEventOutbox;
+import com.baiyue.lastleg.entity.LastlegOrder;
+import com.baiyue.lastleg.mapper.LastlegEventOutboxMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.time.Instant;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+class DeliveryCompletedOutboxServiceTest {
+    @Test
+    void emitsOneEventPerSourceInboundAcrossFbaWarehouses() throws Exception {
+        LastlegEventOutboxMapper mapper = mock(LastlegEventOutboxMapper.class);
+        ObjectMapper json = new ObjectMapper().registerModule(new JavaTimeModule());
+        DeliveryCompletedOutboxService service = new DeliveryCompletedOutboxService();
+        ReflectionTestUtils.setField(service, "outbox", mapper);
+        ReflectionTestUtils.setField(service, "objectMapper", json);
+        DeliveryOrder delivery = new DeliveryOrder();
+        delivery.setId(1L); delivery.setDeliveryNo("DL-1"); delivery.setVersion(2L);
+
+        service.publish(delivery, List.of(order(11, "101", "201", "IN-1", "ONT8"),
+            order(12, "102", "202", "IN-2", "ACY2")), Instant.parse("2026-09-15T08:00:00Z"));
+
+        ArgumentCaptor<LastlegEventOutbox> rows = ArgumentCaptor.forClass(LastlegEventOutbox.class);
+        verify(mapper, times(2)).insert(rows.capture());
+        List<OverseasDeliveryCompletedV1> payloads = rows.getAllValues().stream().map(row -> {
+            try {
+                EventEnvelope envelope = json.readValue(row.getPayloadJson(), EventEnvelope.class);
+                return json.treeToValue(envelope.payload(), OverseasDeliveryCompletedV1.class);
+            } catch (Exception exception) { throw new RuntimeException(exception); }
+        }).toList();
+        assertThat(payloads).extracting(OverseasDeliveryCompletedV1::sourceInboundId)
+            .containsExactly("101", "102");
+        assertThat(payloads).extracting(OverseasDeliveryCompletedV1::fbaWarehouseCode)
+            .containsExactly("ONT8", "ACY2");
+    }
+
+    private LastlegOrder order(long id, String inboundId, String orderId, String inboundCode, String fba) {
+        LastlegOrder value = new LastlegOrder();
+        value.setId(id); value.setOrderNo("LM-" + id); value.setCustomerId("88");
+        value.setSourceInboundId(inboundId); value.setInboundCode(inboundCode);
+        value.setSourceOrderId(orderId); value.setSourceOrderNo("FL-" + orderId);
+        value.setRootOrderId(orderId); value.setFbaWarehouseCode(fba);
+        return value;
+    }
+}

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryDocumentServiceTest.java

@@ -5,6 +5,9 @@ import com.baiyue.lastleg.delivery.entity.*;
 import com.baiyue.lastleg.delivery.gateway.DeliveryDocumentFileGateway;
 import com.baiyue.lastleg.delivery.mapper.*;
 import com.baiyue.lastleg.delivery.model.*;
+import com.baiyue.lastleg.customervisit.service.CustomerVisitService;
+import com.baiyue.lastleg.entity.LastlegOrder;
+import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -26,6 +29,9 @@ class DeliveryDocumentServiceTest {
     @Mock DeliveryDocumentRevisionMapper revisions;
     @Mock DeliveryOperationMapper operations;
     @Mock DeliveryDocumentFileGateway files;
+    @Mock LastlegOrderMapper lastlegOrders;
+    @Mock DeliveryCompletedOutboxService deliveryCompletedOutbox;
+    @Mock CustomerVisitService customerVisits;
     DeliveryDocumentService service;
     DeliveryOrder order;
     @BeforeEach void setUp() {
@@ -35,6 +41,9 @@ class DeliveryDocumentServiceTest {
         ReflectionTestUtils.setField(service,"operations",operations);
         ReflectionTestUtils.setField(service,"files",files);
         ReflectionTestUtils.setField(service,"objectMapper",new ObjectMapper().findAndRegisterModules());
+        ReflectionTestUtils.setField(service,"lastlegOrders",lastlegOrders);
+        ReflectionTestUtils.setField(service,"deliveryCompletedOutbox",deliveryCompletedOutbox);
+        ReflectionTestUtils.setField(service,"customerVisits",customerVisits);
         order = new DeliveryOrder(); order.setId(10L); order.setCustomerId("100");
         order.setDeliveryNo("DL-1"); order.setVersion(0L); order.setStatus("DELIVERED");
     }
@@ -121,6 +130,27 @@ class DeliveryDocumentServiceTest {
         assertThat(result.uploadedCategoryCount()).isEqualTo(3); assertThat(result.totalCategoryCount()).isEqualTo(3);
         assertThat(result.categories()).allMatch(c->c.status().equals("UPLOADED"));
     }
+    @Test void savingReceiptAutomaticallyCompletesOnlyThisDeliveryAndItsBoundOrders() {
+        order.setStatus("WAIT_DELIVERY");
+        LastlegOrder related = new LastlegOrder(); related.setId(20L); related.setCustomerId("100");
+        related.setDeliveryOrderNo("DL-1"); related.setSubOrderStatus("DELIVERY:WAIT_DELIVERY");
+        when(orders.lockByNo("100","DL-1")).thenReturn(order);
+        when(files.metadata("100",10,RECEIPT,13)).thenReturn(file(13));
+        when(lastlegOrders.selectList(any())).thenReturn(List.of(related));
+
+        service.save("100","DL-1","9",request(0,"receipt",List.of(new Binding(RECEIPT,List.of(13L)))));
+
+        assertThat(order.getStatus()).isEqualTo("DELIVERED");
+        assertThat(order.getSignedAt()).isNotNull();
+        assertThat(related.getSubOrderStatus()).isEqualTo("DELIVERY:DELIVERED");
+        verify(lastlegOrders).updateById(related);
+        verify(deliveryCompletedOutbox).publish(eq(order), eq(List.of(related)), any());
+        verify(customerVisits).ensureForCompletedDelivery(eq(order), any());
+        ArgumentCaptor<DeliveryOperation> operation = ArgumentCaptor.forClass(DeliveryOperation.class);
+        verify(operations, times(2)).insert(operation.capture());
+        assertThat(operation.getAllValues()).extracting(DeliveryOperation::getOperationNode)
+            .containsExactly("SAVE_DOCUMENTS", "RECEIPT_AUTO_COMPLETE");
+    }
     private Save request(long version,String key,List<Binding> bindings) { return new Save(version,key,"BOL-1",bindings); }
     private File file(long id) { return new File(id,"a.pdf","application/pdf",1,LocalDateTime.of(2026,9,9,8,0)); }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryTransferServiceTest.java

@@ -91,6 +91,7 @@ class DeliveryTransferServiceTest {
     @BeforeEach
     void setUp() {
         service = new DeliveryTransferService();
+        ReflectionTestUtils.setField(service, "objectMapper", new com.fasterxml.jackson.databind.ObjectMapper());
         ReflectionTestUtils.setField(service, "dispatchOrders", dispatchOrders);
         ReflectionTestUtils.setField(service, "dispatchItems", dispatchItems);
         ReflectionTestUtils.setField(service, "outboundOrders", outboundOrders);
@@ -116,7 +117,7 @@ class DeliveryTransferServiceTest {
     }
 
     @Test
-    void firstTransferCreatesOneOutboundOneDeliveryAndAllPalletSnapshots() {
+    void firstTransferCreatesOneOutboundAndOneDeliveryPerDestinationFbaWarehouse() {
         DispatchOrder dispatch = dispatch(101L, "DSP-101", "TENANT-A");
         when(dispatchOrders.lockGlobalByDispatchNo("DSP-101")).thenReturn(dispatch);
         when(dispatchItems.findByDispatchOrder("TENANT-A", 101L)).thenReturn(List.of(
@@ -131,7 +132,7 @@ class DeliveryTransferServiceTest {
         ArgumentCaptor<DeliveryOrder> delivery = ArgumentCaptor.forClass(DeliveryOrder.class);
         ArgumentCaptor<OutboundPalletItem> pallets = ArgumentCaptor.forClass(OutboundPalletItem.class);
         verify(outboundOrders).insert(outbound.capture());
-        verify(deliveryOrders).insert(delivery.capture());
+        verify(deliveryOrders, org.mockito.Mockito.times(2)).insert(delivery.capture());
         verify(outboundPallets, org.mockito.Mockito.times(2)).insert(pallets.capture());
 
         assertEquals("WAIT_OUTBOUND", outbound.getValue().getStatus());
@@ -139,15 +140,18 @@ class DeliveryTransferServiceTest {
         assertEquals(20, outbound.getValue().getPackageCount());
         assertEquals("transfer-101", outbound.getValue().getIdempotencyKey());
         assertTrue(outbound.getValue().getOutboundNo().matches("OB-WH-\\d{8}-\\d{6}"));
-        assertEquals(outbound.getValue().getId(), delivery.getValue().getOutboundOrderId());
-        assertEquals("WAIT_DELIVERY", delivery.getValue().getStatus());
-        assertTrue(delivery.getValue().getDeliveryNo().matches("DL-WH-\\d{8}-\\d{6}"));
+        assertTrue(delivery.getAllValues().stream().allMatch(value -> outbound.getValue().getId().equals(value.getOutboundOrderId())));
+        assertEquals(List.of("ONT8", "LAX9"), delivery.getAllValues().stream().map(DeliveryOrder::getDestinationWarehouseCode).toList());
+        assertEquals(List.of(12, 8), delivery.getAllValues().stream().map(DeliveryOrder::getPackageCount).toList());
+        assertTrue(delivery.getAllValues().stream().allMatch(value -> "WAIT_DELIVERY".equals(value.getStatus())));
         assertEquals(List.of("ONT8", "LAX9"), pallets.getAllValues().stream()
             .map(OutboundPalletItem::getDestinationWarehouseCode).toList());
         assertEquals(List.of("IN-A", "IN-B"), pallets.getAllValues().stream()
             .map(OutboundPalletItem::getInboundCode).toList());
         assertEquals(20, result.packageCount());
         assertEquals(2, result.palletCount());
+        assertEquals(2, result.deliveries().size());
+        verify(feeSources, org.mockito.Mockito.times(1)).publishApproved(any(), any(), any());
         assertTrue(!result.replayed());
     }
 
@@ -192,14 +196,14 @@ class DeliveryTransferServiceTest {
         DeliveryOrder delivery = delivery(401L, outbound, "DEL-401");
         when(dispatchOrders.lockGlobalByDispatchNo("DSP-101")).thenReturn(dispatch);
         when(outboundOrders.findByIdempotency("TENANT-A", "transfer-101")).thenReturn(outbound);
-        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(delivery);
+        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(List.of(delivery));
 
         DeliveryResponses.TransferResult result = service.platformTransfer("DSP-101", "U-1",
             transferRequest(" transfer-101 ", null));
 
         assertTrue(result.replayed());
         assertEquals("OUT-301", result.outboundNo());
-        assertEquals("DEL-401", result.deliveryNo());
+        assertEquals("DEL-401", result.deliveries().get(0).deliveryNo());
         verify(outboundOrders, never()).insert((OutboundOrder) any());
         verify(outboundPallets, never()).insert((OutboundPalletItem) any());
         verify(deliveryOrders, never()).insert((DeliveryOrder) any());
@@ -229,14 +233,14 @@ class DeliveryTransferServiceTest {
             item(201L, 501L, "PLT-501", "ONT8", "Ontario", "IN-A", 12)));
         when(outboundOrders.insert(any(OutboundOrder.class))).thenThrow(new org.springframework.dao.DuplicateKeyException("duplicate"));
         when(outboundOrders.findByIdempotency("TENANT-A", "transfer-101")).thenReturn(null, winner);
-        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(delivery);
+        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(List.of(delivery));
 
         DeliveryResponses.TransferResult result = service.platformTransfer("DSP-101", "U-1",
             transferRequest("transfer-101", null));
 
         assertTrue(result.replayed());
         assertEquals("OUT-301", result.outboundNo());
-        assertEquals("DEL-401", result.deliveryNo());
+        assertEquals("DEL-401", result.deliveries().get(0).deliveryNo());
         verify(outboundPallets, never()).insert((OutboundPalletItem) any());
         verify(deliveryOrders, never()).insert((DeliveryOrder) any());
     }
@@ -291,7 +295,7 @@ class DeliveryTransferServiceTest {
         DeliveryResponses.OutboundDetail detail = service.outboundDetail("OUT-301");
 
         assertEquals("OUTBOUNDED", detail.outbound().status());
-        org.junit.jupiter.api.Assertions.assertNull(detail.delivery());
+        org.junit.jupiter.api.Assertions.assertTrue(detail.deliveries().isEmpty());
         assertEquals("IN-A", detail.pallets().get(0).inboundCode());
         assertEquals(4, detail.pallets().get(0).packageCount());
     }
@@ -311,13 +315,13 @@ class DeliveryTransferServiceTest {
         OutboundPalletItem pallet = pallet(501L, "IP-ONT8-20260907-000001-P001", "ONT8", "Ontario", "IN-A", 12);
         pallet.setSkuCode("SKU-1");
         when(outboundOrders.findGlobalByNo("OUT-301")).thenReturn(outbound);
-        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(delivery);
+        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(List.of(delivery));
         when(outboundPallets.findByOutbound("TENANT-A", 301L)).thenReturn(List.of(pallet));
 
         DeliveryResponses.OutboundDetail detail = service.outboundDetail("OUT-301");
 
         assertEquals("OUT-301", detail.outbound().outboundNo());
-        assertEquals("DEL-401", detail.delivery().deliveryNo());
+        assertEquals("DEL-401", detail.deliveries().get(0).deliveryNo());
         assertEquals(1, detail.pallets().size());
         assertEquals("IP-ONT8-20260907-000001-P001", detail.pallets().get(0).palletNo());
         assertEquals("IN-A", detail.pallets().get(0).inboundCode());
@@ -332,7 +336,7 @@ class DeliveryTransferServiceTest {
         OutboundOrder outbound = outbound(301L, 101L, "DSP-101", "OUT-301", "transfer-101");
         DeliveryOrder delivery = delivery(401L, outbound, "DEL-401");
         when(outboundOrders.findGlobalByNo("OUT-301")).thenReturn(outbound);
-        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(delivery);
+        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(List.of(delivery));
 
         DeliveryResponses.OutboundDetail detail = service.outboundDetail("OUT-301");
 
@@ -360,13 +364,13 @@ class DeliveryTransferServiceTest {
         when(dispatchOrders.findByDispatchNo("TENANT-A", "DSP-101")).thenReturn(dispatch);
         when(dispatchOrders.lockById("TENANT-A", 101L)).thenReturn(dispatch);
         when(outboundOrders.findByIdempotency("TENANT-A", "merchant-key")).thenReturn(outbound);
-        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(delivery);
+        when(deliveryOrders.lockByOutbound("TENANT-A", 301L)).thenReturn(List.of(delivery));
 
         DeliveryResponses.TransferResult result = service.merchantTransfer("TENANT-A", "DSP-101", "U-2",
             transferRequest(" merchant-key ", null));
 
         assertTrue(result.replayed());
-        assertEquals("DEL-401", result.deliveryNo());
+        assertEquals("DEL-401", result.deliveries().get(0).deliveryNo());
         verify(outboundOrders, never()).insert((OutboundOrder) any());
     }
 
@@ -395,6 +399,24 @@ class DeliveryTransferServiceTest {
         verify(dispatchItems, never()).findByDispatchOrder(any(), any());
     }
 
+    @Test
+    void deliveryDetailAndBolSourceRowsContainOnlyItsDestinationFbaWarehouse() {
+        OutboundOrder outbound = outbound(301L, 101L, "DSP-101", "OUT-301", "transfer-101");
+        DeliveryOrder ont8 = delivery(401L, outbound, "DEL-ONT8");
+        DispatchItem ont8Item = item(201L, 501L, "PLT-501", "ONT8", "Ontario", "IN-A", 12);
+        ont8Item.setOrderId(901L);
+        DispatchItem lax9Item = item(202L, 502L, "PLT-502", "LAX9", "Los Angeles", "IN-B", 8);
+        lax9Item.setOrderId(902L);
+        when(deliveryOrders.findByNo("TENANT-A", "DEL-ONT8")).thenReturn(ont8);
+        when(dispatchItems.findByDispatchOrder("TENANT-A", 101L)).thenReturn(List.of(ont8Item, lax9Item));
+        when(tailOrders.selectBatchIds(List.of(901L))).thenReturn(List.of());
+
+        DeliveryResponses.DeliveryDetail detail = service.deliveryDetail("TENANT-A", "DEL-ONT8");
+
+        assertEquals("ONT8", detail.order().destinationWarehouseCode());
+        verify(tailOrders).selectBatchIds(List.of(901L));
+    }
+
     @Test
     void globalOutboundCancelIsIdempotentForAnUnexecutedOrder() {
         OutboundOrder outbound = outbound(301L, null, null, "OUT-301", "one-click-key");
@@ -440,6 +462,7 @@ class DeliveryTransferServiceTest {
                 .thenReturn(List.of(new DropshipCarton()));
             InventoryPosition position = new InventoryPosition();
             position.setId(900L + i); position.setCustomerId("TENANT-A"); position.setBalanceId(800L + i);
+            position.setOverseasWarehouseId("WH-1");
             position.setPalletId(501L); position.setPalletNo("DP-SHARED");
             InventoryBalance balance = new InventoryBalance();
             balance.setCustomerId("TENANT-A"); balance.setInboundCode("IN-" + i);
@@ -460,6 +483,10 @@ class DeliveryTransferServiceTest {
 
     @Test
     void oneClickOutboundRejectsSummarySkuWithoutAvailableDropshipCartons() {
+        var generator = org.mockito.Mockito.mock(LastlegOrderNoGenerator.class);
+        ReflectionTestUtils.setField(service, "orderNoGenerator", generator);
+        InventoryPosition position = new InventoryPosition(); position.setCustomerId("TENANT-A"); position.setOverseasWarehouseId("WH-1");
+        when(inventoryPositions.selectById(901L)).thenReturn(position);
         DropshipOutboundCandidate candidate = dropshipCandidate(901L, 1001L, "WH-1", "PLT-501", "MIXED", 1L);
         when(dropshipProfiles.lockOutboundCandidate("TENANT-A", 901L, "MIXED")).thenReturn(candidate);
         when(dropshipCartons.lockAvailable("TENANT-A", 1001L, "MIXED", 1L)).thenReturn(List.of());
@@ -470,6 +497,45 @@ class DeliveryTransferServiceTest {
 
         assertEquals(409, exception.getStatusCode().value());
         assertTrue(exception.getReason().contains("一件代发可用箱数不足"));
+        verify(outboundPallets, never()).insert(any(OutboundPalletItem.class));
+    }
+
+    @Test
+    void concurrentOneClickCreateReplaysCurrentCommittedRowBeforeTakingInventoryLocks() {
+        var generator = org.mockito.Mockito.mock(LastlegOrderNoGenerator.class);
+        ReflectionTestUtils.setField(service, "orderNoGenerator", generator);
+        var request = new DeliveryRequests.OneClickOutbound("recipient", List.of(
+            new DeliveryRequests.OneClickItem(901L, 2L, "SKU-1", List.of("A", "B"))), "remark", "race-key");
+        OutboundOrder winner = outbound(301L, null, null, "OUT-WINNER", "race-key");
+        winner.setOutboundType("ONE_CLICK_DROPSHIP"); winner.setRequestHash(service.oneClickRequestHash(request));
+        OutboundPdaTask task = new OutboundPdaTask(); task.setId(701L); task.setTaskNo("PDA-WINNER"); task.setStatus("PENDING");
+        InventoryPosition position = new InventoryPosition(); position.setCustomerId("TENANT-A"); position.setOverseasWarehouseId("WH-1");
+        when(inventoryPositions.selectById(901L)).thenReturn(position);
+        when(outboundOrders.insert(any(OutboundOrder.class))).thenThrow(new org.springframework.dao.DuplicateKeyException("race"));
+        when(outboundOrders.lockByIdempotency("TENANT-A", "race-key")).thenReturn(winner);
+        when(pdaTasks.lockByOutbound("TENANT-A", 301L)).thenReturn(task);
+        assertEquals("PDA-WINNER", service.createOneClick("TENANT-A", "U-1", request).taskNo());
+        verify(dropshipProfiles, never()).lockOutboundCandidate(any(), any(), any());
+        verify(outboundPallets, never()).insert(any(OutboundPalletItem.class));
+        verify(pdaTasks, never()).insert(any(OutboundPdaTask.class));
+    }
+
+    @Test
+    void oneClickReplayRejectsChangedRecipientItemsMarksAndRemark() {
+        var item = new DeliveryRequests.OneClickItem(901L, 2L, "SKU-1", List.of("A", "B"));
+        var request = new DeliveryRequests.OneClickOutbound("recipient", List.of(item), "remark", "key");
+        OutboundOrder existing = outbound(301L, null, null, "OUT-1", "key");
+        existing.setOutboundType("ONE_CLICK_DROPSHIP"); existing.setRequestHash(service.oneClickRequestHash(request));
+        when(outboundOrders.findByIdempotency("TENANT-A", "key")).thenReturn(existing);
+        for (var changed : List.of(
+            new DeliveryRequests.OneClickOutbound("changed", List.of(item), "remark", "key"),
+            new DeliveryRequests.OneClickOutbound("recipient", List.of(item), "changed", "key"),
+            new DeliveryRequests.OneClickOutbound("recipient", List.of(new DeliveryRequests.OneClickItem(902L, 2L, "SKU-1", List.of("A", "B"))), "remark", "key"),
+            new DeliveryRequests.OneClickOutbound("recipient", List.of(new DeliveryRequests.OneClickItem(901L, 2L, "SKU-1", List.of("A", "C"))), "remark", "key"))) {
+            assertEquals(409, assertThrows(ResponseStatusException.class,
+                () -> service.createOneClick("TENANT-A", "U-1", changed)).getStatusCode().value());
+        }
+        verify(inventoryPositions, never()).selectById(any());
         verify(outboundOrders, never()).insert(any(OutboundOrder.class));
     }
 
@@ -491,9 +557,22 @@ class DeliveryTransferServiceTest {
         verify(inventoryPositions, never()).selectById(any());
     }
 
+    @Test
+    void oneClickCandidatesAllowPlatformWarehouseQueryWithoutCustomer() {
+        DropshipOutboundCandidate first = dropshipCandidate(901L, 1001L, "WH-1", "DS-A001", "SKU-1", 1L);
+        DropshipOutboundCandidate second = dropshipCandidate(902L, 1002L, "WH-1", "DS-A002", "SKU-1", 3L);
+        when(dropshipProfiles.listOutboundCandidates(null, "WH-1")).thenReturn(List.of(first, second));
+
+        var result = service.oneClickCandidates(null, " WH-1 ");
+
+        assertEquals(2, result.size());
+        assertEquals("DS-A001", result.get(0).palletNo());
+        assertEquals("DS-A002", result.get(1).palletNo());
+        verify(dropshipProfiles).listOutboundCandidates(null, "WH-1");
+    }
+
     @Test
     void oneClickCreationRejectsOrdinaryInventoryBeforeAnyWrite() {
-        when(dropshipProfiles.lockOutboundCandidate("TENANT-A", 901L, "MIXED")).thenReturn(null);
 
         ResponseStatusException exception = assertThrows(ResponseStatusException.class, () -> service.createOneClick(
             "TENANT-A", "U-1", new DeliveryRequests.OneClickOutbound("recipient", List.of(
@@ -619,6 +698,12 @@ class DeliveryTransferServiceTest {
         assertEquals("SKU-1", projected.skuCode());
         assertEquals("IN-A", projected.inboundCode());
         assertEquals(1L, projected.availablePackages());
+
+        item.setCartonMarks("CTN-B");
+        assertEquals(List.of("CTN-B"), service.pdaTaskDetail("WH-1", "PDA-701").items().get(0).positions()
+            .stream().map(DeliveryResponses.PdaPickPosition::cartonMark).toList());
+        second.setStatus("SHIPPED");
+        assertTrue(service.pdaTaskDetail("WH-1", "PDA-701").items().get(0).positions().isEmpty());
     }
 
     @Test
@@ -647,6 +732,7 @@ class DeliveryTransferServiceTest {
         DeliveryResponses.PdaTaskDetail detail = service.pdaTaskDetail("WH-1", "PDA-701");
 
         assertEquals("CTN-A", detail.items().get(0).positions().get(0).cartonMark());
+        assertEquals("SKU-1", detail.items().get(0).positions().get(0).skuCode());
     }
 
     @Test
@@ -658,13 +744,15 @@ class DeliveryTransferServiceTest {
         OutboundPdaTask task = new OutboundPdaTask(); task.setId(701L); task.setCustomerId("TENANT-A");
         task.setOutboundOrderId(301L); task.setTaskNo("PDA-701"); task.setStatus("PENDING");
         OutboundPalletItem item = pallet(501L, "DP-1", "ONT8", "Ontario", "IN-A", 2);
-        item.setSkuCode("SKU-1");
+        item.setSkuCode("SKU-1"); item.setCartonMarks("BOX-A,BOX-B");
         InventoryPosition position = new InventoryPosition(); position.setId(901L); position.setCustomerId("TENANT-A");
         position.setBalanceId(801L); position.setPalletId(501L); position.setOverseasWarehouseId("WH-1");
         InventoryBalance balance = new InventoryBalance(); balance.setCustomerId("TENANT-A"); balance.setInboundCode("IN-A");
         DropshipOrderProfile profile = new DropshipOrderProfile(); profile.setId(1001L);
         DropshipCarton first = new DropshipCarton(); first.setId(1101L); first.setProductQuantity(7L);
         DropshipCarton second = new DropshipCarton(); second.setId(1102L); second.setProductQuantity(13L);
+        first.setStatus("AVAILABLE"); first.setSkuCode("SKU-1"); first.setCartonMark("BOX-A");
+        second.setStatus("AVAILABLE"); second.setSkuCode("SKU-1"); second.setCartonMark("BOX-B");
         when(pdaTasks.lockByNoAndWarehouse("PDA-701", "WH-1")).thenReturn(task);
         when(outboundOrders.selectById(301L)).thenReturn(outbound);
         when(outboundOrders.lockByNo("TENANT-A", "OUT-301")).thenReturn(outbound);
@@ -672,12 +760,18 @@ class DeliveryTransferServiceTest {
         when(inventoryPositions.selectById(901L)).thenReturn(position);
         when(inventoryBalances.selectById(801L)).thenReturn(balance);
         when(dropshipProfiles.findPosition("TENANT-A", 901L)).thenReturn(profile);
-        when(dropshipCartons.lockAvailable("TENANT-A", 1001L, "SKU-1", 1L)).thenReturn(List.of(first), List.of(second));
+        when(dropshipCartons.findByProfileAndMark("TENANT-A", 1001L, "BOX-A")).thenReturn(first);
+        when(dropshipCartons.findByProfileAndMark("TENANT-A", 1001L, "BOX-B")).thenReturn(second);
         when(dropshipSkuInventory.deduct("TENANT-A", 1001L, "SKU-1", 1L, 7L)).thenReturn(1);
         when(dropshipSkuInventory.deduct("TENANT-A", 1001L, "SKU-1", 1L, 13L)).thenReturn(1);
         when(outboundPallets.findByOutbound("TENANT-A", 301L)).thenReturn(List.of(item));
-        service.pdaPick("WH-1", "U-1", "PDA-701", new DeliveryRequests.PdaPick(item.getId(), 901L, 1L, "pick-7"));
-        service.pdaPick("WH-1", "U-1", "PDA-701", new DeliveryRequests.PdaPick(item.getId(), 901L, 1L, "pick-13"));
+        assertThrows(ResponseStatusException.class, () -> service.pdaPick("WH-1", "U-1", "PDA-701",
+            new DeliveryRequests.PdaPick(item.getId(), 901L, 1L, "wrong-mark", List.of("WRONG-BOX"))));
+        service.pdaPick("WH-1", "U-1", "PDA-701", new DeliveryRequests.PdaPick(item.getId(), 901L, 1L, "pick-7", List.of("BOX-A")));
+        assertEquals(1, item.getPickedPackageCount()); assertEquals("AVAILABLE", second.getStatus());
+        assertThrows(ResponseStatusException.class, () -> service.pdaPick("WH-1", "U-1", "PDA-701",
+            new DeliveryRequests.PdaPick(item.getId(), 901L, 1L, "repeat-box-new-key", List.of("BOX-A"))));
+        service.pdaPick("WH-1", "U-1", "PDA-701", new DeliveryRequests.PdaPick(item.getId(), 901L, 1L, "pick-13", List.of("BOX-B")));
         verify(dropshipSkuInventory).deduct("TENANT-A", 1001L, "SKU-1", 1L, 7L);
         verify(dropshipSkuInventory).deduct("TENANT-A", 1001L, "SKU-1", 1L, 13L);
         assertEquals("SHIPPED", first.getStatus()); assertEquals("SHIPPED", second.getStatus());
@@ -779,6 +873,8 @@ class DeliveryTransferServiceTest {
         value.setOutboundOrderId(outbound.getId()); value.setOutboundNo(outbound.getOutboundNo());
         value.setDispatchOrderId(outbound.getDispatchOrderId()); value.setDispatchNo(outbound.getDispatchNo());
         value.setOverseasWarehouseId(outbound.getOverseasWarehouseId()); value.setStatus("WAIT_DELIVERY");
+        value.setDestinationWarehouseId("DEST-ONT8"); value.setDestinationWarehouseCode("ONT8");
+        value.setDestinationWarehouseName("Ontario"); value.setDeliveryGroupKey("CODE:ONT8");
         value.setPalletCount(outbound.getPalletCount()); value.setPackageCount(outbound.getPackageCount());
         value.setCreatedAt(LocalDateTime.now());
         return value;

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/SmartDispatchOpenApiContractTest.java

@@ -25,11 +25,18 @@ class SmartDispatchOpenApiContractTest {
         assertTrue(yaml.contains("/api/platform/v1/last-leg/dispatches/drafts/{draftToken}/containers/{containerId}:"));
         assertTrue(yaml.contains("draftContainerId:"));
         assertTrue(yaml.contains("SmartDispatchDraftContainer:"));
+        assertTrue(yaml.contains("capacity: { type: integer, enum: [15, 30] }"));
         assertTrue(yaml.contains("SmartDispatchDraft:"));
         assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:list"));
         assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:smart-dispatch"));
         assertTrue(yaml.contains("SmartDispatchPreArrange"));
         assertTrue(yaml.contains("SmartDispatchCandidate"));
+        String preArrangeSchema = yaml.substring(yaml.indexOf("    SmartDispatchPreArrange:"),
+            yaml.indexOf("    SmartDispatchDraftPallet:"));
+        String updateSchema = yaml.substring(yaml.indexOf("    DispatchUpdate:"),
+            yaml.indexOf("    DeliveryTransfer:"));
+        assertFalse(preArrangeSchema.contains("route:"));
+        assertFalse(updateSchema.contains("route:"));
         assertTrue(yaml.contains("name: planIds"));
         String planIdsParameter = yaml.substring(yaml.indexOf("name: planIds"),
             yaml.indexOf("name: orderNo", yaml.indexOf("name: planIds")));

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchControllerTest.java

@@ -53,7 +53,7 @@ class SmartDispatchControllerTest {
     @Test
     void preArrangeResolvesSingleCustomerAndAuthenticatedOperator() {
         DispatchRequests.PreArrange request = new DispatchRequests.PreArrange(
-            List.of(10L, 11L), "ONT8 -> LAX9", "APT-1", "SUCCESS", "PENDING");
+            List.of(10L, 11L), "APT-1", "SUCCESS", "PENDING");
         when(service.resolveCustomerScopeForPallets(List.of(10L, 11L))).thenReturn("100");
 
         controller.preArrange(platform(), request);

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintServiceTest.java

@@ -75,4 +75,34 @@ class DispatchBolPrintServiceTest {
                 assertThat(document.shipFromAddress()).isEqualTo(
                         "10767 7th Street, Rancho Cucamonga, California 91730, US"));
     }
+
+    @Test
+    void createsOneBolDocumentPerFbaWarehouse() {
+        String warehouseId = "193000000000200003";
+        DispatchResponse detail = new DispatchResponse(1L, "DS-WH-20260911-624449", "DEV-23653906",
+                null, null, "五月开发验收车队", null, null, warehouseId, "洛杉矶仓", null,
+                null, null, null, LocalDateTime.of(2026, 9, 12, 2, 40, 20), "PENDING_DEPARTURE",
+                2, 2, 2, 0, 0, 2, null, LocalDateTime.of(2026, 9, 11, 10, 0), List.of(),
+                List.of(
+                        new DispatchResponse.BolLine("TSTU3539519", "DP-001", "ABE2", "ABE2 Warehouse",
+                                "NYEXX2609110214", null, null, 1),
+                        new DispatchResponse.BolLine("TSTU3539519", "DP-002", "ONT8", "ONT8 Warehouse",
+                                "NYEXX2609110215", null, null, 1)));
+        var warehouse = new DomesticWarehouseDirectoryClient.Warehouse(Long.parseLong(warehouseId), 0L,
+                "US-LAX", "洛杉矶仓", "OVERSEAS", "US", "ACTIVE");
+        when(dispatches.platformDetail(detail.dispatchNo())).thenReturn(detail);
+        when(warehouses.activeWarehouse(Long.parseLong(warehouseId), "internal-test-token"))
+                .thenReturn(ApiResponse.success(new DomesticWarehouseDirectoryClient.Detail(warehouse, List.of())));
+        when(print.generateDispatchBol(eq("internal-test-token"), eq("request-2"), any()))
+                .thenReturn(ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF)
+                        .header("X-Print-Page-Count", "2").body("%PDF-".getBytes(StandardCharsets.US_ASCII)));
+
+        service.generate(detail.dispatchNo(), "request-2");
+
+        ArgumentCaptor<PrintPdfClient.Request> request = ArgumentCaptor.forClass(PrintPdfClient.Request.class);
+        verify(print).generateDispatchBol(eq("internal-test-token"), eq("request-2"), request.capture());
+        assertThat(request.getValue().documents().stream()
+                .map(PrintPdfClient.Document::fbaWarehouseCode).toList())
+                .containsExactly("ABE2", "ONT8");
+    }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java

@@ -101,6 +101,7 @@ class DispatchServiceTest {
         assertNotNull(DispatchService.class.getMethod("preArrange", String.class, String.class,
             DispatchRequests.PreArrange.class).getAnnotation(Transactional.class));
         when(candidates.lockSelected("100", List.of(10L))).thenReturn(List.of(candidate(10L, null, "ONT8")));
+        when(items.findByDispatchOrder(eq("100"), any())).thenReturn(List.of(item(11L, "ONT8")));
 
         var result = service.preArrange("100", "7", new DispatchRequests.PreArrange(List.of(10L), null,
             null, null, null));
@@ -119,6 +120,22 @@ class DispatchServiceTest {
         verify(items).insert(any(DispatchItem.class));
     }
 
+    @Test
+    void preArrangeBuildsCommaSeparatedDistinctFbaRouteFromAssignedPallets() {
+        when(candidates.lockSelected("100", List.of(10L, 11L, 12L))).thenReturn(List.of(
+            candidate(10L, null, "ONT8"), candidate(11L, null, "ABE4"), candidate(12L, null, "ONT8")));
+        when(items.findByDispatchOrder(eq("100"), any())).thenReturn(List.of(
+            item(21L, "ONT8"), item(22L, "ABE4"), item(23L, "ONT8")));
+
+        DispatchResponse result = service.preArrange("100", "7",
+            new DispatchRequests.PreArrange(List.of(10L, 11L, 12L), null, null, null));
+
+        assertEquals("ONT8,ABE4", result.route());
+        ArgumentCaptor<DispatchOrder> dispatch = ArgumentCaptor.forClass(DispatchOrder.class);
+        verify(orders).insert(dispatch.capture());
+        assertEquals("ONT8,ABE4", dispatch.getValue().getRoute());
+    }
+
     @Test
     void movingPalletIntoDraftImmediatelyCreatesExpiringExclusiveLock() {
         when(candidates.lockSelected("100", List.of(10L))).thenReturn(List.of(candidate(10L, null, "ONT8")));
@@ -197,7 +214,7 @@ class DispatchServiceTest {
         when(locks.lockActive("100", "PLAN:10")).thenReturn(lock);
         when(drafts.lockActive("draft-1", "7")).thenReturn(draft);
 
-        service.preArrange("100", "7", new DispatchRequests.PreArrange(List.of(10L), null, null, null, null, "draft-1"));
+        service.preArrange("100", "7", new DispatchRequests.PreArrange(List.of(10L), null, null, null, "draft-1"));
 
         assertNotNull(lock.getDispatchOrderId());
         assertEquals("draft-1", lock.getDraftToken());
@@ -252,6 +269,17 @@ class DispatchServiceTest {
         verify(locks).findActiveByDraftContainer("draft-1", 21L);
     }
 
+    @Test
+    void draftContainerOnlyAcceptsFifteenOrThirtyPalletVehicles() {
+        ResponseStatusException exception = assertThrows(ResponseStatusException.class,
+            () -> service.createDraftContainer("7", new DispatchRequests.DraftContainer("draft-1", 14)));
+
+        assertEquals(409, exception.getStatusCode().value());
+        assertEquals("车辆大小仅支持15托或30托", exception.getReason());
+        verify(drafts, never()).lockActive(any(), any());
+        verify(draftContainers, never()).insert(any(DispatchDraftContainer.class));
+    }
+
     @Test
     void rejectsPalletAlreadyLockedByAnotherDispatch() {
         when(candidates.lockSelected("100", List.of(10L))).thenReturn(List.of(candidate(10L, null, "ONT8")));
@@ -315,13 +343,18 @@ class DispatchServiceTest {
         dispatch.setId(1L); dispatch.setCustomerId("100"); dispatch.setDispatchNo("PC1");
         dispatch.setStatus(DispatchService.PENDING_DEPARTURE);
         when(orders.lockGlobalByDispatchNo("PC1")).thenReturn(dispatch);
-        DispatchRequests.Update request = new DispatchRequests.Update("ABC-1", "Driver", null, null, null,
+        DispatchItem ont8 = item(11L, "ONT8");
+        DispatchItem abe4 = item(12L, "ABE4");
+        when(items.findByDispatchOrder("100", 1L)).thenReturn(List.of(ont8, abe4, item(13L, "ONT8")));
+        DispatchRequests.Update request = new DispatchRequests.Update("ABC-1", "Driver", null, null,
             null, null, null, LocalDateTime.now());
 
         DispatchResponse result = service.update("PC1", request);
 
         assertEquals(DispatchService.PENDING_DEPARTURE, dispatch.getStatus());
         assertEquals("ABC-1", result.vehiclePlate());
+        assertEquals("ONT8,ABE4", result.route());
+        assertEquals("ONT8,ABE4", dispatch.getRoute());
         verify(orders).updateById(dispatch);
         verify(items).findByDispatchOrder("100", 1L);
     }
@@ -332,7 +365,7 @@ class DispatchServiceTest {
         dispatch.setId(1L); dispatch.setCustomerId("100"); dispatch.setDispatchNo("PC1");
         dispatch.setStatus("DEPARTED");
         when(orders.lockGlobalByDispatchNo("PC1")).thenReturn(dispatch);
-        DispatchRequests.Update request = new DispatchRequests.Update(null, null, null, null, null,
+        DispatchRequests.Update request = new DispatchRequests.Update(null, null, null, null,
             null, null, null, null);
 
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
@@ -431,4 +464,11 @@ class DispatchServiceTest {
             "LIP1-P001", destination, destination, destination, destination, packageCount,
             new BigDecimal("1.2000"), warehousePalletId == null ? "PLAN" : "RECEIVED");
     }
+
+    private DispatchItem item(long id, String fbaWarehouseCode) {
+        DispatchItem item = new DispatchItem();
+        item.setId(id);
+        item.setFbaWarehouseCode(fbaWarehouseCode);
+        return item;
+    }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/TailPlanCommandOpenApiContractTest.java

@@ -24,8 +24,10 @@ class TailPlanCommandOpenApiContractTest {
             int manualSchemaEnd = api.indexOf("\n    PageMetadata:", manualSchemaStart);
             assertTrue(manualSchemaStart >= 0 && manualSchemaEnd > manualSchemaStart);
             assertFalse(api.substring(manualSchemaStart, manualSchemaEnd).contains("inboundCode"));
+            assertFalse(api.substring(manualSchemaStart, manualSchemaEnd).contains("plannedArrivalDate"));
             assertFalse(java.util.Arrays.stream(ManualInboundPlanRequest.class.getRecordComponents())
-                .anyMatch(component -> "inboundCode".equals(component.getName())));
+                .anyMatch(component -> java.util.Set.of("inboundCode", "plannedArrivalDate")
+                    .contains(component.getName())));
             assertTrue(api.contains("/api/platform/v1/last-leg/orders/{id}/hold:"));
             assertFalse(api.contains("/api/platform/v1/last-leg/orders/{id}/detained:"));
             assertTrue(api.contains("/api/platform/v1/last-leg/orders/{id}/manual-nodes:"));

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/controller/InboundPlanControllerTest.java

@@ -20,7 +20,6 @@ import org.springframework.web.server.ResponseStatusException;
 import java.util.List;
 import java.util.Set;
 import java.time.LocalDateTime;
-import java.time.LocalDate;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.verify;
@@ -106,6 +105,6 @@ class InboundPlanControllerTest {
 
     private static ManualInboundPlanRequest manualRequest() {
         return new ManualInboundPlanRequest("193000000000200003", 9223372036854775807L, 0,
-            LocalDate.of(2026, 9, 8), 2, "STANDARD", false, true, true, "加急入仓");
+            2, "STANDARD", false, true, true, "加急入仓");
     }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerControllerTest.java

@@ -3,6 +3,7 @@ package com.baiyue.lastleg.inboundplan.pda.controller;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.inboundplan.pda.dto.ReceivingContainerRequests;
 import com.baiyue.lastleg.inboundplan.pda.dto.ReceivingContainerResponses;
+import com.baiyue.lastleg.inboundplan.pda.gateway.DomesticLoadingEvidenceGateway;
 import com.baiyue.lastleg.inboundplan.pda.gateway.UnloadPhotoFileGateway;
 import com.baiyue.lastleg.inboundplan.pda.service.ReceivingContainerService;
 import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
@@ -90,6 +91,21 @@ class ReceivingContainerControllerTest {
         verify(service).downloadCurrentPhoto("42", "9999");
     }
 
+    @Test
+    void downloadDomesticLoadingPhotoDelegatesWithoutExposingTheSourceFileId() {
+        when(service.downloadDomesticLoadingPhoto("42", "PHOTO_STEP_1")).thenReturn(
+            new DomesticLoadingEvidenceGateway.DownloadedFile(
+                "domestic".getBytes(), "empty-container.jpg", MediaType.IMAGE_JPEG_VALUE));
+
+        ResponseEntity<byte[]> response = controller.downloadDomesticLoadingPhoto(picker(), "PHOTO_STEP_1");
+
+        assertThat(response.getStatusCodeValue()).isEqualTo(200);
+        assertThat(response.getHeaders().getContentType()).isEqualTo(MediaType.IMAGE_JPEG);
+        assertThat(response.getHeaders().getCacheControl()).isEqualTo("no-store");
+        assertThat(response.getBody()).containsExactly("domestic".getBytes());
+        verify(service).downloadDomesticLoadingPhoto("42", "PHOTO_STEP_1");
+    }
+
     @Test
     void pickerAuthorityWithoutWarehouseBindingIsForbidden() {
         AuthenticatedUser unbound = new AuthenticatedUser(42L, 0L, 0L, 8L, "receiver", "PLATFORM", "PDA",

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java

@@ -18,11 +18,13 @@ import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerOperation;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerSession;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingFbaPalletCount;
 import com.baiyue.lastleg.inboundplan.pda.gateway.UnloadPhotoFileGateway;
+import com.baiyue.lastleg.inboundplan.pda.gateway.DomesticLoadingEvidenceGateway;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerOperationMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerSessionMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingFbaPalletCountMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingSkuReceiptMapper;
+import com.baiyue.lastleg.inboundplan.pda.mapper.ContainerLoadingEvidenceMapper;
 import com.baiyue.lastleg.dropship.mapper.DropshipCartonMapper;
 import com.baiyue.lastleg.dropship.mapper.DropshipOrderProfileMapper;
 import com.baiyue.lastleg.dropship.entity.DropshipCarton;
@@ -71,6 +73,8 @@ class ReceivingContainerServiceBehaviorTest {
     @Mock DropshipOrderProfileMapper dropshipProfiles;
     @Mock WarehouseResourceGateway warehouse;
     @Mock UnloadPhotoFileGateway unloadPhotos;
+    @Mock DomesticLoadingEvidenceGateway domesticEvidenceFiles;
+    @Mock ContainerLoadingEvidenceMapper domesticEvidence;
     @Mock InboundPdaWorkflowService workflow;
     private ReceivingContainerService service;
 
@@ -93,11 +97,14 @@ class ReceivingContainerServiceBehaviorTest {
         ReflectionTestUtils.setField(service, "dropshipProfiles", dropshipProfiles);
         ReflectionTestUtils.setField(service, "warehouse", warehouse);
         ReflectionTestUtils.setField(service, "unloadPhotos", unloadPhotos);
+        ReflectionTestUtils.setField(service, "domesticEvidenceFiles", domesticEvidenceFiles);
+        ReflectionTestUtils.setField(service, "domesticEvidence", domesticEvidence);
         ReflectionTestUtils.setField(service, "workflow", workflow);
         ReflectionTestUtils.setField(service, "sourceObjectMapper", new ObjectMapper().findAndRegisterModules());
         service.initializeObjectMapper();
         org.mockito.Mockito.lenient().when(shippingGates.receivingAvailable(any(), any())).thenReturn(1);
         org.mockito.Mockito.lenient().when(pallets.selectCount(any())).thenReturn(1L);
+        org.mockito.Mockito.lenient().when(domesticEvidence.listByContainer(any())).thenReturn(List.of());
     }
 
     @Test
@@ -846,6 +853,40 @@ class ReceivingContainerServiceBehaviorTest {
             .containsExactly("SKU-A", "SKU-B", "SKU-C");
     }
 
+    @Test
+    void mixedContainerFbaBulkNeverReceivesDropshipOrOrdinaryOverseasLines() {
+        InboundPlanLine fba = line("FBA");
+        InboundPlanLine dropship = line("FBA");
+        dropship.setId(20L); dropship.setOrderId(2L); dropship.setInboundCode("IN-DROPSHIP");
+        InboundPlanLine overseas = line("OVERSEAS");
+        overseas.setId(30L); overseas.setOrderId(3L); overseas.setInboundCode("IN-OVERSEAS");
+        LastlegOrder dropshipOrder = order("FBA");
+        dropshipOrder.setId(2L); dropshipOrder.setOrderType("ONE_CLICK_DROPSHIP");
+        LastlegOrder overseasOrder = order("OVERSEAS"); overseasOrder.setId(3L);
+        when(sessions.lockActiveByOperator("OPERATOR:7")).thenReturn(session("CONT-A", "SIGNED"));
+        when(plans.selectList(any())).thenReturn(List.of(plan("CONT-A")));
+        when(lines.selectList(any())).thenReturn(List.of(dropship, overseas, fba));
+        when(orders.selectById(1L)).thenReturn(order("FBA"));
+        when(orders.selectById(2L)).thenReturn(dropshipOrder);
+        when(orders.selectById(3L)).thenReturn(overseasOrder);
+        when(orderDetails.selectList(any())).thenReturn(List.of(detail("FBA-SKU", 2)));
+        stubReservedFbaPallet();
+        when(workflow.receiveBulkResolved(any(), any(), any(), any(), anyInt(), any(), any()))
+            .thenAnswer(invocation -> invocation.getArgument(4));
+        when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
+        when(operations.insert(any(ReceivingContainerOperation.class))).thenReturn(1);
+
+        var result = service.receiveBulk("7", "receiver",
+            new ReceivingContainerRequests.BulkReceive("IN-1", "PAL-1", 2, "mixed-fba-receive"));
+
+        assertThat(result.acceptedPackages()).isEqualTo(2);
+        ArgumentCaptor<InboundPlanLine> captured = ArgumentCaptor.forClass(InboundPlanLine.class);
+        verify(workflow).receiveBulkResolved(any(), any(), captured.capture(), any(),
+            org.mockito.ArgumentMatchers.eq(2), any(), any());
+        assertThat(captured.getValue()).isSameAs(fba);
+        verifyNoInteractions(dropshipProfiles, dropshipCartons);
+    }
+
     @Test
     void dropshipCartonResolvesItsCompleteDpInsteadOfAPlanOrCustomer() {
         stubCurrent("OVERSEAS", "CONT-A");
@@ -898,12 +939,36 @@ class ReceivingContainerServiceBehaviorTest {
         assertThat(result.receivedPackages()).isEqualTo(2);
         assertThat(result.pendingPackages()).isZero();
         assertThat(result.palletCode()).isEqualTo("DP-260909-0001");
+        var duplicate = service.receiveWholePallet("7", "receiver",
+            new ReceivingContainerRequests.WholePalletReceive("DP-260909-0001", "whole-new-key"));
+        assertThat(duplicate.result()).isEqualTo("ALREADY_RECEIVED");
+        assertThat(duplicate.acceptedPackages()).isZero();
+        verify(sessions, org.mockito.Mockito.times(1)).updateById(any(ReceivingContainerSession.class));
         verify(workflow).pickWholePallet(org.mockito.ArgumentMatchers.eq("100"),
             org.mockito.ArgumentMatchers.eq("PLAN-1"), org.mockito.ArgumentMatchers.eq(30L),
             any(com.baiyue.lastleg.inboundplan.pda.dto.PdaRequests.WholePalletOperation.class));
         verifyNoInteractions(warehouse);
     }
 
+    @Test
+    void domesticLoadingPhotoDownloadIsScopedToTheCurrentPhysicalContainer() {
+        ReceivingContainerSession current = session("CONT-A", "SIGNED");
+        current.setSourceContainerBookingId("91");
+        when(sessions.findActiveByOperator("OPERATOR:7")).thenReturn(current);
+        var evidence = new com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence();
+        evidence.setSourceContainerBookingId("91"); evidence.setEvidenceType("SEAL");
+        evidence.setSourceFileId(501L); evidence.setFileName("seal.jpg");
+        when(domesticEvidence.find("91", "SEAL")).thenReturn(evidence);
+        var downloaded = new DomesticLoadingEvidenceGateway.DownloadedFile(
+            new byte[]{1, 2}, "seal.jpg", "image/jpeg");
+        when(domesticEvidenceFiles.download(91L, 501L)).thenReturn(downloaded);
+
+        assertThat(service.downloadDomesticLoadingPhoto("7", "SEAL")).isSameAs(downloaded);
+        verify(domesticEvidenceFiles).download(91L, 501L);
+        assertThatThrownBy(() -> service.downloadDomesticLoadingPhoto("7", "UNKNOWN"))
+            .isInstanceOf(ResponseStatusException.class).hasMessageContaining("400");
+    }
+
     private void stubCurrent(String destinationType, String containerNo) {
         InboundPlan plan = plan(containerNo);
         InboundPlanLine line = line(destinationType);

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinatorTest.java

@@ -409,7 +409,7 @@ class ContainerInboundPlanConversionCoordinatorTest {
     }
 
     private ManualInboundPlanRequest manualRequest() {
-        return new ManualInboundPlanRequest("100", 11L, 0, LocalDate.of(2026, 9, 10),
+        return new ManualInboundPlanRequest("100", 11L, 0,
             1, "WOOD", false, false, false, "自动生成");
     }
 

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/InboundPlanServiceTest.java

@@ -93,6 +93,10 @@ class InboundPlanServiceTest {
         org.mockito.Mockito.lenient().when(orderMapper.lockContainerWarehouseFacts(any(), any())).thenReturn(List.of(
             new InboundPlanOrderMapper.ContainerWarehouseRef(
                 "100", 2L, "BOOKING-1", "193000000000200003")));
+        org.mockito.Mockito.lenient().when(orderMapper.findSourceContainerBookingId(any(), anyLong()))
+            .thenReturn("BOOKING-1");
+        org.mockito.Mockito.lenient().when(orderMapper.containerEstimatedWarehouseTimes(any()))
+            .thenReturn(List.of(LocalDateTime.of(2026, 9, 15, 8, 0)));
     }
 
     @Test
@@ -108,6 +112,7 @@ class InboundPlanServiceTest {
         ArgumentCaptor<InboundPlan> plan = ArgumentCaptor.forClass(InboundPlan.class);
         verify(planMapper).insert(plan.capture());
         assertEquals(2L, plan.getValue().getSourceOrderId());
+        assertEquals(LocalDate.of(2026, 9, 15), plan.getValue().getPlannedArrivalDate());
         assertEquals(1, plan.getValue().getLineCount());
         assertEquals("PENDING_ASSIGNMENT", plan.getValue().getStatus());
         assertEquals(1, plan.getValue().getPalletCount());
@@ -149,7 +154,7 @@ class InboundPlanServiceTest {
         when(orderMapper.markPlannedManual(eq("100"), eq(2L), any(), eq(2), eq(true), eq(0), any()))
             .thenReturn(1);
         ManualInboundPlanRequest request = new ManualInboundPlanRequest("100", 2L, 0,
-            LocalDate.of(2026, 9, 15), 2, "STANDARD", true, true, true, "优先收货");
+            2, "STANDARD", true, true, true, "优先收货");
 
         var result = service.convertManual(request, "manual-2", "900");
 
@@ -167,6 +172,27 @@ class InboundPlanServiceTest {
         verify(orderMapper).lockContainerWarehouseFacts("100", 2L);
     }
 
+    @Test
+    void manualPlanRejectsMissingOrInconsistentContainerArrivalTime() {
+        ManualInboundPlanRequest request = new ManualInboundPlanRequest("100", 2L, 0,
+            2, "STANDARD", true, true, true, "优先收货");
+        when(orderMapper.containerEstimatedWarehouseTimes("BOOKING-1")).thenReturn(List.of());
+
+        ResponseStatusException missing = assertThrows(ResponseStatusException.class,
+            () -> service.convertManual(request, "manual-missing-arrival", "900"));
+        assertEquals(409, missing.getStatusCode().value());
+        assertEquals("来源柜预计到仓时间缺失，请先补齐柜级时间", missing.getReason());
+
+        when(orderMapper.containerEstimatedWarehouseTimes("BOOKING-1")).thenReturn(List.of(
+            LocalDateTime.of(2026, 9, 15, 8, 0), LocalDateTime.of(2026, 9, 16, 8, 0)));
+        ResponseStatusException inconsistent = assertThrows(ResponseStatusException.class,
+            () -> service.convertManual(request, "manual-inconsistent-arrival", "900"));
+        assertEquals(409, inconsistent.getStatusCode().value());
+        assertEquals("来源柜预计到仓时间不一致，请先修正柜级时间", inconsistent.getReason());
+        verify(orderMapper, never()).lockOrder(any(), any());
+        verify(planMapper, never()).insert(any(InboundPlan.class));
+    }
+
     @Test
     void manualPlanMayExceedButCannotUndercutPreviewPalletCount() {
         SourceOrderSnapshot source = new SourceOrderSnapshot(2L, "100", "MSCU6639870", "RK-2",
@@ -175,7 +201,7 @@ class InboundPlanServiceTest {
             null, null, "Amazon ACY2", 0, 0, false, 0);
         when(orderMapper.lockOrder("100", 2L)).thenReturn(List.of(source));
         ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.convertManual(
-            new ManualInboundPlanRequest("100", 2L, 0, LocalDate.of(2026, 9, 15),
+            new ManualInboundPlanRequest("100", 2L, 0,
                 2, "WOOD", false, false, false, null), "manual-below-preview", "900"));
 
         assertEquals(400, error.getStatusCode().value());
@@ -192,7 +218,7 @@ class InboundPlanServiceTest {
             new DropshipPalletSnapshot("DP-260914-0001", 10L, List.of())));
 
         ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.convertManual(
-            new ManualInboundPlanRequest("100", 2L, 0, LocalDate.of(2026, 9, 15),
+            new ManualInboundPlanRequest("100", 2L, 0,
                 2, "WOOD", false, false, false, null), "dropship-pallet-mismatch", "900"));
 
         assertEquals(400, error.getStatusCode().value());
@@ -212,7 +238,7 @@ class InboundPlanServiceTest {
             .thenReturn(1);
 
         var result = service.convertManual(new ManualInboundPlanRequest("100", 2L, 0,
-            LocalDate.of(2026, 9, 15), 1, "WOOD", false, false, false, null),
+            1, "WOOD", false, false, false, null),
             "dropship-exact-pallet-count", "900");
 
         assertEquals(1, result.palletCount());
@@ -266,7 +292,7 @@ class InboundPlanServiceTest {
             .thenReturn(1);
 
         var result = service.convertManual(new ManualInboundPlanRequest("100", 2L, 0,
-            LocalDate.of(2026, 9, 15), 3, "STANDARD", true, false, false, null),
+            3, "STANDARD", true, false, false, null),
             "manual-id-only", "900");
 
         assertEquals("US-LAX-01", result.overseasWarehouseCode());
@@ -282,7 +308,7 @@ class InboundPlanServiceTest {
             new InboundPlanOrderMapper.ContainerWarehouseRef("200", 3L, "BOOKING-1", "193000000000200004")));
 
         ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.convertManual(
-            new ManualInboundPlanRequest("100", 2L, 0, LocalDate.of(2026, 9, 15),
+            new ManualInboundPlanRequest("100", 2L, 0,
                 1, "STANDARD", false, false, false, null), "mixed-warehouse", "900"));
 
         assertEquals(409, error.getStatusCode().value());
@@ -300,7 +326,7 @@ class InboundPlanServiceTest {
         when(orderMapper.lockOrder("100", 2L)).thenReturn(List.of(held));
 
         ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.convertManual(
-            new ManualInboundPlanRequest("100", 2L, 5, LocalDate.of(2026, 9, 15),
+            new ManualInboundPlanRequest("100", 2L, 5,
                 1, "STANDARD", false, false, false, null),
             "manual-held", "900"));
 

lastleg-service/src/test/java/com/baiyue/lastleg/looseboard/service/LocalLooseboardServiceTest.java

@@ -1,6 +1,7 @@
 package com.baiyue.lastleg.looseboard.service;
 
 import com.baiyue.lastleg.looseboard.dto.LocalLooseboardRequests;
+import com.baiyue.common.core.exception.BizException;
 import com.baiyue.lastleg.looseboard.entity.LocalLooseboardHistory;
 import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOrder;
 import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOperation;
@@ -85,6 +86,7 @@ class LocalLooseboardServiceTest {
         assertEquals("100", detail.summary().customerId());
         assertEquals(LocalLooseboardService.PENDING_ACCEPTANCE, detail.summary().status());
         assertEquals("SHARED_TRUCK", detail.summary().transportMode());
+        assertEquals("40HQ", detail.summary().containerType());
         verify(lastlegOrders).insert(org.mockito.ArgumentMatchers.<LastlegOrder>argThat(value ->
             "LOCAL_LOOSEBOARD".equals(value.getOrderType())
                 && value.getSourceOrderNo().equals("LB-WH-20260901-000001")
@@ -94,6 +96,22 @@ class LocalLooseboardServiceTest {
             "CREATE".equals(value.getOperationType())));
     }
 
+    @Test
+    void createDefaultsTheContainerTypeAndRejectsRemovedTypes() {
+        AtomicReference<LocalLooseboardOrder> saved = new AtomicReference<>();
+        when(orders.insert(any(LocalLooseboardOrder.class))).thenAnswer(call -> {
+            saved.set(call.getArgument(0));
+            return 1;
+        });
+        when(orders.findNo(anyString(), anyString())).thenAnswer(call -> saved.get());
+        when(histories.listOrder(anyString(), any())).thenReturn(List.of());
+
+        var detail = service.create("100", "7", create("default-type", null));
+
+        assertEquals("40HQ", detail.summary().containerType());
+        assertThrows(BizException.class, () -> service.create("100", "7", create("retired-type", "40HC")));
+    }
+
     @Test
     void ordinaryUpdateCannotChangeAcceptedOrder() {
         LocalLooseboardOrder order = order(LocalLooseboardService.DISPATCHED, 0L);
@@ -174,8 +192,12 @@ class LocalLooseboardServiceTest {
     }
 
     private LocalLooseboardRequests.Create create(String key) {
+        return create(key, "40HQ");
+    }
+
+    private LocalLooseboardRequests.Create create(String key, String containerType) {
         return new LocalLooseboardRequests.Create("SHARED_TRUCK", "YES", "WAREHOUSE_TO_WAREHOUSE",
-            "Los Angeles", "Address A", "Ontario", "Address B", "40HQ", 12,
+            "Los Angeles", "Address A", "Ontario", "Address B", containerType, 12,
             new BigDecimal("100.000"), new BigDecimal("2.500000"), new BigDecimal("500.00"),
             "USD", "Alice", "+1-555-0100", LocalDate.now().plusDays(2), null, key);
     }

lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelDocumentServiceTest.java

@@ -28,11 +28,13 @@ class RelabelDocumentServiceTest {
         when(applications.lockNo("101","RL-1")).thenReturn(application);when(applications.findNo("101","RL-1")).thenReturn(application);
     }
     @Test void totalUploadPersistsReturnedMetadataAndExposesSummary(){
-        when(files.upload("101","OVERSEAS_RELABEL_TOTAL_DOCUMENT","11",7L,pdf)).thenReturn(new RelabelDocumentFileGateway.UploadedFile(99L,"labels.pdf","application/pdf",15));
+        when(files.upload("101","OVERSEAS_RELABEL_CARTON_TOTAL_DOCUMENT","11",7L,pdf)).thenReturn(new RelabelDocumentFileGateway.UploadedFile(99L,"labels.pdf","application/pdf",15));
         var result=service.uploadTotalFile("101","RL-1",7L,pdf);
         assertThat(result.application().totalFileId()).isEqualTo("99");
         assertThat(result.application().totalFileName()).isEqualTo("labels.pdf");
         assertThat(result.application().totalFileUrl()).endsWith("/files/99/download?scope=TOTAL");
+        assertThat(application.getCartonTotalFileId()).isEqualTo("99");
+        verify(files).upload("101","OVERSEAS_RELABEL_CARTON_TOTAL_DOCUMENT","11",7L,pdf);
         verify(applications).updateById(application);
     }
     @Test void itemUploadBindsOwnCustomerApplicationAndDistinctCategory(){

lastleg-service/src/test/java/com/baiyue/lastleg/security/Phase5AdminPermissionContractTest.java

@@ -14,6 +14,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class Phase5AdminPermissionContractTest {
@@ -34,14 +35,14 @@ class Phase5AdminPermissionContractTest {
     }
 
     @Test
-    void customerVisitAndDeliveryStatusEndpointsUseIndependentAuthorities() {
+    void customerVisitAndEditableDeliveryStatusEndpointsUseIndependentAuthorities() {
         Map<String, String> permissions = permissions(CustomerVisitController.class);
 
         assertEquals(authority(OverseasPermissions.CUSTOMER_VISIT_LIST), permissions.get("page"));
         assertEquals(authority(OverseasPermissions.CUSTOMER_VISIT_LIST), permissions.get("detail"));
         assertEquals(authority(OverseasPermissions.CUSTOMER_VISIT_EDIT), permissions.get("save"));
         assertEquals(authority(OverseasPermissions.CUSTOMER_VISIT_EDIT), permissions.get("upload"));
-        assertEquals(authority(OverseasPermissions.DELIVERY_STATUS), permissions.get("completeDelivery"));
+        assertFalse(permissions.containsKey("completeDelivery"));
         assertEquals(authority(OverseasPermissions.DELIVERY_STATUS), permissions.get("updateDeliveryStatus"));
     }
 
@@ -76,6 +77,7 @@ class Phase5AdminPermissionContractTest {
         }) {
             assertTrue(yaml.contains(path), path);
         }
+        assertFalse(yaml.contains("/api/platform/v1/last-leg/delivery-orders/{deliveryNo}/complete:"));
     }
 
     private static Map<String, String> permissions(Class<?> controller) {

lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java

@@ -3,8 +3,8 @@ import com.baiyue.common.event.*; import com.baiyue.lastleg.entity.*; import com
 @ExtendWith(org.mockito.junit.jupiter.MockitoExtension.class)
 class LoadingCompletedConsumerTest {
  private final Map<String,String> frozenContainerNos=new HashMap<>();
- @Mock LastlegEventInboxMapper inbox; @Mock LastlegOrderMapper orders; @Mock LastlegInboundOrderMapper inboundOrders; @Mock LastlegOrderDetailMapper details; @Mock LastlegOrderStatusHistoryMapper histories; @Mock InboundPlanCartonMapper cartons; @Mock DropshipOrderService dropshipOrders; @Mock InventoryCommandService inventory; @Mock com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper shippingGates; @Mock LastlegOrderNoDailySequenceMapper sequences; ObjectMapper json=new ObjectMapper().findAndRegisterModules(); LoadingCompletedConsumer service;
- @BeforeEach void setup(){ service=new LoadingCompletedConsumer(); ReflectionTestUtils.setField(service,"inboxMapper",inbox); ReflectionTestUtils.setField(service,"orderMapper",orders); ReflectionTestUtils.setField(service,"inboundOrderMapper",inboundOrders); ReflectionTestUtils.setField(service,"detailMapper",details); ReflectionTestUtils.setField(service,"historyMapper",histories); ReflectionTestUtils.setField(service,"cartonMapper",cartons); ReflectionTestUtils.setField(service,"dropshipOrders",dropshipOrders); ReflectionTestUtils.setField(service,"inventory",inventory); ReflectionTestUtils.setField(service,"shippingGates",shippingGates); ReflectionTestUtils.setField(service,"objectMapper",json); LastlegOrderNoGenerator generator=new LastlegOrderNoGenerator(); ReflectionTestUtils.setField(generator,"sequenceMapper",sequences); ReflectionTestUtils.setField(service,"orderNoGenerator",generator); lenient().when(sequences.currentValue()).thenReturn(1L); lenient().doAnswer(i->{ LastlegOrder o=i.getArgument(0); o.setId(Math.abs(o.getSourceInboundId().hashCode())+1L); return 1; }).when(orders).insert(any(LastlegOrder.class)); lenient().when(orders.lockContainerNumbers(anyString())).thenReturn(List.of()); lenient().when(shippingGates.initialize(anyString(),anyString(),anyString(),anyLong(),anyLong())).thenAnswer(i->{ String key=i.getArgument(0); String value=i.getArgument(2); return frozenContainerNos.putIfAbsent(key,value)==null?1:0; }); lenient().when(shippingGates.lock(anyString())).thenAnswer(i->{ String key=i.getArgument(0); String value=frozenContainerNos.get(key); if(value==null)return null; var gate=new com.baiyue.lastleg.shipping.entity.ContainerShippingGate(); gate.setContainerBookingId(key); gate.setContainerNo(value); return gate; }); }
+ @Mock LastlegEventInboxMapper inbox; @Mock LastlegOrderMapper orders; @Mock LastlegInboundOrderMapper inboundOrders; @Mock LastlegOrderDetailMapper details; @Mock LastlegOrderStatusHistoryMapper histories; @Mock InboundPlanCartonMapper cartons; @Mock DropshipOrderService dropshipOrders; @Mock InventoryCommandService inventory; @Mock com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper shippingGates; @Mock com.baiyue.lastleg.inboundplan.pda.mapper.ContainerLoadingEvidenceMapper loadingEvidence; @Mock LastlegOrderNoDailySequenceMapper sequences; ObjectMapper json=new ObjectMapper().findAndRegisterModules(); LoadingCompletedConsumer service;
+ @BeforeEach void setup(){ service=new LoadingCompletedConsumer(); ReflectionTestUtils.setField(service,"inboxMapper",inbox); ReflectionTestUtils.setField(service,"orderMapper",orders); ReflectionTestUtils.setField(service,"inboundOrderMapper",inboundOrders); ReflectionTestUtils.setField(service,"detailMapper",details); ReflectionTestUtils.setField(service,"historyMapper",histories); ReflectionTestUtils.setField(service,"cartonMapper",cartons); ReflectionTestUtils.setField(service,"dropshipOrders",dropshipOrders); ReflectionTestUtils.setField(service,"inventory",inventory); ReflectionTestUtils.setField(service,"shippingGates",shippingGates); ReflectionTestUtils.setField(service,"loadingEvidence",loadingEvidence); ReflectionTestUtils.setField(service,"objectMapper",json); LastlegOrderNoGenerator generator=new LastlegOrderNoGenerator(); ReflectionTestUtils.setField(generator,"sequenceMapper",sequences); ReflectionTestUtils.setField(service,"orderNoGenerator",generator); lenient().when(sequences.currentValue()).thenReturn(1L); lenient().doAnswer(i->{ LastlegOrder o=i.getArgument(0); o.setId(Math.abs(o.getSourceInboundId().hashCode())+1L); return 1; }).when(orders).insert(any(LastlegOrder.class)); lenient().when(orders.lockContainerNumbers(anyString())).thenReturn(List.of()); lenient().when(shippingGates.initialize(anyString(),anyString(),anyString(),anyLong(),anyLong())).thenAnswer(i->{ String key=i.getArgument(0); String value=i.getArgument(2); return frozenContainerNos.putIfAbsent(key,value)==null?1:0; }); lenient().when(shippingGates.lock(anyString())).thenAnswer(i->{ String key=i.getArgument(0); String value=frozenContainerNos.get(key); if(value==null)return null; var gate=new com.baiyue.lastleg.shipping.entity.ContainerShippingGate(); gate.setContainerBookingId(key); gate.setContainerNo(value); return gate; }); }
   @Test void createsPendingOrdersAndInTransitSnapshotsWithoutInboundPlans(){ EventEnvelope event=event(); assertEquals(2,service.consume(event)); assertThrows(NoSuchFieldException.class,()->LoadingCompletedConsumer.class.getDeclaredField("inboundPlans")); verify(orders,times(2)).insert(any(LastlegOrder.class)); ArgumentCaptor<InventoryCommandRequests.InTransit> inTransit=ArgumentCaptor.forClass(InventoryCommandRequests.InTransit.class); verify(inventory,times(2)).registerInTransit(eq("100"),eq("SYSTEM"),inTransit.capture()); assertEquals(Set.of("RK1","RK2"),inTransit.getAllValues().stream().map(InventoryCommandRequests.InTransit::inboundOrderNo).collect(java.util.stream.Collectors.toSet())); verify(details,times(2)).insert(any(LastlegOrderDetail.class)); verify(histories,times(2)).insert(any(LastlegOrderStatusHistory.class)); ArgumentCaptor<LastlegOrder> c=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(2)).insert(c.capture()); assertEquals(Set.of("in-1","in-2"),c.getAllValues().stream().map(LastlegOrder::getSourceInboundId).collect(java.util.stream.Collectors.toSet())); assertTrue(c.getAllValues().stream().allMatch(o->"PENDING_ASSIGNMENT".equals(o.getCurrentStatus()))); assertTrue(c.getAllValues().stream().allMatch(o->o.getInboundOrderNo()==null)); assertTrue(c.getAllValues().stream().allMatch(o->o.getId()!=null)); assertTrue(c.getAllValues().stream().allMatch(o->"MSCU6639870".equals(o.getContainerNo()))); assertTrue(c.getAllValues().stream().allMatch(o->"FBA".equals(o.getDestinationType()))); assertTrue(c.getAllValues().stream().allMatch(o->"Customer 100".equals(o.getCustomerName()))); assertTrue(c.getAllValues().stream().allMatch(o->"ow-1".equals(o.getSourceWarehouseId())&&"193000000000200003".equals(o.getOverseasWarehouseId())&&"US-LAX-01".equals(o.getOverseasWarehouseCode())&&"洛杉矶仓".equals(o.getOverseasWarehouseName())&&Integer.valueOf(0).equals(o.getReceivingWarehouseVersion()))); ArgumentCaptor<LastlegInboundOrder> snapshots=ArgumentCaptor.forClass(LastlegInboundOrder.class); verify(inboundOrders,times(2)).insert(snapshots.capture()); assertTrue(snapshots.getAllValues().stream().allMatch(o->"100".equals(o.getCustomerId())&&"FBA".equals(o.getDestinationType()))); assertEquals(1,c.getAllValues().stream().map(LastlegOrder::getOrderNo).distinct().count()); assertTrue(c.getAllValues().get(0).getOrderNo().matches("FL-WH-[0-9]{8}-[0-9]{6}")); }
   @Test void oneContainerWith15InboundRowsSharesOneStableContainerOrderNumber(){ EventEnvelope source=event(); com.fasterxml.jackson.databind.node.ObjectNode node=source.payload().deepCopy(); com.fasterxml.jackson.databind.node.ArrayNode rows=json.createArrayNode(); for(int index=1;index<=15;index++){ com.fasterxml.jackson.databind.node.ObjectNode row=node.path("orders").get(0).deepCopy(); row.put("sourceInboundId","in-"+index).put("rootInboundId","root-"+index).put("sourceOrderId","order-"+index).put("sourceOrderNo","FL-"+index).put("rootOrderId","root-order-"+index).put("inboundCode","RK-"+index); rows.add(row); } node.set("orders",rows); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope fifteen=new EventEnvelope("123e4567-e89b-12d3-a456-426614174015",source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); assertEquals(15,service.consume(fifteen)); ArgumentCaptor<LastlegOrder> captured=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(15)).insert(captured.capture()); assertEquals(1,captured.getAllValues().stream().map(LastlegOrder::getOrderNo).distinct().count()); assertTrue(captured.getAllValues().get(0).getOrderNo().matches("^FL-WH-\\d{8}-\\d{6}$")); verify(sequences,never()).nextValue(any(java.time.LocalDate.class)); }
   @Test void rejectsMissingOwnerSnapshotBeforeAnyLastlegWrite(){ EventEnvelope source=event(); com.fasterxml.jackson.databind.node.ObjectNode node=source.payload().deepCopy(); ((com.fasterxml.jackson.databind.node.ObjectNode)node.path("orders").get(0)).put("customerName"," "); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope missing=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); IllegalArgumentException error=assertThrows(IllegalArgumentException.class,()->service.consume(missing)); assertTrue(error.getMessage().contains("尾程事件负载无效")||error.getMessage().contains("货主快照")); verify(inbox,never()).insert(any(LastlegEventInbox.class)); verify(orders,never()).insert(any(LastlegOrder.class)); }
@@ -241,6 +241,26 @@ class LoadingCompletedConsumerTest {
   return new EventEnvelope(original.eventId(),original.eventType(),2,original.occurredAt(),original.sourceRegion(),original.targetRegion(),original.tenantId(),original.aggregateType(),original.aggregateId(),original.aggregateVersion(),2L,original.traceId(),original.correlationId(),original.causationId(),node,hash);
  }
   private EventEnvelope event(){ var item1=new FirstLegLoadingPlanCompletedV1.Item("d-1","SKU-1","产品","Product",5,50,1,new BigDecimal("10"),new BigDecimal("9"),new BigDecimal("12"),new BigDecimal("1.2"),"wh-1","ONT8","FBA ONT8","FBA-1","SHIP-1","MARK-1"); var item2=new FirstLegLoadingPlanCompletedV1.Item("d-2","SKU-2","产品2","Product2",3,30,2,new BigDecimal("8"),new BigDecimal("7"),new BigDecimal("9"),new BigDecimal("0.8"),"wh-2","LAX9","FBA LAX9","FBA-2","SHIP-2","MARK-2"); var p=new FirstLegLoadingPlanCompletedV1("plan-1","LP1","book-1","MSCU6639870","CAB1","ow-1","洛杉矶海外仓",List.of(new FirstLegLoadingPlanCompletedV1.Order("in-1","root-1","ord-1","FL1","root-o1","RK1","wh-1","ONT8","FBA ONT8",5,50,1,new BigDecimal("10"),new BigDecimal("9"),new BigDecimal("1.2"),List.of(item1),"100","Customer 100","FIRST_LEG",List.of()),new FirstLegLoadingPlanCompletedV1.Order("in-2","root-2","ord-2","FL2","root-o2","RK2","wh-2","LAX9","FBA LAX9",3,30,2,new BigDecimal("8"),new BigDecimal("7"),new BigDecimal("0.8"),List.of(item2),"100","Customer 100","FIRST_LEG",List.of()))); JsonNode node=json.valueToTree(p); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174000",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN","plan-1",2,1L,"123e4567-e89b-12d3-a456-426614174001","FIRSTLEG_LOADING_COMPLETED:plan-1:100:1",null,node,hash); }
+ @Test void projectsFiveDomesticLoadingPhotosOncePerPhysicalContainer(){
+  EventEnvelope source=event(); com.fasterxml.jackson.databind.node.ObjectNode node=(com.fasterxml.jackson.databind.node.ObjectNode)v2Payload(source);
+  var values=node.putArray("loadingEvidence"); int fileId=10;
+  for(String type:List.of("PHOTO_STEP_1","PHOTO_STEP_2","PHOTO_STEP_3","PHOTO_STEP_4","SEAL")) values.addObject().put("evidenceType",type).put("fileId",fileId++).put("fileName",type+".jpg");
+  String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node));
+  EventEnvelope event=new EventEnvelope(source.eventId(),source.eventType(),3,source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),3L,source.traceId(),source.correlationId(),source.causationId(),node,hash);
+  assertEquals(2,service.consume(event));
+  ArgumentCaptor<com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence> captured=ArgumentCaptor.forClass(com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence.class);
+  verify(loadingEvidence,times(5)).insert(captured.capture());
+  assertEquals(Set.of("PHOTO_STEP_1","PHOTO_STEP_2","PHOTO_STEP_3","PHOTO_STEP_4","SEAL"),captured.getAllValues().stream().map(com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence::getEvidenceType).collect(java.util.stream.Collectors.toSet()));
+  assertTrue(captured.getAllValues().stream().allMatch(value->"book-1".equals(value.getSourceContainerBookingId())));
+ }
+ @Test void rejectsV3EventWithoutTheFiveDomesticLoadingPhotos(){
+  EventEnvelope source=event(); JsonNode node=v2Payload(source);
+  String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node));
+  EventEnvelope event=new EventEnvelope(source.eventId(),source.eventType(),3,source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),3L,source.traceId(),source.correlationId(),source.causationId(),node,hash);
+  IllegalArgumentException error=assertThrows(IllegalArgumentException.class,()->service.consume(event));
+  assertTrue(error.getMessage().contains("五类国内装柜照片"));
+  verify(loadingEvidence,never()).insert(any(com.baiyue.lastleg.inboundplan.pda.entity.ContainerLoadingEvidence.class));
+ }
  private JsonNode v2Payload(EventEnvelope source){ com.fasterxml.jackson.databind.node.ObjectNode node=source.payload().deepCopy(); node.set("sourceContainerBookingId",node.remove("containerBookingId")); return node; }
  private EventEnvelope eventForPayload(FirstLegLoadingPlanCompletedV1 payload, long version){ JsonNode node=json.valueToTree(payload); for(JsonNode order:node.path("orders")) for(JsonNode pallet:order.path("pallets")) addManifest(pallet,order.path("packageCount").asInt()); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174099",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN",payload.loadingPlanId(),2,version,"123e4567-e89b-12d3-a456-426614174098","FIRSTLEG_LOADING_COMPLETED:"+payload.loadingPlanId()+":100:1",null,node,hash); }
  private void addManifest(JsonNode pallet,int packageCount){

lastleg-service/src/test/java/com/baiyue/lastleg/service/TaillegRealConsumerAcceptanceTest.java

@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 class TaillegRealConsumerAcceptanceTest {
     static final String CUSTOMER = "990022";
     static final String MARKER = "REAL-TAIL-20260822-R3";
-    static final String EVENT_KEY = "FIRSTLEG_LOADING_COMPLETED:990022022:990022:2";
+    static final String EVENT_KEY = "FIRSTLEG_LOADING_COMPLETED:990022022:990022:3";
     static final LocalDateTime RELABEL_DEADLINE = LocalDateTime.of(2026, 8, 29, 11, 1, 21, 628_000_000);
     static final LocalDateTime TRANSFER_ETA = LocalDateTime.of(2026, 9, 1, 11, 1, 21, 674_000_000);
     static final LocalDateTime RETURN_RELABEL_ETA = LocalDateTime.of(2026, 9, 1, 11, 1, 21, 756_000_000);
@@ -62,7 +62,7 @@ class TaillegRealConsumerAcceptanceTest {
         InboundPlanService.class, InventoryCommandService.class, RelabelApplicationService.class,
         WarehouseTransferService.class, LocalLooseboardService.class})
     @MapperScan({"com.baiyue.lastleg.mapper", "com.baiyue.lastleg.dropship.mapper",
-        "com.baiyue.lastleg.inboundplan.mapper", "com.baiyue.lastleg.inventory.mapper",
+        "com.baiyue.lastleg.inboundplan.mapper", "com.baiyue.lastleg.inboundplan.pda.mapper", "com.baiyue.lastleg.inventory.mapper",
         "com.baiyue.lastleg.inventory.command.mapper", "com.baiyue.lastleg.relabel.mapper",
         "com.baiyue.lastleg.transfer.mapper", "com.baiyue.lastleg.looseboard.mapper"})
     static class AcceptanceApplication {

lastleg-service/src/test/java/com/baiyue/lastleg/trucking/service/UsTruckOrderServiceTest.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.trucking.service;
 
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderRequests;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrder;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrderOperation;
@@ -18,6 +20,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +35,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 @ExtendWith(MockitoExtension.class)
 class UsTruckOrderServiceTest {
@@ -38,6 +43,7 @@ class UsTruckOrderServiceTest {
     @Mock UsTruckOrderPalletMapper pallets;
     @Mock UsTruckOrderStatusHistoryMapper histories;
     @Mock UsTruckOrderOperationMapper operations;
+    @Mock LastlegOrderNoGenerator orderNoGenerator;
     private final List<UsTruckOrderPallet> palletRows = new ArrayList<>();
     private final List<UsTruckOrderStatusHistory> historyRows = new ArrayList<>();
     private final Map<String, UsTruckOrderOperation> operationRows = new HashMap<>();
@@ -52,20 +58,21 @@ class UsTruckOrderServiceTest {
         ReflectionTestUtils.setField(service, "histories", histories);
         ReflectionTestUtils.setField(service, "operations", operations);
         ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper().findAndRegisterModules());
+        ReflectionTestUtils.setField(service, "orderNoGenerator", orderNoGenerator);
         order = order(UsTruckOrderService.PENDING_REVIEW, 0L, 2);
-        when(orders.lockNo("100", "TK1")).thenAnswer(call -> order);
+        lenient().when(orders.lockNo("100", "TK1")).thenAnswer(call -> order);
         when(orders.findNo("100", "TK1")).thenAnswer(call -> order);
-        when(pallets.listOrder("100", 1L)).thenAnswer(call -> palletRows);
-        when(histories.listOrder("100", 1L)).thenAnswer(call -> historyRows);
+        when(pallets.listOrder(anyString(), anyLong())).thenAnswer(call -> palletRows);
+        lenient().when(histories.listOrder("100", 1L)).thenAnswer(call -> historyRows);
         when(histories.insert(any(UsTruckOrderStatusHistory.class))).thenAnswer(call -> {
             historyRows.add(call.getArgument(0)); return 1;
         });
-        when(pallets.insert(any(UsTruckOrderPallet.class))).thenAnswer(call -> {
+        lenient().when(pallets.insert(any(UsTruckOrderPallet.class))).thenAnswer(call -> {
             UsTruckOrderPallet row = call.getArgument(0); palletRows.add(row); return 1;
         });
-        when(operations.findKey(anyString(), anyLong(), anyString()))
+        lenient().when(operations.findKey(anyString(), anyLong(), anyString()))
             .thenAnswer(call -> operationRows.get(call.getArgument(2)));
-        when(operations.insert(any(UsTruckOrderOperation.class))).thenAnswer(call -> {
+        lenient().when(operations.insert(any(UsTruckOrderOperation.class))).thenAnswer(call -> {
             UsTruckOrderOperation row = call.getArgument(0); operationRows.put(row.getIdempotencyKey(), row); return 1;
         });
         UsTruckOrderStatusHistory created = new UsTruckOrderStatusHistory();
@@ -73,6 +80,21 @@ class UsTruckOrderServiceTest {
         created.setToStatus(UsTruckOrderService.PENDING_REVIEW); historyRows.add(created);
     }
 
+    @Test
+    void createDefaultsTheContainerTypeAndRejectsRemovedTypes() {
+        when(orderNoGenerator.next(anyString(), anyString(), anyLong())).thenReturn("TK1");
+        when(histories.listOrder(anyString(), anyLong())).thenReturn(historyRows);
+        when(orders.insert(any(UsTruckOrder.class))).thenAnswer(call -> {
+            order = call.getArgument(0);
+            return 1;
+        });
+
+        var detail = service.create("100", "operator", create(null, "default-type"));
+
+        assertEquals("40HQ", detail.summary().containerType());
+        assertThrows(BizException.class, () -> service.create("100", "operator", create("40HC", "retired-type")));
+    }
+
     @Test
     void completeLifecycleUsesFactsIdempotencyOperatorsAndCannotReverseTerminal() {
         var review = new UsTruckOrderRequests.Review(0L, "APPROVE", "review-1", "approve");
@@ -165,6 +187,12 @@ class UsTruckOrderServiceTest {
         return new UsTruckOrderRequests.Command(version, key, key);
     }
 
+    private UsTruckOrderRequests.Create create(String containerType, String key) {
+        return new UsTruckOrderRequests.Create("PORT_PICKUP", "Los Angeles", null, "Ontario", null,
+            containerType, 1, 0, BigDecimal.ZERO, BigDecimal.ZERO, null, "USD", "Alice",
+            "+1-555-0100", LocalDate.now().plusDays(1), null, key);
+    }
+
     private UsTruckOrder order(String status, long version, int pallets) {
         UsTruckOrder value = new UsTruckOrder();
         value.setId(1L); value.setCustomerId("100"); value.setOrderNo("TK1");