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