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

# Conflicts:
#	deploy/sql/海外区域统一增量-MySQL8.sql
#	lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
#	lastleg-service/src/main/resources/db/lastleg.sql
#	lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
#	lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
#	scripts/README.md

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

@@ -10,7 +10,7 @@ import com.baiyue.lastleg.dto.LastlegOrderSummary;
 import com.baiyue.lastleg.dto.LastlegOrderCommandDtos;
 import com.baiyue.lastleg.dto.ContainerPlanProgressDetail;
 import com.baiyue.lastleg.dto.ContainerPlanProgressSummary;
-import com.baiyue.lastleg.entity.LastlegOrderFee;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
 import com.baiyue.lastleg.security.InternalServiceTokenGuard;
 import com.baiyue.lastleg.security.OverseasPermissions;
 import com.baiyue.lastleg.service.LastlegOrderService;
@@ -132,12 +132,14 @@ public class LastlegOrderController {
     @PostMapping("/api/platform/v1/last-leg/orders/{id}/fees")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.LAST_MILE_ORDER_EDIT + "')")
     @Operation(summary = "Add a fee to one tail-leg order", description = "Required authority: " + OverseasPermissions.LAST_MILE_ORDER_EDIT)
-    public ApiResponse<LastlegOrderFee> createFee(
+    public ApiResponse<OverseasFeeSource> createFee(
         @AuthenticationPrincipal AuthenticatedUser user,
         @RequestParam(required = false) String customerId,
         @PathVariable long id,
+        @RequestHeader("Idempotency-Key") String idempotencyKey,
         @Valid @RequestBody LastlegOrderRequests.CreateFee request) {
-        return ApiResponse.success(orderService.createFee(platformScope(user, customerId), id, request, operatorName(user)));
+        return ApiResponse.success(orderService.createFee(platformScope(user, customerId), id, request,
+            operatorName(user), idempotencyKey));
     }
 
     @PutMapping("/api/platform/v1/last-leg/orders/{id}/hold")

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

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Collections;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 public final class DeliveryRequests {
     private DeliveryRequests() {}
@@ -45,8 +46,23 @@ public final class DeliveryRequests {
                                         @NotNull @Size(min = 1, max = 500) List<@NotBlank @Size(max = 128) String> cartonMarks) {}
 
     public record FeeItem(@NotBlank @Size(max = 64) String feeType,
-                          @NotBlank @Size(max = 8) String currency,
-                          @NotNull @Min(0) BigDecimal amount,
+                          @NotBlank @Size(max = 128) String feeName,
+                          @NotBlank @jakarta.validation.constraints.Pattern(regexp = "RECEIVABLE|PAYABLE") String direction,
+                          @NotBlank @jakarta.validation.constraints.Pattern(regexp = "CNY|USD") String currency,
+                          @NotNull @jakarta.validation.constraints.DecimalMin(value = "0.00", inclusive = false) BigDecimal amount,
+                          @Min(1) Long supplierId,
+                          @Size(max = 200) String supplierName,
+                          @Size(max = 32) String supplierCategory,
+                          @jakarta.validation.constraints.Pattern(regexp = "ON_ACCOUNT|DIRECT_PAID") String settlementMode,
+                          LocalDateTime paidAt,
+                          @jakarta.validation.constraints.Pattern(regexp = "ONLINE|BANK_TRANSFER|CASH|OTHER") String paymentMethod,
+                          @Size(max = 128) String paymentReferenceNo,
+                          @Size(max = 20) List<@NotBlank String> paymentVoucherFileIds,
+                          @jakarta.validation.constraints.DecimalMin(value = "0.00", inclusive = false) BigDecimal chargeableQuantity,
+                          @Size(max = 32) String quantityUnit,
+                          @jakarta.validation.constraints.DecimalMin(value = "0.00", inclusive = false) BigDecimal unitPrice,
+                          LocalDate periodStart,
+                          LocalDate periodEnd,
                           @Size(max = 500) String remark) {}
 
     public record Query(@Min(1) long page, @Min(1) @Max(200) long size,

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

@@ -1,24 +0,0 @@
-package com.baiyue.lastleg.delivery.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ll_delivery_fee")
-public class DeliveryFee {
-    @TableId(type = IdType.ASSIGN_ID) private Long id;
-    private String customerId;
-    private Long deliveryOrderId;
-    private String feeDirection;
-    private String feeType;
-    private String currency;
-    private BigDecimal amount;
-    private String remark;
-    private String createdBy;
-    private LocalDateTime createdAt;
-}

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

@@ -1,16 +0,0 @@
-package com.baiyue.lastleg.delivery.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baiyue.lastleg.delivery.entity.DeliveryFee;
-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 DeliveryFeeMapper extends BaseMapper<DeliveryFee> {
-    @Select("SELECT * FROM ll_delivery_fee WHERE customer_id=#{customerId} AND delivery_order_id=#{deliveryOrderId} ORDER BY id")
-    List<DeliveryFee> findByDelivery(@Param("customerId") String customerId,
-                                     @Param("deliveryOrderId") Long deliveryOrderId);
-}

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

@@ -7,13 +7,14 @@ import com.baiyue.common.core.api.PageResult;
 import com.baiyue.lastleg.delivery.dto.DeliveryRequests;
 import com.baiyue.lastleg.delivery.dto.DeliveryResponses;
 import com.baiyue.lastleg.delivery.entity.DeliveryOrder;
-import com.baiyue.lastleg.delivery.entity.DeliveryFee;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
+import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.lastleg.delivery.entity.DeliveryOperation;
 import com.baiyue.lastleg.delivery.entity.OutboundOrder;
 import com.baiyue.lastleg.delivery.entity.OutboundPalletItem;
 import com.baiyue.lastleg.delivery.mapper.DeliveryOrderMapper;
 import com.baiyue.lastleg.delivery.model.DeliveryStatusPolicy;
-import com.baiyue.lastleg.delivery.mapper.DeliveryFeeMapper;
 import com.baiyue.lastleg.delivery.mapper.DeliveryOperationMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundOrderMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPalletItemMapper;
@@ -65,6 +66,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
 import java.math.BigDecimal;
@@ -77,7 +79,7 @@ public class DeliveryTransferService {
     @Resource private OutboundOrderMapper outboundOrders;
     @Resource private OutboundPalletItemMapper outboundPallets;
     @Resource private DeliveryOrderMapper deliveryOrders;
-    @Resource private DeliveryFeeMapper deliveryFees;
+    @Resource private OverseasFeeSourceService feeSources;
     @Resource private DeliveryOperationMapper deliveryOperations;
     @Resource private OutboundPdaTaskMapper pdaTasks;
     @Resource private OutboundPdaPickMapper pdaPicks;
@@ -207,9 +209,18 @@ public class DeliveryTransferService {
         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) {
-            DeliveryFee fee = new DeliveryFee(); fee.setCustomerId(customerId); fee.setDeliveryOrderId(delivery.getId());
-            fee.setFeeDirection("PAYABLE"); fee.setFeeType(input.feeType().trim()); fee.setCurrency(input.currency().trim().toUpperCase(Locale.ROOT));
-            fee.setAmount(input.amount()); fee.setRemark(trim(input.remark())); fee.setCreatedBy(operatorId); fee.setCreatedAt(now); deliveryFees.insert(fee);
+            feeSources.publishApproved(operatorId, childKey(request.idempotencyKey(), input.feeType()),
+                new OverseasFeeSourceDtos.SaveRequest(customerId, delivery.getCustomerName(),
+                    "OVERSEAS_DELIVERY_FEE", "DELIVERY_ORDER", delivery.getId(), delivery.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()),
+                    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);
@@ -225,8 +236,9 @@ public class DeliveryTransferService {
             String feeType = input.feeType().trim().toUpperCase(Locale.ROOT);
             if (!allowed.contains(feeType)) throw conflict("Unsupported delivery fee type: " + feeType);
             if (!seen.add(feeType)) throw conflict("Duplicate delivery fee type: " + feeType);
-            if (!"USD".equalsIgnoreCase(input.currency().trim())) throw conflict("Delivery fees must use USD");
-            if (input.amount().signum() < 0) throw conflict("Delivery fee amount cannot be negative");
+            if (!Set.of("CNY", "USD").contains(input.currency().trim().toUpperCase(Locale.ROOT)))
+                throw conflict("Delivery fees only support CNY or USD");
+            if (input.amount().signum() <= 0) throw conflict("Delivery fee amount must be greater than zero");
         }
         if (!seen.contains("DELIVERY_FEE")) throw conflict("Delivery fee is required");
         if (Set.of("FLOOR", "MIXED").contains(request.loadingType().trim().toUpperCase(Locale.ROOT))
@@ -719,7 +731,7 @@ public class DeliveryTransferService {
             new LambdaQueryWrapper<LastlegOrderDetail>().eq(LastlegOrderDetail::getCustomerId, customerId).in(LastlegOrderDetail::getOrderId, orderIds));
         List<DeliveryResponses.DeliverySku> skus = details.stream().map(detail -> sku(detail, ordersById.get(detail.getOrderId()))).toList();
         return new DeliveryResponses.DeliveryDetail(deliveryRow(delivery), skus,
-            deliveryFees.findByDelivery(customerId, delivery.getId()).stream().map(this::feeRow).toList(),
+            feeSources.listForBusiness(customerId, "DELIVERY_ORDER", delivery.getId()).stream().map(this::feeRow).toList(),
             deliveryOperations.findByDelivery(customerId, delivery.getId()).stream().map(this::operationRow).toList());
     }
 
@@ -776,7 +788,7 @@ public class DeliveryTransferService {
     }
     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.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(DeliveryFee f) { return new DeliveryResponses.DeliveryFeeRow(f.getId(), f.getFeeDirection(), f.getFeeType(), f.getCurrency(), f.getAmount(), f.getRemark()); }
+    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); }
@@ -792,6 +804,15 @@ public class DeliveryTransferService {
     }
     private BigDecimal totalWeight(String customerId, List<DispatchItem> items) { List<Long> ids = items.stream().map(DispatchItem::getOrderId).filter(Objects::nonNull).distinct().toList(); if (ids.isEmpty()) return BigDecimal.ZERO; return tailOrderDetails.selectList(new LambdaQueryWrapper<LastlegOrderDetail>().eq(LastlegOrderDetail::getCustomerId, customerId).in(LastlegOrderDetail::getOrderId, ids)).stream().map(LastlegOrderDetail::getGrossWeightKg).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); }
     private static String trim(String value) { return StringUtils.hasText(value) ? value.trim() : null; }
+    private static Long parseLong(String value) {
+        try { return StringUtils.hasText(value) ? Long.parseLong(value.trim()) : null; }
+        catch (NumberFormatException ignored) { return null; }
+    }
+    private static String childKey(String key, String suffix) {
+        String prefix = key == null ? "" : key.trim();
+        int maxPrefix = Math.max(0, 128 - suffix.length() - 1);
+        return prefix.substring(0, Math.min(prefix.length(), maxPrefix)) + ':' + suffix;
+    }
     private static String required(String value, String message) {
         String normalized = trim(value);
         if (normalized == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, message);

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

@@ -1,7 +1,7 @@
 package com.baiyue.lastleg.dto;
 
 import com.baiyue.lastleg.entity.LastlegOrderDetail;
-import com.baiyue.lastleg.entity.LastlegOrderFee;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
 
 import java.time.LocalDateTime;
 
@@ -12,7 +12,7 @@ public record LastlegOrderDetailResponse(
     List<LastlegOrderCommandDtos.ManualNodeView> manualNodes,
     List<LastlegOrderDetail> cargo,
     List<History> statusHistory,
-    List<LastlegOrderFee> fees,
+    List<OverseasFeeSource> fees,
     List<Operation> operationHistory
 ) {
     public record History(Long id, String fromStatus, String toStatus, String remark, LocalDateTime createdAt) {}

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

@@ -11,6 +11,7 @@ import jakarta.validation.constraints.NotNull;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.List;
 
 public final class LastlegOrderRequests {
@@ -81,11 +82,25 @@ public final class LastlegOrderRequests {
     }
 
     public record CreateFee(
-        @NotBlank @Size(max = 128) String feeItem,
-        @NotBlank @Pattern(regexp = "[A-Z]{3}") String currency,
+        @NotBlank @Size(max = 64) String feeItemCode,
+        @NotBlank @Size(max = 200) String feeItemName,
+        @NotBlank @Pattern(regexp = "RECEIVABLE|PAYABLE") String direction,
+        @NotBlank @Pattern(regexp = "CNY|USD") String currency,
         @NotNull @DecimalMin(value = "0.01") BigDecimal amount,
-        @NotBlank @Pattern(regexp = "PENDING_REVIEW|APPROVED|REJECTED") String status,
-        @Size(max = 500) String supplierDescription
+        @NotNull LocalDate businessDate,
+        @Min(1) Long supplierId,
+        @Size(max = 200) String supplierName,
+        @Size(max = 32) String supplierCategory,
+        @Pattern(regexp = "ON_ACCOUNT|DIRECT_PAID") String settlementMode,
+        LocalDateTime paidAt,
+        @Pattern(regexp = "ONLINE|BANK_TRANSFER|CASH|OTHER") String paymentMethod,
+        @Size(max = 128) String paymentReferenceNo,
+        @Size(max = 20) List<@NotBlank String> paymentVoucherFileIds,
+        @DecimalMin(value = "0.00", inclusive = false) BigDecimal chargeableQuantity,
+        @Size(max = 32) String quantityUnit,
+        @DecimalMin(value = "0.00", inclusive = false) BigDecimal unitPrice,
+        LocalDate periodStart,
+        LocalDate periodEnd
     ) {
     }
 

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

@@ -1,25 +0,0 @@
-package com.baiyue.lastleg.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ll_order_fee")
-public class LastlegOrderFee {
-    @TableId(type = IdType.INPUT) private Long id;
-    private String customerId;
-    private Long orderId;
-    private String feeItem;
-    private String currency;
-    private BigDecimal amount;
-    private String status;
-    private String supplierDescription;
-    private String createdBy;
-    private LocalDateTime createdAt;
-    private LocalDateTime updatedAt;
-}

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/dto/OverseasFeeSourceDtos.java

@@ -20,8 +20,8 @@ public final class OverseasFeeSourceDtos {
     public record SaveRequest(
         @NotBlank @Size(max = 128) String customerId,
         @Size(max = 200) String customerName,
-        @NotBlank @Pattern(regexp = "OVERSEAS_INBOUND_FEE|OVERSEAS_PROCUREMENT_FEE|OVERSEAS_TRUCK_FEE|OVERSEAS_LOOSEBOARD_FEE|OVERSEAS_WAREHOUSE_FEE|OVERSEAS_CONTAINER_FEE") String sourceType,
-        @NotBlank @Pattern(regexp = "OVERSEAS_INBOUND|OVERSEAS_PROCUREMENT|US_TRUCK|LOCAL_LOOSEBOARD|WAREHOUSE_SERVICE|OVERSEAS_CONTAINER") String businessType,
+        @NotBlank @Pattern(regexp = "OVERSEAS_INBOUND_FEE|OVERSEAS_PROCUREMENT_FEE|OVERSEAS_TRUCK_FEE|OVERSEAS_LOOSEBOARD_FEE|OVERSEAS_WAREHOUSE_FEE|OVERSEAS_CONTAINER_FEE|OVERSEAS_ORDER_FEE|OVERSEAS_DELIVERY_FEE|OVERSEAS_RELABEL_FEE") String sourceType,
+        @NotBlank @Pattern(regexp = "OVERSEAS_INBOUND|OVERSEAS_PROCUREMENT|PROCUREMENT_FEE|US_TRUCK|LOCAL_LOOSEBOARD|WAREHOUSE_SERVICE|OVERSEAS_CONTAINER|LASTLEG_ORDER|DELIVERY_ORDER|RELABEL_ORDER") String businessType,
         @Min(1) Long businessId,
         @NotBlank @Size(max = 128) String businessNo,
         @Min(1) Long orderId,
@@ -43,8 +43,13 @@ public final class OverseasFeeSourceDtos {
         @Size(max = 128) String paymentReferenceNo,
         @Size(max = 20) List<@NotBlank String> paymentVoucherFileIds,
         @NotNull LocalDate businessDate,
-        @NotBlank @Pattern(regexp = "CNY") String currency,
-        @NotNull @DecimalMin(value = "0.00", inclusive = false) BigDecimal amount
+        @NotBlank @Pattern(regexp = "CNY|USD") String currency,
+        @NotNull @DecimalMin(value = "0.00", inclusive = false) BigDecimal amount,
+        @DecimalMin(value = "0.00", inclusive = false) BigDecimal chargeableQuantity,
+        @Size(max = 32) String quantityUnit,
+        @DecimalMin(value = "0.00", inclusive = false) BigDecimal unitPrice,
+        LocalDate periodStart,
+        LocalDate periodEnd
     ) { }
 
     public record ActionRequest(@NotBlank @Size(max = 128) String idempotencyKey) { }

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/entity/OverseasFeeSource.java

@@ -46,6 +46,15 @@ public class OverseasFeeSource {
     private LocalDate businessDate;
     private String currency;
     private BigDecimal amount;
+    private String originalCurrency;
+    private BigDecimal originalAmount;
+    private BigDecimal exchangeRate;
+    private String exchangeRateMonth;
+    private BigDecimal chargeableQuantity;
+    private String quantityUnit;
+    private BigDecimal unitPrice;
+    private LocalDate periodStart;
+    private LocalDate periodEnd;
     private String reviewStatus;
     private String publicationStatus;
     private String sourceStatus;

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/service/OverseasFeeBusinessGuard.java

@@ -2,7 +2,11 @@ package com.baiyue.lastleg.financefee.service;
 
 import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos.SaveRequest;
 import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos.ContainerCustomerOption;
+import com.baiyue.lastleg.client.DomesticWarehouseDirectoryClient;
+import feign.FeignException;
+import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -14,6 +18,8 @@ import java.util.List;
 @RequiredArgsConstructor
 public class OverseasFeeBusinessGuard {
     private final JdbcTemplate jdbc;
+    @Resource private DomesticWarehouseDirectoryClient warehouses;
+    @Value("${baiyue.security.internal-service-token}") private String internalToken;
 
     public List<ContainerCustomerOption> listContainerCustomers(long containerBookingId) {
         List<ContainerCustomerOption> customers = jdbc.query(
@@ -37,13 +43,18 @@ public class OverseasFeeBusinessGuard {
                 throw bad("业务记录ID不能为空");
             if (fee.warehouseId() == null)
                 throw bad("海外仓服务费必须关联海外仓；入仓记录和入仓码按实际业务选填");
+            requireActiveOverseasWarehouse(fee.warehouseId());
             return;
         }
         Table table = switch (fee.businessType()) {
             case "OVERSEAS_INBOUND" -> new Table("ll_inbound_plan", "plan_no");
             case "OVERSEAS_PROCUREMENT" -> new Table("ll_overseas_procurement_order", "order_no");
+            case "PROCUREMENT_FEE" -> new Table("ll_overseas_procurement_fee", "fee_no");
             case "US_TRUCK" -> new Table("ll_us_truck_order", "order_no");
             case "LOCAL_LOOSEBOARD" -> new Table("ll_local_looseboard_order", "order_no");
+            case "LASTLEG_ORDER" -> new Table("ll_order", "order_no");
+            case "DELIVERY_ORDER" -> new Table("ll_delivery_order", "delivery_no");
+            case "RELABEL_ORDER" -> new Table("ll_relabel_application", "relabel_no");
             default -> throw bad("业务类型与业务记录ID不匹配");
         };
         Integer count = jdbc.queryForObject("SELECT COUNT(*) FROM " + table.name
@@ -83,6 +94,21 @@ public class OverseasFeeBusinessGuard {
         if (owned == null || owned < 1) throw bad("该客户不属于费用关联的真实货柜");
     }
 
+    private void requireActiveOverseasWarehouse(long warehouseId) {
+        try {
+            var response = warehouses.activeWarehouse(warehouseId, internalToken);
+            var warehouse = response == null || response.data() == null ? null : response.data().warehouse();
+            if (warehouse == null || !response.successful() || !Long.valueOf(warehouseId).equals(warehouse.id())
+                || !Long.valueOf(0L).equals(warehouse.tenantId()) || !"ACTIVE".equals(warehouse.status())
+                || !List.of("OVERSEAS", "OVERSEAS_PARTNER").contains(warehouse.warehouseType())) {
+                throw bad("海外仓不存在、已停用或类型不正确");
+            }
+        } catch (FeignException exception) {
+            if (exception.status() >= 400 && exception.status() < 500) throw bad("海外仓不存在、已停用或类型不正确");
+            throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, "仓库主数据暂不可用", exception);
+        }
+    }
+
     private static boolean blank(String value) { return value == null || value.isBlank(); }
     private static ResponseStatusException bad(String message) {
         return new ResponseStatusException(HttpStatus.BAD_REQUEST, message);

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/service/OverseasFeeCurrencyConverter.java

@@ -0,0 +1,47 @@
+package com.baiyue.lastleg.financefee.service;
+
+import com.baiyue.lastleg.masterdata.exchange.entity.MonthlyExchangeRate;
+import com.baiyue.lastleg.masterdata.exchange.mapper.MonthlyExchangeRateMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+@Component
+@RequiredArgsConstructor
+public class OverseasFeeCurrencyConverter {
+    private static final DateTimeFormatter MONTH = DateTimeFormatter.ofPattern("yyyy-MM");
+    private final MonthlyExchangeRateMapper rates;
+
+    public Conversion convert(String currency, BigDecimal amount, LocalDate businessDate) {
+        String originalCurrency = currency == null ? null : currency.trim().toUpperCase();
+        BigDecimal originalAmount = amount == null ? null : amount.setScale(2, RoundingMode.HALF_UP);
+        if ("CNY".equals(originalCurrency)) {
+            return new Conversion(originalCurrency, originalAmount, BigDecimal.ONE.setScale(6),
+                businessDate.format(MONTH), originalAmount);
+        }
+        if (!"USD".equals(originalCurrency)) throw bad("海外费用原币只支持CNY或USD");
+        String month = businessDate.format(MONTH);
+        MonthlyExchangeRate rate = rates.findMonth(month);
+        if (rate == null || !"ACTIVE".equals(rate.getStatus()) || rate.getUsdToCnyAverage() == null
+            || rate.getUsdToCnyAverage().signum() <= 0) {
+            throw bad("业务月份缺少有效USD兑CNY汇率，不能发布财务费用");
+        }
+        BigDecimal exchangeRate = rate.getUsdToCnyAverage().setScale(6, RoundingMode.HALF_UP);
+        return new Conversion(originalCurrency, originalAmount, exchangeRate, month,
+            originalAmount.multiply(exchangeRate).setScale(2, RoundingMode.HALF_UP));
+    }
+
+    private static ResponseStatusException bad(String message) {
+        return new ResponseStatusException(HttpStatus.BAD_REQUEST, message);
+    }
+
+    public record Conversion(String originalCurrency, BigDecimal originalAmount,
+                             BigDecimal exchangeRate, String exchangeRateMonth,
+                             BigDecimal settlementAmount) { }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/service/OverseasFeeOutboxService.java

@@ -66,7 +66,10 @@ public class OverseasFeeOutboxService {
             text(value.getSupplierId()), value.getSupplierName(), value.getSupplierCategory(),
             value.getSettlementMode(), instant(value.getPaidAt()), value.getPaymentMethod(),
             value.getPaymentReferenceNo(), value.getPaymentVoucherFileIds() == null ? List.of() : value.getPaymentVoucherFileIds(),
-            value.getBusinessDate(), value.getCurrency(), value.getAmount(), value.getReviewStatus(),
+            value.getBusinessDate(), value.getCurrency(), value.getAmount(),
+            value.getOriginalCurrency(), value.getOriginalAmount(), value.getExchangeRate(), value.getExchangeRateMonth(),
+            value.getChargeableQuantity(), value.getQuantityUnit(), value.getUnitPrice(), value.getPeriodStart(), value.getPeriodEnd(),
+            value.getReviewStatus(),
             "PUBLISHED", action == null && hash == null ? "ACTIVE" : value.getSourceStatus(), hash);
     }
 

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/service/OverseasFeeSourceService.java

@@ -19,7 +19,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -40,6 +39,7 @@ public class OverseasFeeSourceService {
     private final OverseasFeeCommandMapper commands;
     private final OverseasFeeBusinessGuard businessGuard;
     private final OverseasFeeOutboxService outbox;
+    private final OverseasFeeCurrencyConverter currencyConverter;
     private final ObjectMapper objectMapper;
 
     public List<OverseasFeeSource> list(String customerId, String businessType, String businessNo,
@@ -53,6 +53,15 @@ public class OverseasFeeSourceService {
             .orderByDesc(OverseasFeeSource::getCreatedAt).orderByDesc(OverseasFeeSource::getId));
     }
 
+    public List<OverseasFeeSource> listForBusiness(String customerId, String businessType, long businessId) {
+        return mapper.selectList(new LambdaQueryWrapper<OverseasFeeSource>()
+            .eq(OverseasFeeSource::getCustomerId, customerId)
+            .eq(OverseasFeeSource::getBusinessType, businessType)
+            .eq(OverseasFeeSource::getBusinessId, businessId)
+            .inSql(OverseasFeeSource::getId, "SELECT MAX(v.id) FROM ll_finance_fee_source v GROUP BY v.source_fee_id")
+            .orderByAsc(OverseasFeeSource::getCreatedAt).orderByAsc(OverseasFeeSource::getId));
+    }
+
     public List<ContainerCustomerOption> listContainerCustomers(long containerBookingId) {
         return businessGuard.listContainerCustomers(containerBookingId);
     }
@@ -70,6 +79,22 @@ public class OverseasFeeSourceService {
         return value;
     }
 
+    @Transactional
+    public OverseasFeeSource publishApproved(String operatorId, String key, SaveRequest request) {
+        OverseasFeeSource value = create(operatorId, key, request);
+        if ("DRAFT".equals(value.getReviewStatus()) || "REJECTED".equals(value.getReviewStatus())) {
+            value = submit(value.getSourceFeeId(), operatorId, childKey(key, "submit"));
+        }
+        if ("PENDING".equals(value.getReviewStatus())) {
+            value = review(value.getSourceFeeId(), operatorId,
+                new ReviewRequest("APPROVE", "业务完成自动确认费用", childKey(key, "approve")));
+        }
+        if (!"APPROVED".equals(value.getReviewStatus()) || !"PUBLISHED".equals(value.getPublicationStatus())) {
+            throw conflict("业务费用未能审核发布");
+        }
+        return value;
+    }
+
     @Transactional
     public OverseasFeeSource submit(long sourceFeeId, String operatorId, String key) {
         OverseasFeeCommand replay = replay(operatorId, "SUBMIT", key, sourceFeeId);
@@ -151,8 +176,14 @@ public class OverseasFeeSourceService {
         value.setDirection(request.direction()); value.setSupplierId(request.supplierId()); value.setSupplierName(text(request.supplierName()));
         value.setSupplierCategory(text(request.supplierCategory())); value.setSettlementMode(text(request.settlementMode()));
         value.setPaidAt(request.paidAt()); value.setPaymentMethod(text(request.paymentMethod())); value.setPaymentReferenceNo(text(request.paymentReferenceNo()));
-        value.setPaymentVoucherFileIds(request.paymentVoucherFileIds()); value.setBusinessDate(request.businessDate()); value.setCurrency(request.currency());
-        value.setAmount(request.amount().setScale(2, RoundingMode.HALF_UP)); value.setReviewStatus("DRAFT");
+        value.setPaymentVoucherFileIds(request.paymentVoucherFileIds()); value.setBusinessDate(request.businessDate());
+        OverseasFeeCurrencyConverter.Conversion conversion = currencyConverter.convert(request.currency(), request.amount(), request.businessDate());
+        value.setCurrency("CNY"); value.setAmount(conversion.settlementAmount());
+        value.setOriginalCurrency(conversion.originalCurrency()); value.setOriginalAmount(conversion.originalAmount());
+        value.setExchangeRate(conversion.exchangeRate()); value.setExchangeRateMonth(conversion.exchangeRateMonth());
+        value.setChargeableQuantity(request.chargeableQuantity()); value.setQuantityUnit(text(request.quantityUnit()));
+        value.setUnitPrice(request.unitPrice()); value.setPeriodStart(request.periodStart()); value.setPeriodEnd(request.periodEnd());
+        value.setReviewStatus("DRAFT");
         value.setPublicationStatus("UNPUBLISHED"); value.setSourceStatus("ACTIVE"); value.setCreatedBy(operatorId); value.setUpdatedBy(operatorId);
         value.setCreatedAt(now()); value.setUpdatedAt(now());
         return value;
@@ -162,16 +193,26 @@ public class OverseasFeeSourceService {
         String expected = switch (value.businessType()) {
             case "OVERSEAS_INBOUND" -> "OVERSEAS_INBOUND_FEE";
             case "OVERSEAS_PROCUREMENT" -> "OVERSEAS_PROCUREMENT_FEE";
+            case "PROCUREMENT_FEE" -> "OVERSEAS_PROCUREMENT_FEE";
             case "US_TRUCK" -> "OVERSEAS_TRUCK_FEE";
             case "LOCAL_LOOSEBOARD" -> "OVERSEAS_LOOSEBOARD_FEE";
             case "WAREHOUSE_SERVICE" -> "OVERSEAS_WAREHOUSE_FEE";
             case "OVERSEAS_CONTAINER" -> "OVERSEAS_CONTAINER_FEE";
+            case "LASTLEG_ORDER" -> "OVERSEAS_ORDER_FEE";
+            case "DELIVERY_ORDER" -> "OVERSEAS_DELIVERY_FEE";
+            case "RELABEL_ORDER" -> "OVERSEAS_RELABEL_FEE";
             default -> "";
         };
         if (!expected.equals(value.sourceType())) throw bad("来源类型与业务类型不匹配");
         if ("OVERSEAS_CONTAINER".equals(value.businessType())
             && !OVERSEAS_CONTAINER_FEE_ITEMS.contains(value.feeItemCode().trim()))
             throw bad("海外货柜费用项目不受支持");
+        if ((value.periodStart() == null) != (value.periodEnd() == null)
+            || value.periodStart() != null && value.periodStart().isAfter(value.periodEnd()))
+            throw bad("计费期间必须同时填写且开始日期不能晚于结束日期");
+        if ((value.chargeableQuantity() == null) != (text(value.quantityUnit()) == null)
+            || value.unitPrice() != null && value.chargeableQuantity() == null)
+            throw bad("计费数量、单位和单价信息不完整");
         boolean payable = "PAYABLE".equals(value.direction());
         boolean files = value.paymentVoucherFileIds() != null && !value.paymentVoucherFileIds().isEmpty();
         if (!payable) {
@@ -200,6 +241,12 @@ public class OverseasFeeSourceService {
         if (existing != null && !existing.getRequestHash().equals(hash(request))) throw conflict("幂等键已被不同请求使用");
         return existing;
     }
+
+    private static String childKey(String key, String suffix) {
+        String prefix = key == null ? "" : key.trim();
+        int maxPrefix = Math.max(0, 128 - suffix.length() - 1);
+        return prefix.substring(0, Math.min(prefix.length(), maxPrefix)) + ':' + suffix;
+    }
     private void command(String operator, String action, String key, Object request, long sourceFeeId, int version) {
         OverseasFeeCommand value = new OverseasFeeCommand(); value.setId(IdWorker.getId()); value.setOperatorId(operator);
         value.setAction(action); value.setIdempotencyKey(key.trim()); value.setRequestHash(hash(request)); value.setSourceFeeId(sourceFeeId);

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

@@ -134,6 +134,14 @@ public class ReceivingContainerController {
         return ApiResponse.success(service.receiveCarton(identity.operatorKey(), identity.operatorName(), request));
     }
 
+    @PostMapping("/current/receipts/pallet")
+    public ApiResponse<ReceivingContainerResponses.Receipt> receiveWholePallet(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody ReceivingContainerRequests.WholePalletReceive request) {
+        PdaWarehouseIdentity identity = currentIdentity(user);
+        return ApiResponse.success(service.receiveWholePallet(identity.operatorKey(), identity.operatorName(), request));
+    }
+
     @PostMapping("/current/complete")
     public ApiResponse<ReceivingContainerResponses.Session> complete(@AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody ReceivingContainerRequests.Action request) {

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

@@ -23,4 +23,6 @@ public final class ReceivingContainerRequests {
                               @Positive int packageCount, @NotBlank @Size(max = 255) String idempotencyKey) { }
     public record CartonReceive(@NotBlank String cartonMark, @NotBlank String palletCode,
                                 @NotBlank @Size(max = 255) String idempotencyKey) { }
+    public record WholePalletReceive(@NotBlank String sourcePalletNo,
+                                     @NotBlank @Size(max = 255) String idempotencyKey) { }
 }

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

@@ -56,7 +56,7 @@ public final class ReceivingContainerResponses {
                           String fbaWarehouseCode, int plannedPalletCount, int totalPackages,
                           int receivedPackages, int pendingPackages,
                           boolean assigned, boolean mergeAllowed, boolean urgent,
-                          String mergeHint) { }
+                          String mergeHint, String orderType, boolean wholePalletInbound) { }
 
     public record CartonResolved(String cartonMark, String inboundCode,
                                  String destinationType, String overseasWarehouseId,

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

@@ -13,7 +13,6 @@ public class ReceivingContainerOperation {
     @TableId(type = IdType.INPUT)
     private Long id;
     private Long sessionId;
-    private String customerId;
     private String operatorKey;
     private String action;
     private String idempotencyKey;

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

@@ -15,7 +15,6 @@ import java.time.LocalDateTime;
 public class ReceivingContainerSession {
     @TableId(type = IdType.INPUT)
     private Long id;
-    private String customerId;
     private String sourceContainerBookingId;
     private String containerFactHash;
     private String containerNo;

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

@@ -147,13 +147,20 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
             throw new ResponseStatusException(HttpStatus.CONFLICT,
                 "Reserved pallet customer binding is invalid");
         }
-        WarehousePalletData pallet = lookupPallet(palletCode).data();
-        if (pallet.id() != palletId || pallet.warehouseId() != warehouseId || pallet.locationId() != locationId
+        WarehousePalletReference pallet;
+        try {
+            pallet = reference(lookupPallet(palletCode).data());
+        } catch (ResponseStatusException exception) {
+            if (exception.getStatusCode().value() != 404) throw exception;
+            // 已生成计划可能保留早期展示码；确认过的资源绑定仍是唯一可信物理身份。
+            pallet = resolvePallet(palletId);
+        }
+        if (pallet.palletId() != palletId || pallet.warehouseId() != warehouseId || pallet.locationId() != locationId
             || !"OCCUPIED".equals(pallet.status())) {
             throw new ResponseStatusException(HttpStatus.CONFLICT,
                 "Scanned pallet does not match the reserved inbound plan resource");
         }
-        return reference(pallet);
+        return pallet;
     }
 
     @Override

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

@@ -58,7 +58,8 @@ public interface WarehouseResourceGateway {
                                       java.math.BigDecimal maxLoadKg, String status) { }
     record PalletBatchEnsure(long warehouseId, String batchKey, List<PalletBatchItemRequest> items) { }
     record PalletBatchItemRequest(long customerId, String businessKey, String inboundPlanNo,
-                                  int sequenceNo, String palletType, String fbaWarehouseCode) { }
+                                  int sequenceNo, String palletType, String fbaWarehouseCode,
+                                  String palletCode) { }
     record PalletBatchCommand(long warehouseId, String batchKey, String commandKey) { }
     record PalletBatchCompensation(long warehouseId, String batchKey, String commandKey, String reason) { }
     record PalletBatchResponse(long batchId, String batchKey, String status, int attemptNo,

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

@@ -546,33 +546,34 @@ public class InboundPdaWorkflowService {
     @Transactional
     public PdaResponses.Task complete(String customerId, String planNo) {
         InboundPlan plan = requirePlan(customerId, planNo);
-        return completeContainer(customerId, List.of(plan)).get(0);
+        return completeContainer(List.of(plan)).get(0);
     }
 
     /** Completes every plan of one physical container and emits exactly one container-level outbox event. */
     @Transactional
-    public List<PdaResponses.Task> completeContainer(String customerId, List<InboundPlan> containerPlans) {
+    public List<PdaResponses.Task> completeContainer(List<InboundPlan> containerPlans) {
         if (containerPlans == null || containerPlans.isEmpty()) throw conflict("Receiving container has no inbound plans");
         List<InboundPlan> orderedPlans = containerPlans.stream().sorted(Comparator.comparing(InboundPlan::getId)).toList();
         String containerNo = orderedPlans.get(0).getContainerNo();
         if (containerNo == null || containerNo.isBlank() || orderedPlans.stream().anyMatch(plan ->
-            !customerId.equals(plan.getCustomerId()) || !containerNo.equals(plan.getContainerNo()))) {
-            throw conflict("Inbound plans must belong to one customer and one physical container");
+            plan.getCustomerId() == null || plan.getCustomerId().isBlank() || !containerNo.equals(plan.getContainerNo()))) {
+            throw conflict("Inbound plans must have an owning customer and belong to one physical container");
         }
-        List<CompletionContext> contexts = orderedPlans.stream().map(plan -> completionContext(customerId, plan)).toList();
+        List<CompletionContext> contexts = orderedPlans.stream()
+            .map(plan -> completionContext(plan.getCustomerId(), plan)).toList();
         boolean anyCompleted = contexts.stream().anyMatch(context -> "COMPLETED".equals(context.task().getStatus()));
         boolean allCompleted = contexts.stream().allMatch(context -> "COMPLETED".equals(context.task().getStatus()));
         if (allCompleted) return contexts.stream().map(context -> task(context.task(), context.plan().getPlanNo())).toList();
         if (anyCompleted) throw conflict("Container plans are only partially completed; manual reconciliation is required");
 
         LocalDateTime now = LocalDateTime.now();
-        for (CompletionContext context : contexts) completePlan(customerId, context, now);
+        for (CompletionContext context : contexts) completePlan(context.plan().getCustomerId(), context, now);
         String sourceContainerBookingId = sourceContainerBookingId(contexts);
         LocalDateTime photoUploadedAt = contexts.stream().map(context -> context.task().getUnloadPhotoUploadedAt())
             .max(LocalDateTime::compareTo).orElseThrow();
         long aggregateVersion = contexts.stream().map(CompletionContext::task)
             .map(InboundPdaTask::getVersion).filter(Objects::nonNull).mapToLong(Integer::longValue).max().orElse(1L);
-        unloadCompletedOutbox.publishContainerCompleted(customerId, sourceContainerBookingId, containerNo,
+        unloadCompletedOutbox.publishContainerCompleted(sourceContainerBookingId, containerNo,
             now.toInstant(ZoneOffset.UTC), photoUploadedAt.toInstant(ZoneOffset.UTC), aggregateVersion);
         return contexts.stream().map(context -> task(context.task(), context.plan().getPlanNo())).toList();
     }

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

@@ -47,7 +47,7 @@ public class InboundUnloadCompletedOutboxService {
         if (task.getUnloadPhotoUploadedAt() == null) {
             throw new IllegalStateException("Inbound task has no unload photo upload time");
         }
-        publishContainerCompleted(task.getCustomerId(), sourceOrder.getSourceContainerBookingId(),
+        publishContainerCompleted(sourceOrder.getSourceContainerBookingId(),
             plan.getContainerNo(), task.getCompletedAt().toInstant(ZoneOffset.UTC),
             task.getUnloadPhotoUploadedAt().toInstant(ZoneOffset.UTC),
             Math.max(1, task.getVersion() == null ? 1 : task.getVersion()));
@@ -56,10 +56,9 @@ public class InboundUnloadCompletedOutboxService {
     /**
      * 柜级唯一发布入口。调用方只能在同一物理柜的全部计划完成后调用一次；重复调用保留首次冻结事实。
      */
-    public void publishContainerCompleted(String customerId, String sourceContainerBookingId,
-                                          String containerNo, Instant unloadingCompletedAt,
-                                          Instant unloadingPhotoUploadedAt, long aggregateVersion) {
-        requireText(customerId, "customerId");
+    public void publishContainerCompleted(String sourceContainerBookingId,
+                                           String containerNo, Instant unloadingCompletedAt,
+                                           Instant unloadingPhotoUploadedAt, long aggregateVersion) {
         requireText(sourceContainerBookingId, "sourceContainerBookingId");
         requireText(containerNo, "containerNo");
         Objects.requireNonNull(unloadingCompletedAt, "unloadingCompletedAt");
@@ -71,7 +70,7 @@ public class InboundUnloadCompletedOutboxService {
         String eventKey = EventTypes.OVERSEAS_CONTAINER_UNLOADED + ':' + sourceContainerBookingId;
         LastlegEventOutbox existing = mapper.findByEventKey(eventKey);
         if (existing != null) {
-            requireSameContainer(existing, customerId, sourceContainerBookingId, containerNo);
+            requireSameContainer(existing, sourceContainerBookingId, containerNo);
             return;
         }
         var payload = new OverseasContainerUnloadedV1(sourceContainerBookingId,
@@ -79,12 +78,12 @@ public class InboundUnloadCompletedOutboxService {
         JsonNode payloadNode = objectMapper.valueToTree(payload);
         String traceId = EventIdentifiers.newUuid();
         EventEnvelope envelope = new EventEnvelope(EventIdentifiers.newUuid(), EventTypes.OVERSEAS_CONTAINER_UNLOADED,
-            1, Instant.now(), RegionCode.OVERSEAS, RegionCode.CN, customerId, "CONTAINER_BOOKING",
+            1, Instant.now(), RegionCode.OVERSEAS, RegionCode.CN, "0", "CONTAINER_BOOKING",
             sourceContainerBookingId, Math.max(1, aggregateVersion), 1L, traceId, eventKey, null, payloadNode,
             EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(payloadNode))).requireValid();
 
         LastlegEventOutbox event = new LastlegEventOutbox();
-        event.setId(IdWorker.getId()); event.setCustomerId(customerId);
+        event.setId(IdWorker.getId()); event.setCustomerId("0");
         event.setAggregateType(envelope.aggregateType()); event.setAggregateId(envelope.aggregateId());
         event.setEventType(envelope.eventType()); event.setEventVersion(envelope.eventVersion());
         event.setEventKey(eventKey); event.setPayloadJson(json(envelope)); event.setStatus("PENDING");
@@ -94,17 +93,17 @@ public class InboundUnloadCompletedOutboxService {
         } catch (DuplicateKeyException exception) {
             LastlegEventOutbox raced = mapper.findByEventKey(eventKey);
             if (raced == null) throw exception;
-            requireSameContainer(raced, customerId, sourceContainerBookingId, containerNo);
+            requireSameContainer(raced, sourceContainerBookingId, containerNo);
         }
     }
 
-    private void requireSameContainer(LastlegEventOutbox existing, String customerId,
+    private void requireSameContainer(LastlegEventOutbox existing,
                                       String sourceContainerBookingId, String containerNo) {
         try {
             EventEnvelope envelope = objectMapper.readValue(existing.getPayloadJson(), EventEnvelope.class);
             OverseasContainerUnloadedV1 frozen = objectMapper.treeToValue(
                 envelope.payload(), OverseasContainerUnloadedV1.class);
-            if (!Objects.equals(existing.getCustomerId(), customerId)
+            if (!"0".equals(existing.getCustomerId())
                 || !Objects.equals(existing.getAggregateId(), sourceContainerBookingId)
                 || !Objects.equals(frozen.containerNo(), containerNo)) {
                 throw new IllegalStateException("Unload-completed event key conflicts with another container");

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

@@ -59,6 +59,7 @@ import java.util.stream.Collectors;
 
 @Service
 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 PALLET_MERGE_HINT =
@@ -125,10 +126,9 @@ public class ReceivingContainerService {
     }
 
     public ReceivingContainerResponses.Session detail(String operatorKey, long overseasWarehouseId, String containerNo) {
+        requireReadyContainer(containerNo, overseasWarehouseId, false);
         List<InboundPlan> containerPlans = requirePlans(containerNo);
-        String customerId = requireSingleCustomer(containerPlans, containerNo);
         if (!warehouseEligible(containerPlans, overseasWarehouseId)) throw conflict("当前柜已分配至其他海外接柜仓，无法在本仓操作");
-        requireReceivingAvailable(customerId, containerNo);
         ReceivingContainerSession current = sessions.findActiveByOperator(activeOperatorKey(operatorKey));
         requireSessionWarehouse(current, overseasWarehouseId);
         if (current != null && !containerNo.equals(current.getContainerNo())) {
@@ -141,7 +141,7 @@ public class ReceivingContainerService {
         WarehouseResourceGateway.WarehouseReference receivingWarehouse =
             warehouse.requireActiveSharedWarehouse(overseasWarehouseId);
         return snapshot(current != null && containerNo.equals(current.getContainerNo()) ? current : waitingView(
-            customerId, operatorKey, receivingWarehouse, containerNo), containerPlans);
+            operatorKey, receivingWarehouse, containerNo), containerPlans);
     }
 
     @Transactional
@@ -158,9 +158,7 @@ public class ReceivingContainerService {
             return result;
         }
         List<InboundPlan> containerPlans = requirePlans(containerNo);
-        String customerId = requireSingleCustomer(containerPlans, containerNo);
         if (!warehouseEligible(containerPlans, overseasWarehouseId)) throw conflict("当前柜已分配至其他海外接柜仓，无法在本仓操作");
-        requireReceivingAvailable(customerId, containerNo);
         String activeOperatorKey = activeOperatorKey(operatorKey);
         ReceivingContainerSession active = sessions.lockActiveByOperator(activeOperatorKey);
         requireSessionWarehouse(active, overseasWarehouseId);
@@ -179,7 +177,7 @@ public class ReceivingContainerService {
         }
         LocalDateTime now = LocalDateTime.now();
         ReceivingContainerSession session = new ReceivingContainerSession();
-        session.setId(IdWorker.getId()); session.setCustomerId(customerId); session.setContainerNo(containerNo);
+        session.setId(IdWorker.getId()); session.setContainerNo(containerNo);
         session.setSourceContainerBookingId(readiness.sourceContainerBookingId());
         session.setContainerFactHash(readiness.factHash());
         session.setOverseasWarehouseId(overseasWarehouseId);
@@ -197,9 +195,8 @@ public class ReceivingContainerService {
 
     public ReceivingContainerResponses.Photo uploadPhoto(String operatorKey, long operatorId, MultipartFile file) {
         ReceivingContainerSession session = requireCurrent(operatorKey, true);
-        String customerId = session.getCustomerId();
         if (!"WAIT_SIGN".equals(session.getStatus())) throw conflict("Unload photos can only be uploaded before signing");
-        UnloadPhotoFileGateway.UploadedFile uploaded = unloadPhotos.upload(customerId, session.getId(), operatorId, file);
+        UnloadPhotoFileGateway.UploadedFile uploaded = unloadPhotos.upload(PLATFORM_SCOPE, session.getId(), operatorId, file);
         return new ReceivingContainerResponses.Photo(Long.toString(uploaded.fileId()), uploaded.fileName(), uploaded.contentType(), uploaded.sizeBytes());
     }
 
@@ -209,24 +206,24 @@ public class ReceivingContainerService {
         ReceivingContainerOperation replay = replay(operatorKey, "SIGN", request.idempotencyKey(), request);
         if (replay != null) return read(replay, ReceivingContainerResponses.Session.class);
         ReceivingContainerSession session = requireCurrent(operatorKey, true);
-        String customerId = session.getCustomerId();
         if (!"WAIT_SIGN".equals(session.getStatus())) throw conflict("Container has already been signed");
         List<ReceivingContainerResponses.SignedPhoto> photos = validateSignPhotos(request);
         List<Long> photoFileIds = photos.stream().map(photo -> positiveFileId(photo.fileId())).toList();
-        photoFileIds.forEach(fileId -> unloadPhotos.validate(customerId, session.getId(), fileId));
+        photoFileIds.forEach(fileId -> unloadPhotos.validate(PLATFORM_SCOPE, session.getId(), fileId));
         LocalDateTime now = LocalDateTime.now();
         session.setSignPhotos(write(photos)); session.setStatus("SIGNED"); session.setSignedAt(now);
         session.setOperatorName(operatorName); session.setUpdatedAt(now); update(session);
-        for (InboundPlan plan : requirePlans(customerId, session.getContainerNo())) {
-            workflow.ensureSignedTask(customerId, plan, operatorKey, operatorName, photoFileIds, now);
+        List<InboundPlan> containerPlans = requirePlans(session.getContainerNo());
+        for (InboundPlan plan : containerPlans) {
+            workflow.ensureSignedTask(plan.getCustomerId(), plan, operatorKey, operatorName, photoFileIds, now);
         }
-        ReceivingContainerResponses.Session result = snapshot(session, requirePlans(customerId, session.getContainerNo()));
+        ReceivingContainerResponses.Session result = snapshot(session, containerPlans);
         save(session, "SIGN", request.idempotencyKey(), request, result); return result;
     }
 
     public ReceivingContainerResponses.Session current(String operatorKey) {
         ReceivingContainerSession session = requireCurrent(operatorKey, false);
-        return snapshot(session, requirePlans(session.getCustomerId(), session.getContainerNo()));
+        return snapshot(session, requirePlans(session.getContainerNo()));
     }
 
     public UnloadPhotoFileGateway.DownloadedFile downloadCurrentPhoto(String operatorKey, String fileId) {
@@ -236,7 +233,7 @@ public class ReceivingContainerService {
             throw new ResponseStatusException(HttpStatus.FORBIDDEN,
                 "Unload photo is not part of the current receiving session");
         }
-        return unloadPhotos.download(session.getCustomerId(), session.getId(), parsedFileId);
+        return unloadPhotos.download(PLATFORM_SCOPE, session.getId(), parsedFileId);
     }
 
     public void requireCurrentWarehouse(String operatorKey, long overseasWarehouseId) {
@@ -246,9 +243,8 @@ public class ReceivingContainerService {
     public ReceivingContainerResponses.CartonResolved resolveCarton(String operatorKey,
                                                                     ReceivingContainerRequests.CartonResolve request) {
         ReceivingContainerSession session = requireSigned(operatorKey);
-        String customerId = session.getCustomerId();
         String inboundCode = cartonInboundCode(request.cartonMark());
-        List<InboundRef> matches = refs(customerId, session.getContainerNo()).stream()
+        List<InboundRef> matches = refs(session.getContainerNo()).stream()
             .filter(value -> inboundCode.equals(value.line().getInboundCode())).toList();
         CartonRef carton;
         if (matches.size() > 1) {
@@ -256,9 +252,9 @@ public class ReceivingContainerService {
         } else if (matches.size() == 1 && "FBA".equals(destinationType(matches.get(0).line(), matches.get(0).order()))) {
             carton = new CartonRef(matches.get(0));
         } else if (matches.size() == 1) {
-            carton = requireCartonRef(customerId, session.getContainerNo(), request.cartonMark());
+            carton = requireCartonRef(matches.get(0).order().getCustomerId(), session.getContainerNo(), request.cartonMark());
         } else {
-            carton = requireUnmatchedFbaCartonPrefix(customerId, inboundCode);
+            carton = requireUnmatchedFbaCartonPrefix(inboundCode);
         }
         InboundRef ref = carton.ref();
         ReceivingContainerResponses.Inbound inbound = inbound(ref);
@@ -273,8 +269,7 @@ public class ReceivingContainerService {
     public ReceivingContainerResponses.PalletResolved resolvePallet(String operatorKey,
                                                                     ReceivingContainerRequests.PalletResolve request) {
         ReceivingContainerSession session = requireSigned(operatorKey);
-        String customerId = session.getCustomerId();
-        InboundRef ref = requireInbound(customerId, session.getContainerNo(), request.inboundCode());
+        InboundRef ref = requireInbound(session.getContainerNo(), request.inboundCode());
         PalletSelection selection = resolveReceivingPallet(ref, request.palletCode(), false);
         WarehouseResourceGateway.WarehousePalletReference pallet = selection.resource();
         return new ReceivingContainerResponses.PalletResolved(pallet.palletNo(), pallet.warehouseId(), pallet.status(),
@@ -287,12 +282,15 @@ public class ReceivingContainerService {
         ReceivingContainerOperation replay = replay(operatorKey, "BULK_RECEIVE", request.idempotencyKey(), request);
         if (replay != null) return read(replay, ReceivingContainerResponses.Receipt.class);
         ReceivingContainerSession session = requireSigned(operatorKey);
-        String customerId = session.getCustomerId();
-        InboundRef ref = requireInbound(customerId, session.getContainerNo(), request.inboundCode());
+        InboundRef ref = requireInbound(session.getContainerNo(), request.inboundCode());
+        String customerId = ref.order().getCustomerId();
+        if ("ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) {
+            throw conflict("One-click dropship inbound must be operated by complete source pallet");
+        }
         if (!"FBA".equals(destinationType(ref.line(), ref.order()))) {
             throw conflict("OVERSEAS destination must use carton-by-carton scanning; bulk count is forbidden");
         }
-        List<InboundRef> fbaPlanRefs = requireFbaPlanRefs(customerId, session.getContainerNo(), ref);
+        List<InboundRef> fbaPlanRefs = requireFbaPlanRefs(session.getContainerNo(), ref);
         List<FbaSkuAllocation> skuAllocations = allocateFbaSkuReceipts(customerId, fbaPlanRefs, request.packageCount());
         skuAllocations.forEach(allocation -> workflow.validateBulkResolved(customerId, allocation.ref().plan(),
             allocation.ref().line(), allocation.packages()));
@@ -328,12 +326,14 @@ public class ReceivingContainerService {
         ReceivingContainerOperation replay = replay(operatorKey, "CARTON_RECEIVE", request.idempotencyKey(), request);
         if (replay != null) return read(replay, ReceivingContainerResponses.Receipt.class);
         ReceivingContainerSession session = requireSigned(operatorKey);
-        String customerId = session.getCustomerId();
-        List<InboundRef> currentRefs = refs(customerId, session.getContainerNo());
+        List<InboundRef> currentRefs = refs(session.getContainerNo());
         if (currentRefs.stream().noneMatch(value ->
             "OVERSEAS".equals(destinationType(value.line(), value.order())))) {
             throw conflict("FBA destination must use bulk count");
         }
+        String inboundCode = cartonInboundCode(request.cartonMark());
+        InboundRef inboundRef = requireInbound(session.getContainerNo(), inboundCode);
+        String customerId = inboundRef.order().getCustomerId();
         CartonRef carton = requireCartonRef(customerId, session.getContainerNo(), request.cartonMark());
         InboundRef ref = carton.ref();
         if (!"OVERSEAS".equals(destinationType(ref.line(), ref.order()))) {
@@ -361,18 +361,58 @@ public class ReceivingContainerService {
         }
     }
 
+    @Transactional
+    public ReceivingContainerResponses.Receipt receiveWholePallet(String operatorKey, String operatorName,
+        ReceivingContainerRequests.WholePalletReceive request) {
+        ReceivingContainerOperation replay = replay(operatorKey, "PALLET_RECEIVE", request.idempotencyKey(), request);
+        if (replay != null) return read(replay, ReceivingContainerResponses.Receipt.class);
+        ReceivingContainerSession session = requireSigned(operatorKey);
+        List<DropshipPalletRef> matches = new ArrayList<>();
+        for (InboundRef ref : refs(session.getContainerNo())) {
+            if (!"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) continue;
+            String customerId = ref.order().getCustomerId();
+            List<InboundPlanPallet> sourcePallets = pallets.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
+                .eq(InboundPlanPallet::getCustomerId, customerId)
+                .eq(InboundPlanPallet::getPlanId, ref.plan().getId())
+                .eq(InboundPlanPallet::getSourcePalletNo, request.sourcePalletNo()));
+            for (InboundPlanPallet pallet : sourcePallets) {
+                List<InboundPlanPalletAllocation> palletAllocations = allocations.selectList(
+                    new LambdaQueryWrapper<InboundPlanPalletAllocation>()
+                        .eq(InboundPlanPalletAllocation::getCustomerId, customerId)
+                        .eq(InboundPlanPalletAllocation::getPlanId, ref.plan().getId())
+                        .eq(InboundPlanPalletAllocation::getLineId, ref.line().getId())
+                        .eq(InboundPlanPalletAllocation::getPalletId, pallet.getId()));
+                palletAllocations.forEach(allocation -> matches.add(new DropshipPalletRef(ref, pallet, allocation)));
+            }
+        }
+        if (matches.isEmpty()) throw notFound("Source pallet is not part of the current container");
+        if (matches.size() != 1) throw conflict("Source pallet is duplicated inside the current container");
+        DropshipPalletRef match = matches.get(0);
+        String customerId = match.ref().order().getCustomerId();
+        int accepted = value(match.allocation().getPlannedPackageCount());
+        workflow.pickWholePallet(customerId, match.ref().plan().getPlanNo(), match.allocation().getId(),
+            new PdaRequests.WholePalletOperation(request.idempotencyKey() + ":PICK", operatorKey, operatorName));
+        markReceiving(session);
+        ReceivingContainerResponses.Inbound inbound = inbound(match.ref());
+        ReceivingContainerResponses.Receipt result = new ReceivingContainerResponses.Receipt("RECEIVED",
+            session.getContainerNo(), inbound.inboundCode(), inbound.destinationType(), match.pallet().getPalletNo(),
+            accepted, inbound.receivedPackages(), inbound.pendingPackages(), session.getStatus(),
+            inbound.assigned(), inbound.mergeAllowed(), inbound.urgent(), inbound.mergeHint());
+        save(session, "PALLET_RECEIVE", request.idempotencyKey(), request, result);
+        return result;
+    }
+
     @Transactional(isolation = Isolation.READ_COMMITTED)
     public ReceivingContainerResponses.Session complete(String operatorKey,
                                                          ReceivingContainerRequests.Action request) {
         ReceivingContainerOperation replay = replay(operatorKey, "COMPLETE", request.idempotencyKey(), request);
         if (replay != null) return read(replay, ReceivingContainerResponses.Session.class);
         ReceivingContainerSession session = requireSigned(operatorKey);
-        String customerId = session.getCustomerId();
-        List<InboundPlan> containerPlans = requirePlans(customerId, session.getContainerNo());
+        List<InboundPlan> containerPlans = requirePlans(session.getContainerNo());
         Totals totals = totals(containerPlans);
         if (totals.total() != totals.received()) throw conflict("Every inbound code must be fully received before completing the container");
-        validateFbaSkuBalance(customerId, session.getContainerNo());
-        workflow.completeContainer(customerId, containerPlans);
+        validateFbaSkuBalance(session.getContainerNo());
+        workflow.completeContainer(containerPlans);
         LocalDateTime now = LocalDateTime.now();
         session.setStatus("COMPLETED"); session.setCompletedAt(now); session.setUpdatedAt(now);
         session.setActiveOperatorKey(null); session.setActiveContainerKey(null); update(session);
@@ -446,7 +486,6 @@ public class ReceivingContainerService {
         Set<String> warehouseNames = orderFacts.stream().map(LastlegOrder::getOverseasWarehouseName)
             .map(ReceivingContainerService::trim).filter(Objects::nonNull).collect(Collectors.toSet());
         boolean warehouseSnapshotConsistent = warehouseCodes.size() == 1 && warehouseNames.size() == 1;
-        Set<String> customers = orderFacts.stream().map(LastlegOrder::getCustomerId).collect(Collectors.toSet());
         String containerNo = orderFacts.stream().map(LastlegOrder::getContainerNo).filter(Objects::nonNull).findFirst().orElse(null);
         int totalOrders = orderFacts.size();
         int inboundCodes = (int) orderFacts.stream().map(LastlegOrder::getInboundCode).map(ReceivingContainerService::trim)
@@ -456,14 +495,13 @@ public class ReceivingContainerService {
             return values.size() == 1 && plansById.containsKey(values.get(0).getPlanId());
         }).count();
         int planCount = matchedPlans.size();
-        boolean allPlansReady = totalOrders > 0 && customers.size() == 1 && inboundCodes == totalOrders
+        boolean allPlansReady = totalOrders > 0 && inboundCodes == totalOrders
             && plannedOrders == totalOrders && planCount == totalOrders;
         List<InboundPlan> containerPlans = planFacts.stream()
             .filter(plan -> containerNo.equals(plan.getContainerNo())).toList();
         boolean allPlansCompleted = !containerPlans.isEmpty()
             && containerPlans.stream().allMatch(plan -> "COMPLETED".equals(plan.getStatus()));
-        String customerId = customers.size() == 1 ? customers.iterator().next() : null;
-        boolean shippingReady = customerId != null && shippingGates.receivingAvailable(customerId, containerNo) == 1;
+        boolean shippingReady = shippingGates.receivingAvailable(sourceContainerBookingId, containerNo) == 1;
         boolean operable = allPlansReady && shippingReady && warehouseSnapshotConsistent;
         int pending = Math.max(0, totalOrders - plannedOrders);
         String blockReason = operable ? null : (!warehouseSnapshotConsistent
@@ -521,42 +559,28 @@ public class ReceivingContainerService {
         List<InboundPlan> values = plans.selectList(new LambdaQueryWrapper<InboundPlan>()
             .eq(InboundPlan::getContainerNo, containerNo).orderByAsc(InboundPlan::getId));
         if (values.isEmpty()) throw notFound("Receiving container was not found");
-        requireSingleCustomer(values, containerNo);
+        if (values.stream().anyMatch(value -> trim(value.getCustomerId()) == null)) {
+            throw conflict("Every inbound plan in the receiving container must have an owning customer");
+        }
         if (values.stream().allMatch(value -> "COMPLETED".equals(value.getStatus()))) {
             throw conflict("Receiving container is already completed");
         }
         return values;
     }
 
-    private List<InboundPlan> requirePlans(String customerId, String containerNo) {
-        List<InboundPlan> values = plansForContainer(customerId, containerNo);
-        if (values.isEmpty()) throw notFound("Receiving container was not found");
-        if (values.stream().allMatch(value -> "COMPLETED".equals(value.getStatus()))) {
-            throw conflict("Receiving container is already completed");
-        }
-        return values;
-    }
-
-    private List<InboundPlan> plansForContainer(String customerId, String containerNo) {
+    private List<InboundPlan> plansForContainer(String containerNo) {
         List<InboundPlan> values = plans.selectList(new LambdaQueryWrapper<InboundPlan>()
-            .eq(InboundPlan::getCustomerId, customerId).eq(InboundPlan::getContainerNo, containerNo)
+            .eq(InboundPlan::getContainerNo, containerNo)
             .orderByAsc(InboundPlan::getId));
         if (values.isEmpty()) throw notFound("Receiving container was not found");
         return values;
     }
 
-    private String requireSingleCustomer(List<InboundPlan> values, String containerNo) {
-        Set<String> customers = values.stream().map(InboundPlan::getCustomerId).map(ReceivingContainerService::trim)
-            .filter(Objects::nonNull).collect(Collectors.toCollection(java.util.LinkedHashSet::new));
-        if (customers.size() != 1 || values.stream().anyMatch(value -> trim(value.getCustomerId()) == null)) {
-            throw conflict("Receiving container must resolve to exactly one customer: " + containerNo);
-        }
-        return customers.iterator().next();
-    }
-
-    private List<InboundRef> refs(String customerId, String containerNo) {
+    private List<InboundRef> refs(String containerNo) {
         List<InboundRef> result = new ArrayList<>();
-        for (InboundPlan plan : plansForContainer(customerId, containerNo)) {
+        for (InboundPlan plan : plansForContainer(containerNo)) {
+            String customerId = trim(plan.getCustomerId());
+            if (customerId == null) throw conflict("Inbound plan has no owning customer");
             for (InboundPlanLine line : lines.selectList(new LambdaQueryWrapper<InboundPlanLine>()
                 .eq(InboundPlanLine::getCustomerId, customerId).eq(InboundPlanLine::getPlanId, plan.getId())
                 .orderByAsc(InboundPlanLine::getId))) {
@@ -568,8 +592,8 @@ public class ReceivingContainerService {
         return result;
     }
 
-    private InboundRef requireInbound(String customerId, String containerNo, String inboundCode) {
-        List<InboundRef> matches = refs(customerId, containerNo).stream()
+    private InboundRef requireInbound(String containerNo, String inboundCode) {
+        List<InboundRef> matches = refs(containerNo).stream()
             .filter(value -> inboundCode.equals(value.line().getInboundCode())).toList();
         if (matches.isEmpty()) throw notFound("Inbound code is not part of the current container");
         Set<Long> planIds = matches.stream().map(value -> value.plan().getId()).collect(Collectors.toSet());
@@ -581,7 +605,8 @@ public class ReceivingContainerService {
         InboundPlanCarton carton = cartons.selectOne(new LambdaQueryWrapper<InboundPlanCarton>()
             .eq(InboundPlanCarton::getCustomerId, customerId).eq(InboundPlanCarton::getCartonMark, cartonMark));
         if (carton == null) throw notFound("Carton mark was not found");
-        List<InboundRef> matches = refs(customerId, containerNo).stream()
+        List<InboundRef> matches = refs(containerNo).stream()
+            .filter(value -> customerId.equals(value.order().getCustomerId()))
             .filter(value -> carton.getLineId() == null || Objects.equals(value.line().getId(), carton.getLineId()))
             .filter(value -> carton.getPlanId() == null || Objects.equals(value.plan().getId(), carton.getPlanId()))
             .filter(value -> Objects.equals(value.line().getOrderId(), carton.getOrderId())).toList();
@@ -597,16 +622,15 @@ public class ReceivingContainerService {
         return inboundCode;
     }
 
-    private CartonRef requireUnmatchedFbaCartonPrefix(String customerId, String inboundCode) {
+    private CartonRef requireUnmatchedFbaCartonPrefix(String inboundCode) {
         boolean exists = lines.selectList(new LambdaQueryWrapper<InboundPlanLine>()
-            .eq(InboundPlanLine::getCustomerId, customerId)
             .eq(InboundPlanLine::getInboundCode, inboundCode)).stream().findAny().isPresent();
         if (exists) throw conflict("Carton mark belongs to another container");
         throw notFound("Carton mark was not found");
     }
 
-    private List<InboundRef> requireFbaPlanRefs(String customerId, String containerNo, InboundRef selected) {
-        List<InboundRef> values = refs(customerId, containerNo).stream()
+    private List<InboundRef> requireFbaPlanRefs(String containerNo, InboundRef selected) {
+        List<InboundRef> values = refs(containerNo).stream()
             .filter(value -> Objects.equals(value.plan().getId(), selected.plan().getId()))
             .sorted(Comparator.comparing(value -> value.line().getId())).toList();
         if (values.isEmpty() || values.stream().anyMatch(value ->
@@ -635,11 +659,12 @@ public class ReceivingContainerService {
     }
 
     private PalletSelection resolveReceivingPallet(InboundRef ref, String palletCode, boolean requirePlanPallet) {
+        String normalizedPalletCode = palletCode.trim();
         List<InboundPlanPallet> reserved = pallets.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
             .eq(InboundPlanPallet::getCustomerId, ref.order().getCustomerId())
             .eq(InboundPlanPallet::getPlanId, ref.plan().getId())).stream()
             .filter(value -> sameDestination(ref.line(), value))
-            .filter(value -> palletCode.trim().equals(value.getPalletNo()))
+            .filter(value -> matchesPlannedPalletCode(value, normalizedPalletCode))
             .filter(this::hasConfirmedReservation)
             .toList();
         if (reserved.size() > 1) {
@@ -651,11 +676,11 @@ public class ReceivingContainerService {
             pallet = reserved.get(0);
             long warehouseId = ref.plan().getOverseasWarehouseId() == null
                 ? Long.parseLong(ref.order().getOverseasWarehouseId()) : ref.plan().getOverseasWarehouseId();
-            resource = warehouse.resolveReservedPallet(palletCode.trim(), ref.order().getCustomerId(), warehouseId,
+            resource = warehouse.resolveReservedPallet(pallet.getPalletNo(), ref.order().getCustomerId(), warehouseId,
                 pallet.getWarehousePalletId(), pallet.getWarehouseLocationId(), pallet.getWarehouseResourceLockId());
         } else {
             try {
-                resource = warehouse.resolveAvailablePallet(palletCode.trim());
+                resource = warehouse.resolveAvailablePallet(normalizedPalletCode);
             } catch (IllegalArgumentException exception) {
                 throw notFound("Pallet was not found");
             }
@@ -666,6 +691,11 @@ public class ReceivingContainerService {
         return new PalletSelection(pallet, resource);
     }
 
+    private boolean matchesPlannedPalletCode(InboundPlanPallet pallet, String scannedCode) {
+        return scannedCode.equals(trim(pallet.getPalletNo()))
+            || scannedCode.equals(trim(pallet.getSourcePalletNo()));
+    }
+
     private boolean hasConfirmedReservation(InboundPlanPallet pallet) {
         return pallet.getWarehousePalletId() != null && pallet.getWarehousePalletId() > 0
             && pallet.getWarehouseLocationId() != null && pallet.getWarehouseLocationId() > 0
@@ -705,8 +735,11 @@ public class ReceivingContainerService {
     private record PalletSelection(InboundPlanPallet pallet,
                                    WarehouseResourceGateway.WarehousePalletReference resource) { }
 
+    private record DropshipPalletRef(InboundRef ref, InboundPlanPallet pallet,
+                                     InboundPlanPalletAllocation allocation) { }
+
     private ReceivingContainerResponses.Session snapshot(ReceivingContainerSession session, List<InboundPlan> containerPlans) {
-        List<ReceivingContainerResponses.Inbound> inbounds = refs(session.getCustomerId(), session.getContainerNo()).stream()
+        List<ReceivingContainerResponses.Inbound> inbounds = refs(session.getContainerNo()).stream()
             .map(this::inbound).toList();
         int total = inbounds.stream().mapToInt(ReceivingContainerResponses.Inbound::totalPackages).sum();
         int received = inbounds.stream().mapToInt(ReceivingContainerResponses.Inbound::receivedPackages).sum();
@@ -729,7 +762,8 @@ public class ReceivingContainerService {
             ref.line().getDestinationWarehouseId(), ref.line().getDestinationWarehouseCode(),
             ref.line().getDestinationWarehouseName(), ref.line().getFbaWarehouseCode(),
             value(ref.line().getPlannedPalletCount()), total, received, Math.max(0, total - received),
-            assigned(ref.plan()), mergeAllowed(ref.plan()), urgent(ref.plan()), mergeHint(ref.plan()));
+            assigned(ref.plan()), mergeAllowed(ref.plan()), urgent(ref.plan()), mergeHint(ref.plan()),
+            ref.order().getOrderType(), "ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType()));
     }
 
     private boolean assigned(InboundPlan plan) {
@@ -749,8 +783,8 @@ public class ReceivingContainerService {
     }
 
     private Totals totals(List<InboundPlan> containerPlans) {
-        List<ReceivingContainerResponses.Inbound> values = refs(containerPlans.get(0).getCustomerId(),
-            containerPlans.get(0).getContainerNo()).stream().map(this::inbound).toList();
+        List<ReceivingContainerResponses.Inbound> values = refs(containerPlans.get(0).getContainerNo())
+            .stream().map(this::inbound).toList();
         List<String> destinationCodes = values.stream().map(this::destinationCode)
             .filter(Objects::nonNull).distinct().sorted().toList();
         return new Totals(values.size(), destinationCodes,
@@ -856,14 +890,15 @@ public class ReceivingContainerService {
     }
 
     private void recordSkuReceipt(ReceivingContainerSession session, FbaSkuAllocation sku, InboundPlanPallet pallet) {
-        List<ReceivingSkuReceipt> existing = skuReceipts.lockLineSku(session.getCustomerId(),
+        String customerId = sku.ref().order().getCustomerId();
+        List<ReceivingSkuReceipt> existing = skuReceipts.lockLineSku(customerId,
             sku.ref().line().getId(), sku.skuCode());
         ReceivingSkuReceipt receipt = existing.stream()
             .filter(value -> Objects.equals(value.getPalletId(), pallet.getId())).findFirst().orElse(null);
         LocalDateTime now = LocalDateTime.now();
         if (receipt == null) {
             receipt = new ReceivingSkuReceipt(); receipt.setId(IdWorker.getId());
-            receipt.setCustomerId(session.getCustomerId()); receipt.setSessionId(session.getId());
+            receipt.setCustomerId(customerId); receipt.setSessionId(session.getId());
             receipt.setPlanId(sku.ref().plan().getId()); receipt.setLineId(sku.ref().line().getId());
             receipt.setPalletId(pallet.getId()); receipt.setOrderId(sku.ref().order().getId());
             receipt.setInboundCode(sku.ref().line().getInboundCode()); receipt.setSkuCode(sku.skuCode());
@@ -877,9 +912,11 @@ public class ReceivingContainerService {
         }
     }
 
-    private void validateFbaSkuBalance(String customerId, String containerNo) {
-        for (InboundRef ref : refs(customerId, containerNo)) {
+    private void validateFbaSkuBalance(String containerNo) {
+        for (InboundRef ref : refs(containerNo)) {
             if (!"FBA".equals(destinationType(ref.line(), ref.order()))) continue;
+            if ("ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) continue;
+            String customerId = ref.order().getCustomerId();
             List<SkuExpectation> skuCodes = skuExpectations(ref);
             int received = 0;
             for (SkuExpectation sku : skuCodes) {
@@ -914,10 +951,10 @@ public class ReceivingContainerService {
         if (sessions.updateById(session) != 1) throw conflict("Receiving container session changed concurrently");
     }
 
-    private ReceivingContainerSession waitingView(String customerId, String operatorKey,
+    private ReceivingContainerSession waitingView(String operatorKey,
                                                    WarehouseResourceGateway.WarehouseReference warehouse,
                                                    String containerNo) {
-        ReceivingContainerSession value = new ReceivingContainerSession(); value.setCustomerId(customerId);
+        ReceivingContainerSession value = new ReceivingContainerSession();
         value.setOverseasWarehouseId(warehouse.warehouseId());
         value.setOverseasWarehouseCode(warehouse.warehouseCode());
         value.setOverseasWarehouseName(warehouse.warehouseName());
@@ -925,12 +962,6 @@ public class ReceivingContainerService {
         return value;
     }
 
-    private boolean eligible(List<InboundPlan> containerPlans, long overseasWarehouseId) {
-        String customerId = requireSingleCustomer(containerPlans, containerPlans.get(0).getContainerNo());
-        return warehouseEligible(containerPlans, overseasWarehouseId)
-            && shippingGates.receivingAvailable(customerId, containerPlans.get(0).getContainerNo()) == 1;
-    }
-
     private boolean warehouseEligible(List<InboundPlan> containerPlans, long overseasWarehouseId) {
         Set<Long> assigned = containerPlans.stream().map(InboundPlan::getOverseasWarehouseId)
             .filter(Objects::nonNull).collect(Collectors.toSet());
@@ -956,12 +987,6 @@ public class ReceivingContainerService {
         }
     }
 
-    private void requireReceivingAvailable(String customerId, String containerNo) {
-        if (shippingGates.receivingAvailable(customerId, containerNo) != 1) {
-            throw conflict("Container has not reached PICKUP_READY and is not available for overseas receiving");
-        }
-    }
-
     private void requireSessionWarehouse(ReceivingContainerSession session, long overseasWarehouseId) {
         if (session != null && !Objects.equals(session.getOverseasWarehouseId(), overseasWarehouseId)) {
             throw conflict("Current container belongs to another overseas warehouse");
@@ -981,7 +1006,7 @@ public class ReceivingContainerService {
     private void save(ReceivingContainerSession session, String action, String key, Object request, Object result) {
         key = idempotencyKey(key);
         ReceivingContainerOperation value = new ReceivingContainerOperation(); value.setId(IdWorker.getId());
-        value.setSessionId(session.getId()); value.setCustomerId(session.getCustomerId());
+        value.setSessionId(session.getId());
         value.setOperatorKey(session.getOperatorKey()); value.setAction(action); value.setIdempotencyKey(key);
         value.setRequestHash(hash(request)); value.setRequestJson(write(request)); value.setResultJson(write(result));
         value.setCreatedAt(LocalDateTime.now()); operations.insert(value);

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

@@ -117,7 +117,7 @@ public class ContainerInboundPlanConversionCoordinator {
                 preparation.warehouseId(), command.getBatchKey(), preparation.items().stream().map(item ->
                     new WarehouseResourceGateway.PalletBatchItemRequest(Long.parseLong(item.customerId()),
                         item.businessKey(), item.planNo(), item.globalSequenceNo(), "STANDARD",
-                        item.fbaWarehouseCode())).toList());
+                        item.fbaWarehouseCode(), item.palletCode())).toList());
             WarehouseResourceGateway.PalletBatchResponse reservation;
             try {
                 reservation = warehouse.ensurePalletBatch(ensure);
@@ -207,10 +207,18 @@ public class ContainerInboundPlanConversionCoordinator {
             .flatMap(group -> group.orders().stream()).filter(item -> "READY".equals(item.readiness())).toList()) {
             long planId = IdWorker.getId();
             String planNo = numbers.next("INBOUND_PLAN", order.destinationWarehouseCode(), planId);
+            List<String> sourcePalletNos = plans.sourcePalletNos(
+                order.customerId(), Long.parseLong(order.orderId()), order.orderType());
+            boolean warehouseGeneratedPallets = trimToNull(order.fbaWarehouseCode()) == null
+                && !"ONE_CLICK_DROPSHIP".equals(order.orderType());
+            if (!warehouseGeneratedPallets && sourcePalletNos.size() != order.suggestedPalletCount()) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT, "头程托盘码数量与柜级预览不一致");
+            }
             for (int localSequence = 1; localSequence <= order.suggestedPalletCount(); localSequence++) {
                 items.add(new PreparedItem(order.customerId(), Long.parseLong(order.orderId()), planId, planNo,
                     localSequence, ++globalSequence, "CIP:" + generationId + ":" + globalSequence,
-                    trimToNull(order.fbaWarehouseCode())));
+                    trimToNull(order.fbaWarehouseCode()), warehouseGeneratedPallets
+                        ? null : sourcePalletNos.get(localSequence - 1)));
             }
         }
         Preparation preparation = new Preparation(warehouseId, List.copyOf(items));
@@ -373,5 +381,5 @@ public class ContainerInboundPlanConversionCoordinator {
     public record Preparation(long warehouseId, List<PreparedItem> items) { }
     public record PreparedItem(String customerId, long orderId, long planId, String planNo,
                                int localSequenceNo, int globalSequenceNo, String businessKey,
-                               String fbaWarehouseCode) { }
+                               String fbaWarehouseCode, String palletCode) { }
 }

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

@@ -22,7 +22,9 @@ import java.util.Map;
 @Service
 @RequiredArgsConstructor
 public class DestuffingPalletCostService {
+    static final String DESTUFF_BUSINESS_TYPE = "OVERSEAS_CONTAINER";
     static final String READY_BOOKINGS_SQL = "SELECT o.source_container_booking_id FROM ll_inbound_plan p JOIN ll_order o ON o.id=p.source_order_id JOIN ll_inbound_pda_task t ON t.plan_id=p.id AND t.customer_id=p.customer_id LEFT JOIN ll_destuff_pallet_cost c ON c.source_container_booking_id=o.source_container_booking_id WHERE o.source_container_booking_id IS NOT NULL AND c.id IS NULL GROUP BY o.source_container_booking_id HAVING COUNT(*)=SUM(CASE WHEN t.status='COMPLETED' THEN 1 ELSE 0 END) ORDER BY MAX(t.completed_at) DESC LIMIT 50";
+    static final String RECEIVED_PALLET_IDS_SQL = "SELECT DISTINCT pp.warehouse_pallet_id FROM ll_inbound_plan_pallet pp JOIN ll_inbound_plan p ON p.id=pp.plan_id JOIN ll_order o ON o.id=p.source_order_id WHERE o.source_container_booking_id=? AND pp.warehouse_pallet_id IS NOT NULL AND pp.actual_package_count>0 AND pp.actual_volume_cbm>0 ORDER BY pp.warehouse_pallet_id";
     private final JdbcTemplate jdbc;
     private final PalletPhysicalGateway pallets;
     private final OverseasFeeSourceMapper feeSources;
@@ -38,7 +40,7 @@ public class DestuffingPalletCostService {
         if (exists != null && exists > 0) return;
         List<Map<String,Object>> plans = jdbc.queryForList("SELECT p.id,p.customer_id,p.container_no,p.overseas_warehouse_id,t.status FROM ll_inbound_plan p JOIN ll_order o ON o.id=p.source_order_id LEFT JOIN ll_inbound_pda_task t ON t.plan_id=p.id AND t.customer_id=p.customer_id WHERE o.source_container_booking_id=? ORDER BY p.customer_id,p.id", bookingId);
         if (plans.isEmpty() || plans.stream().anyMatch(row -> !"COMPLETED".equals(row.get("status")))) return;
-        List<Long> palletIds = jdbc.queryForList("SELECT DISTINCT pp.warehouse_pallet_id FROM ll_inbound_plan_pallet pp JOIN ll_inbound_plan p ON p.id=pp.plan_id JOIN ll_order o ON o.id=p.source_order_id WHERE o.source_container_booking_id=? AND pp.warehouse_pallet_id IS NOT NULL ORDER BY pp.warehouse_pallet_id", Long.class, bookingId);
+        List<Long> palletIds = jdbc.queryForList(RECEIVED_PALLET_IDS_SQL, Long.class, bookingId);
         BigDecimal totalCost = BigDecimal.ZERO;
         for (Long palletId : palletIds) totalCost = totalCost.add(pallets.resolve(palletId).unitPrice());
         totalCost = totalCost.setScale(2, RoundingMode.HALF_UP);
@@ -79,10 +81,14 @@ public class DestuffingPalletCostService {
     private OverseasFeeSource fee(long costId, String bookingId, String containerNo, Long warehouseId, CustomerVolume volume, BigDecimal amount, String operator) {
         LocalDateTime now=LocalDateTime.now(ZoneOffset.UTC); OverseasFeeSource v=new OverseasFeeSource();
         v.setId(IdWorker.getId()); v.setSourceFeeId(IdWorker.getId()); v.setSourceVersion(1); v.setCustomerId(volume.customerId());
-        v.setSourceType("OVERSEAS_CONTAINER_FEE"); v.setSourceNo("DESTUFF-"+bookingId); v.setBusinessType("CONTAINER_DESTUFFING");
+        v.setSourceType("OVERSEAS_CONTAINER_FEE"); v.setSourceNo("DESTUFF-"+bookingId); v.setBusinessType(DESTUFF_BUSINESS_TYPE);
         v.setBusinessId(costId); v.setBusinessNo("DESTUFF-"+bookingId); v.setContainerBookingId(parseLong(bookingId)); v.setContainerNo(containerNo);
         v.setWarehouseId(warehouseId); v.setFeeItemCode("DESTUFF_PALLET"); v.setFeeItemName("拆柜打托费"); v.setDirection("RECEIVABLE");
         v.setPaymentVoucherFileIds(List.of()); v.setBusinessDate(LocalDate.now()); v.setCurrency("CNY"); v.setAmount(amount);
+        v.setOriginalCurrency("CNY"); v.setOriginalAmount(amount); v.setExchangeRate(BigDecimal.ONE.setScale(6));
+        v.setExchangeRateMonth(LocalDate.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
+        v.setChargeableQuantity(volume.volume()); v.setQuantityUnit("CBM");
+        v.setUnitPrice(volume.volume().signum() > 0 ? amount.divide(volume.volume(), 6, RoundingMode.HALF_UP) : null);
         v.setReviewStatus("APPROVED"); v.setPublicationStatus("PUBLISHED"); v.setSourceStatus("ACTIVE"); v.setReviewerId(operator);
         v.setReviewedAt(now); v.setCreatedBy(operator); v.setUpdatedBy(operator); v.setCreatedAt(now); v.setUpdatedAt(now); return v;
     }

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

@@ -27,6 +27,7 @@ import com.baiyue.lastleg.dropship.service.DropshipOrderService;
 import com.baiyue.common.event.ContainerNumbers;
 import com.baiyue.lastleg.entity.LastlegOrderCommandRecord;
 import com.baiyue.lastleg.mapper.LastlegOrderCommandRecordMapper;
+import com.baiyue.lastleg.mapper.LastlegSourcePalletMapper;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -65,8 +66,16 @@ public class InboundPlanService {
     @Resource private DropshipOrderService dropshipOrders;
     @Resource private WarehouseResourceGateway warehouseGateway;
     @Resource private LastlegOrderCommandRecordMapper commandMapper;
+    @Resource private LastlegSourcePalletMapper sourcePalletMapper;
     @Resource private ObjectMapper objectMapper;
 
+    public List<String> sourcePalletNos(String customerId, long orderId, String orderType) {
+        return "ONE_CLICK_DROPSHIP".equals(orderType)
+            ? dropshipOrders.palletSnapshots(customerId, orderId).stream()
+                .map(DropshipPalletSnapshot::sourcePalletNo).toList()
+            : sourcePalletMapper.palletNos(customerId, orderId);
+    }
+
     @Transactional
     public InboundPlanResponse convertManual(ManualInboundPlanRequest request, String idempotencyKey,
                                              String operatorId) {
@@ -393,6 +402,10 @@ public class InboundPlanService {
         PalletAllocator.Result allocation = wholePallets == null && manual == null ? PalletAllocator.allocate(orders.stream()
             .map(order -> new PalletAllocator.LineInput(order.orderId(), warehouseKey(order), volume(order),
                 order.packageCount(), order.recommendedPalletCount())).toList()) : null;
+        if (allocation != null && sourcePalletNos != null && !sourcePalletNos.isEmpty()
+            && sourcePalletNos.size() != allocation.pallets().size()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "头程托盘码数量与尾程计划托盘数不一致");
+        }
         if (wholePallets != null) validateWholePallets(orders, wholePallets);
         plan.setPalletCount(manual != null ? manual.palletCount()
             : wholePallets == null ? allocation.pallets().size() : wholePallets.size());
@@ -479,6 +492,7 @@ public class InboundPlanService {
         List<Integer> pendingIndexes = new ArrayList<>();
         List<List<SourceOrderSnapshot>> snapshots = new ArrayList<>();
         List<List<WholePalletInput>> wholePallets = new ArrayList<>();
+        List<List<String>> standardPalletNos = new ArrayList<>();
         for (int index = 0; index < refs.size(); index++) {
             InboundPlanOrderMapper.ContainerOrderRef ref = refs.get(index);
             InboundPlan existing = existingPlans.get(index);
@@ -517,6 +531,13 @@ public class InboundPlanService {
                 validateWholePallets(orders, sourcePallets);
             }
             wholePallets.add(sourcePallets);
+            List<String> standardNos = "ONE_CLICK_DROPSHIP".equals(ref.orderType()) ? List.of()
+                : sourcePalletMapper.palletNos(ref.customerId(), ref.orderId());
+            boolean standardFba = sourcePallets == null && orders.stream()
+                .anyMatch(order -> trimToNull(order.fbaWarehouseCode()) != null);
+            if (standardFba && standardNos.isEmpty()) throw new ResponseStatusException(
+                HttpStatus.CONFLICT, "散货订单缺少头程托盘码快照");
+            standardPalletNos.add(standardNos);
         }
         requireSingleWarehouseId(warehouseIds);
 
@@ -531,7 +552,7 @@ public class InboundPlanService {
             Map<Integer, WarehouseResourceGateway.PalletBatchItem> reserved = prepared == null ? Map.of()
                 : prepared.pallets().stream().collect(Collectors.toMap(PreparedPallet::sequenceNo,
                     PreparedPallet::reservation));
-            created.put(refIndex, createPlan(ref.customerId(), ref.orderId(), snapshots.get(pendingIndex), List.of(),
+            created.put(refIndex, createPlan(ref.customerId(), ref.orderId(), snapshots.get(pendingIndex), standardPalletNos.get(pendingIndex),
                 wholePallets.get(pendingIndex), null, null, prepared, reserved));
         }
         List<InboundPlanResponse> result = new ArrayList<>(refs.size());

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

@@ -1,9 +0,0 @@
-package com.baiyue.lastleg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baiyue.lastleg.entity.LastlegOrderFee;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface LastlegOrderFeeMapper extends BaseMapper<LastlegOrderFee> {
-}

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

@@ -0,0 +1,27 @@
+package com.baiyue.lastleg.mapper;
+
+import org.apache.ibatis.annotations.Insert;
+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 LastlegSourcePalletMapper {
+    @Insert("""
+        INSERT INTO ll_order_source_pallet
+          (id,customer_id,order_id,source_pallet_no,sequence_no,source_event_id,created_at)
+        VALUES (#{id},#{customerId},#{orderId},#{palletNo},#{sequenceNo},#{eventId},CURRENT_TIMESTAMP(3))
+        """)
+    int insert(@Param("id") long id, @Param("customerId") String customerId,
+               @Param("orderId") long orderId, @Param("palletNo") String palletNo,
+               @Param("sequenceNo") int sequenceNo, @Param("eventId") String eventId);
+
+    @Select("""
+        SELECT source_pallet_no FROM ll_order_source_pallet
+         WHERE customer_id=#{customerId} AND order_id=#{orderId}
+         ORDER BY sequence_no,id
+        """)
+    List<String> palletNos(@Param("customerId") String customerId, @Param("orderId") long orderId);
+}

lastleg-service/src/main/java/com/baiyue/lastleg/pda/warehouse/mapper/PdaWarehouseMapper.java

@@ -52,7 +52,7 @@ public interface PdaWarehouseMapper extends BaseMapper<PdaOperationHistory> {
         "FROM ll_pda_operation_history h WHERE h.overseas_warehouse_id=#{warehouseId} AND h.operator_key=#{operatorKey} " +
         "<if test='operationType != null and operationType != \"\"'>AND h.operation_type=#{operationType} </if>" +
         "UNION ALL SELECT o.id,CONCAT('RECEIVING_',o.action),s.container_no,'COMPLETED'," +
-        "CONCAT('柜号作业 ',s.container_no),s.customer_id,o.created_at " +
+        "CONCAT('柜号作业 ',s.container_no),NULL customer_id,o.created_at " +
         "FROM ll_receiving_container_operation o JOIN ll_receiving_container_session s ON s.id=o.session_id " +
         "WHERE s.overseas_warehouse_id=#{warehouseId} AND o.operator_key=#{operatorKey} " +
         "<if test='operationType != null and operationType != \"\"'>AND CONCAT('RECEIVING_',o.action)=#{operationType} </if>" +

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java

@@ -16,6 +16,8 @@ import com.baiyue.lastleg.procurement.mapper.OverseasProcurementFeeMapper;
 import com.baiyue.lastleg.procurement.gateway.ProcurementFileGateway;
 import com.baiyue.lastleg.wallet.WalletCommandOutboxService;
 import com.baiyue.lastleg.wallet.WalletResultHandler;
+import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.common.event.WalletCommandCompletedV1;
 import com.baiyue.lastleg.procurement.mapper.OverseasProcurementOrderMapper;
 import com.baiyue.lastleg.procurement.mapper.OverseasProcurementStatusHistoryMapper;
@@ -33,7 +35,9 @@ import org.springframework.web.server.ResponseStatusException;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.LinkedHashMap;
@@ -62,6 +66,7 @@ public class OverseasProcurementService implements WalletResultHandler {
     @Resource private OverseasProcurementFeeMapper procurementFees;
     @Resource private ProcurementFileGateway fileGateway;
     @Resource private WalletCommandOutboxService walletCommands;
+    @Resource private OverseasFeeSourceService feeSources;
 
     @Transactional
     public OverseasProcurementResponses.Detail create(String customerId, String operatorId,
@@ -220,6 +225,7 @@ public class OverseasProcurementService implements WalletResultHandler {
         if ("FREEZE".equals(result.operation()) && "SUCCEEDED".equals(result.result())) {
             OverseasProcurementOrder order = orders.selectById(row.getOrderId());
             if (order != null && order.getInboundQuantity() >= order.getPurchaseQuantity()) {
+                publishFeeSource(order, row);
                 walletCommands.publish("SETTLE", result.customerId(), "PROCUREMENT_FEE", row.getFeeNo(), null,
                     "海外采购完成入库，结算费用", 2L);
                 row.setWalletStatus("SETTLE_PENDING"); procurementFees.updateById(row);
@@ -313,6 +319,7 @@ public class OverseasProcurementService implements WalletResultHandler {
         if (order.getInboundQuantity() >= order.getPurchaseQuantity()) {
             for (OverseasProcurementFee fee : procurementFees.selectList(new LambdaQueryWrapper<OverseasProcurementFee>()
                 .eq(OverseasProcurementFee::getOrderId, order.getId()).eq(OverseasProcurementFee::getWalletStatus, "FROZEN"))) {
+                publishFeeSource(order, fee);
                 walletCommands.publish("SETTLE", Long.parseLong(customerId), "PROCUREMENT_FEE", fee.getFeeNo(), null,
                     "海外采购完成入库，结算费用", 2L);
                 fee.setWalletStatus("SETTLE_PENDING"); fee.setUpdatedAt(now); procurementFees.updateById(fee);
@@ -321,6 +328,16 @@ public class OverseasProcurementService implements WalletResultHandler {
         return detail(customerId, orderNo);
     }
 
+    private void publishFeeSource(OverseasProcurementOrder order, OverseasProcurementFee fee) {
+        feeSources.publishApproved(StringUtils.hasText(fee.getCreatedBy()) ? fee.getCreatedBy() : "SYSTEM", "PROCUREMENT:" + fee.getFeeNo(),
+            new OverseasFeeSourceDtos.SaveRequest(order.getCustomerId(), order.getCustomerName(),
+                "OVERSEAS_PROCUREMENT_FEE", "PROCUREMENT_FEE", fee.getId(), fee.getFeeNo(),
+                order.getId(), null, null, null, null, null, parseLong(order.getPurchaseWarehouseId()),
+                fee.getFeeItemCode(), fee.getFeeItemName(), "RECEIVABLE", null, null, null, null,
+                null, null, null, List.of(), LocalDate.now(), fee.getCurrency(), fee.getAmount(),
+                BigDecimal.ONE, "ITEM", fee.getAmount(), null, null));
+    }
+
     private OverseasProcurementResponses.Detail replay(String customerId, OverseasProcurementOrder order, String hash) {
         if (!hash.equals(order.getRequestHash())) {
             throw conflict("Idempotency key was reused with different procurement data");
@@ -491,6 +508,10 @@ public class OverseasProcurementService implements WalletResultHandler {
     }
 
     private static long value(Long value) { return value == null ? 0 : value; }
+    private static Long parseLong(String value) {
+        try { return StringUtils.hasText(value) ? Long.parseLong(value.trim()) : null; }
+        catch (NumberFormatException ignored) { return null; }
+    }
     private static String trim(String value) { return value == null || value.isBlank() ? null : value.trim(); }
     private static String defaultCurrency(String value) { return trim(value) == null ? "USD" : value.trim().toUpperCase(); }
     private static void setIfText(String value, java.util.function.Consumer<String> setter) {

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.common.core.api.PageResult;
 import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
+import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
 import com.baiyue.lastleg.inventory.command.dto.InventoryCommandRequests;
@@ -45,9 +47,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.HexFormat;
 import java.util.LinkedHashMap;
@@ -84,6 +88,7 @@ public class RelabelApplicationService implements WalletResultHandler {
     @Resource private OutboundOrderMapper outboundOrders;
     @Resource private OutboundPalletItemMapper outboundItems;
     @Resource private OutboundPdaTaskMapper outboundTasks;
+    @Resource private OverseasFeeSourceService feeSources;
 
     @Transactional(readOnly = true)
     public String customerId(String relabelNo) { return require(null, relabelNo).getCustomerId(); }
@@ -228,7 +233,6 @@ public class RelabelApplicationService implements WalletResultHandler {
                 balance.getProductNameZh(), available, value(balance.getVersion()), positions);
         }).filter(candidate -> candidate.availablePackages() > 0).toList();
     }
-
     @Transactional
     public RelabelResponses.Detail create(String customerId, String operatorId, RelabelRequests.Create request) {
         if (!StringUtils.hasText(request.operationWarehouseId())) throw badRequest("Operation warehouse is required");
@@ -401,11 +405,24 @@ public class RelabelApplicationService implements WalletResultHandler {
         application.setStatus(next);
         application.setUpdatedAt(now);
         applications.updateById(application);
+        List<LastlegOrder> linkedOrders = tailOrders(application);
+        if (linkedOrders.isEmpty()) throw conflict("Linked tail-leg order is missing");
         if (CUSTOMER_CONFIRM_PENDING.equals(next)) {
             application.setFulfillmentStatus("WAIT_CUSTOMER_CONFIRMATION");
             applications.updateById(application);
         } else if ("COMPLETED".equals(next)) {
             if (!StringUtils.hasText(application.getOutboundOrderNo())) releaseInventory(customerId, operatorId, application);
+            BigDecimal quantity = BigDecimal.valueOf(Objects.requireNonNullElse(application.getTotalPackageCount(), 0));
+            feeSources.publishApproved(operatorId, "RELABEL:" + relabelNo,
+                new OverseasFeeSourceDtos.SaveRequest(customerId, linkedOrders.get(0).getCustomerName(),
+                    "OVERSEAS_RELABEL_FEE", "RELABEL_ORDER", application.getId(), relabelNo,
+                    application.getLastlegOrderId(), null, null, null, null, null,
+                    parseLong(application.getOverseasWarehouseId()), "RELABEL_SERVICE", "换标费", "RECEIVABLE",
+                    null, null, null, null, null, null, null, List.of(), LocalDate.now(),
+                    application.getChargeCurrency(), application.getChargeAmount(),
+                    quantity.signum() > 0 ? quantity : null, quantity.signum() > 0 ? "BOX" : null,
+                    quantity.signum() > 0 ? application.getChargeAmount().divide(quantity, 6, java.math.RoundingMode.HALF_UP) : null,
+                    null, null));
             walletCommands.publish("SETTLE", Long.parseLong(customerId), "RELABEL_ORDER", relabelNo, null,
                 "换标完成，结算费用", 2L);
             application.setWalletStatus("SETTLE_PENDING"); applications.updateById(application);
@@ -417,8 +434,6 @@ public class RelabelApplicationService implements WalletResultHandler {
                 application.setWalletStatus("RELEASE_PENDING"); applications.updateById(application);
             }
         }
-        List<LastlegOrder> linkedOrders = tailOrders(application);
-        if (linkedOrders.isEmpty()) throw conflict("Linked tail-leg order is missing");
         for (LastlegOrder order : linkedOrders) {
             String orderBefore = order.getCurrentStatus();
             String mainStatus = STATUSES.contains(orderBefore) ? "PENDING_ASSIGNMENT" : orderBefore;
@@ -753,6 +768,10 @@ public class RelabelApplicationService implements WalletResultHandler {
             .digest(objectMapper.copy().findAndRegisterModules().writeValueAsString(value).getBytes(StandardCharsets.UTF_8))); }
         catch (Exception exception) { throw new IllegalStateException(exception); }
     }
+    private static Long parseLong(String value) {
+        try { return StringUtils.hasText(value) ? Long.parseLong(value.trim()) : null; }
+        catch (NumberFormatException ignored) { return null; }
+    }
     private static String trim(String value) { return StringUtils.hasText(value) ? value.trim() : null; }
     private static ResponseStatusException badRequest(String message) { return new ResponseStatusException(HttpStatus.BAD_REQUEST, message); }
     private static ResponseStatusException conflict(String message) { return new ResponseStatusException(HttpStatus.CONFLICT, message); }

lastleg-service/src/main/java/com/baiyue/lastleg/security/OverseasPermissions.java

@@ -15,6 +15,8 @@ public final class OverseasPermissions {
     public static final String RELABEL_ORDER_LIST = "platform:overseas-warehouse:relabel-order:list";
     public static final String RELABEL_ORDER_CREATE = "platform:overseas-warehouse:relabel-order:create";
     public static final String RELABEL_ORDER_STATUS = "platform:overseas-warehouse:relabel-order:status";
+    public static final String RETURN_INVENTORY_LIST = "platform:overseas-warehouse:return-inventory:list";
+    public static final String RETURN_CARTONS_LIST = "platform:overseas-warehouse:return-cartons:list";
     public static final String INVENTORY_LIST = "platform:overseas-warehouse:inventory:list";
     public static final String INVENTORY_EXPORT = "platform:overseas-warehouse:inventory:export";
     public static final String INVENTORY_EDIT = "platform:overseas-warehouse:inventory:edit";

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

@@ -14,7 +14,6 @@ import com.baiyue.lastleg.dto.ContainerPlanProgressSummary;
 import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.entity.LastlegOrderDetail;
 import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
-import com.baiyue.lastleg.entity.LastlegOrderFee;
 import com.baiyue.lastleg.entity.LastlegOrderOperationLog;
 import com.baiyue.lastleg.entity.LastlegOrderManualNode;
 import com.baiyue.lastleg.entity.ReceivingWarehouseOperation;
@@ -25,7 +24,9 @@ import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
-import com.baiyue.lastleg.mapper.LastlegOrderFeeMapper;
+import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
@@ -64,7 +65,7 @@ public class LastlegOrderService {
     @Resource private LastlegOrderMapper orderMapper;
     @Resource private LastlegOrderDetailMapper detailMapper;
     @Resource private LastlegOrderStatusHistoryMapper historyMapper;
-    @Resource private LastlegOrderFeeMapper feeMapper;
+    @Resource private OverseasFeeSourceService feeSources;
     @Resource private LastlegOrderOperationLogMapper operationLogMapper;
     @Resource private LastlegOrderManualNodeMapper manualNodeMapper;
     @Resource private InboundPlanCartonMapper cartonMapper;
@@ -246,9 +247,7 @@ public class LastlegOrderService {
                 .eq(LastlegOrderStatusHistory::getCustomerId, order.getCustomerId())
                 .eq(LastlegOrderStatusHistory::getOrderId, orderId)
                 .orderByAsc(LastlegOrderStatusHistory::getCreatedAt));
-        List<LastlegOrderFee> fees = feeMapper.selectList(new LambdaQueryWrapper<LastlegOrderFee>()
-            .eq(LastlegOrderFee::getCustomerId, order.getCustomerId())
-            .eq(LastlegOrderFee::getOrderId, orderId).orderByAsc(LastlegOrderFee::getCreatedAt));
+        List<OverseasFeeSource> fees = feeSources.listForBusiness(order.getCustomerId(), "LASTLEG_ORDER", orderId);
         List<LastlegOrderOperationLog> operations = operationLogMapper.selectList(
             new LambdaQueryWrapper<LastlegOrderOperationLog>()
                 .eq(LastlegOrderOperationLog::getCustomerId, order.getCustomerId())
@@ -270,24 +269,21 @@ public class LastlegOrderService {
     }
 
     @Transactional
-    public LastlegOrderFee createFee(String customerId, long orderId, LastlegOrderRequests.CreateFee request,
-                                     String operatorName) {
+    public OverseasFeeSource createFee(String customerId, long orderId, LastlegOrderRequests.CreateFee request,
+                                       String operatorName, String idempotencyKey) {
         LastlegOrder order = findOwned(customerId, orderId);
         LocalDateTime now = LocalDateTime.now();
-        LastlegOrderFee fee = new LastlegOrderFee();
-        fee.setId(IdWorker.getId());
-        fee.setCustomerId(order.getCustomerId());
-        fee.setOrderId(orderId);
-        fee.setFeeItem(request.feeItem().trim());
-        fee.setCurrency(request.currency());
-        fee.setAmount(request.amount());
-        fee.setStatus(request.status());
-        fee.setSupplierDescription(StringUtils.hasText(request.supplierDescription())
-            ? request.supplierDescription().trim() : null);
-        fee.setCreatedBy(operatorName);
-        fee.setCreatedAt(now);
-        fee.setUpdatedAt(now);
-        feeMapper.insert(fee);
+        OverseasFeeSource fee = feeSources.create(operatorName, idempotencyKey,
+            new OverseasFeeSourceDtos.SaveRequest(order.getCustomerId(), order.getCustomerName(),
+                "OVERSEAS_ORDER_FEE", "LASTLEG_ORDER", orderId, order.getOrderNo(), orderId,
+                null, order.getInboundCode(), null, parseLong(order.getSourceContainerBookingId()),
+                order.getContainerNo(), parseLong(order.getOverseasWarehouseId()), request.feeItemCode(),
+                request.feeItemName(), request.direction(), request.supplierId(), request.supplierName(),
+                request.supplierCategory(), request.settlementMode(), request.paidAt(), request.paymentMethod(),
+                request.paymentReferenceNo(), request.paymentVoucherFileIds(), request.businessDate(),
+                request.currency(), request.amount(), request.chargeableQuantity(), request.quantityUnit(),
+                request.unitPrice(), request.periodStart(), request.periodEnd()));
+        fee = feeSources.submit(fee.getSourceFeeId(), operatorName, childKey(idempotencyKey, "submit"));
 
         LastlegOrderOperationLog operation = new LastlegOrderOperationLog();
         operation.setId(IdWorker.getId());
@@ -295,7 +291,8 @@ public class LastlegOrderService {
         operation.setOrderId(orderId);
         operation.setOperationNode("新增费用");
         operation.setOperatorName(operatorName);
-        operation.setResult("新增" + fee.getFeeItem() + "：" + fee.getCurrency() + " " + fee.getAmount().toPlainString());
+        operation.setResult("新增" + fee.getFeeItemName() + "：" + fee.getOriginalCurrency() + " "
+            + fee.getOriginalAmount().toPlainString() + "，已提交财务审核");
         operation.setCreatedAt(now);
         operationLogMapper.insert(operation);
         return fee;
@@ -585,6 +582,17 @@ public class LastlegOrderService {
             ? null : order.getInboundCode();
     }
 
+    private static Long parseLong(String value) {
+        try { return StringUtils.hasText(value) ? Long.parseLong(value.trim()) : null; }
+        catch (NumberFormatException ignored) { return null; }
+    }
+
+    private static String childKey(String key, String suffix) {
+        String prefix = key == null ? "" : key.trim();
+        int maxPrefix = Math.max(0, 128 - suffix.length() - 1);
+        return prefix.substring(0, Math.min(prefix.length(), maxPrefix)) + ':' + suffix;
+    }
+
     private static String csv(Object value) {
         if (value == null) return "";
         String text = String.valueOf(value);

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

@@ -45,6 +45,7 @@ public class LoadingCompletedConsumer {
     @Resource private DropshipOrderService dropshipOrders;
     @Resource private InventoryCommandService inventory;
     @Resource private ContainerShippingGateMapper shippingGates;
+    @Resource private LastlegSourcePalletMapper sourcePallets;
 
     @Transactional(isolation = Isolation.READ_COMMITTED)
     public int consume(EventEnvelope envelope) {
@@ -116,7 +117,7 @@ public class LoadingCompletedConsumer {
 
     private void freezeContainerIdentity(EventEnvelope envelope, String sourceContainerBookingId,
                                          String containerNo) {
-        shippingGates.initialize(sourceContainerBookingId, envelope.tenantId(), "",
+        shippingGates.initialize(sourceContainerBookingId, "",
             containerNo, 0, envelope.handoverVersion());
         ContainerShippingGate frozen = shippingGates.lock(sourceContainerBookingId);
         if (frozen == null) {
@@ -278,6 +279,20 @@ public class LoadingCompletedConsumer {
 
         Map<String, List<String>> dropshipLabels = "ONE_CLICK_DROPSHIP".equals(orderType)
             && "OVERSEAS".equals(destinationType) ? dropshipReceivingLabels(source, rawSource) : Map.of();
+        if ("FIRST_LEG".equals(orderType) && event.eventVersion() >= 2) {
+            List<FirstLegLoadingPlanCompletedV1.PalletSnapshot> pallets = source.pallets() == null ? List.of() : source.pallets();
+            Set<String> palletNos = new HashSet<>();
+            for (int palletIndex = 0; palletIndex < pallets.size(); palletIndex++) {
+                String palletNo = pallets.get(palletIndex).palletNo();
+                if (palletNo == null || palletNo.isBlank() || palletNo.length() > 128 || !palletNos.add(palletNo)) {
+                    throw new IllegalArgumentException("散货来源托盘码为空、重复或过长");
+                }
+                sourcePallets.insert(IdWorker.getId(), customerId, order.getId(), palletNo.trim(), palletIndex + 1, event.eventId());
+            }
+            if (!pallets.isEmpty() && order.getPalletCount() > 0 && pallets.size() != order.getPalletCount()) {
+                throw new IllegalArgumentException("散货来源托盘码数量与托盘数不一致");
+            }
+        }
         for(var item:source.items()) {
             LastlegOrderDetail detail=new LastlegOrderDetail();
             detail.setCustomerId(customerId);

lastleg-service/src/main/java/com/baiyue/lastleg/shipping/entity/ContainerShippingGate.java

@@ -12,7 +12,6 @@ import java.time.LocalDateTime;
 public class ContainerShippingGate {
     @TableId(type = IdType.INPUT)
     private String containerBookingId;
-    private String customerId;
     private String oceanBookingId;
     private String containerNo;
     private String status;

lastleg-service/src/main/java/com/baiyue/lastleg/shipping/mapper/ContainerShippingGateMapper.java

@@ -12,18 +12,17 @@ public interface ContainerShippingGateMapper extends BaseMapper<ContainerShippin
     @Select("SELECT * FROM ll_container_shipping_gate WHERE container_booking_id=#{containerBookingId} FOR UPDATE")
     ContainerShippingGate lock(@Param("containerBookingId") String containerBookingId);
 
-    @Insert("INSERT IGNORE INTO ll_container_shipping_gate(container_booking_id,customer_id,ocean_booking_id," +
+    @Insert("INSERT IGNORE INTO ll_container_shipping_gate(container_booking_id,ocean_booking_id," +
         "container_no,status,node_sequence,aggregate_version,handover_version,created_at,updated_at) VALUES(" +
-        "#{containerBookingId},#{customerId},#{oceanBookingId},#{containerNo},'AWAITING_PICKUP_READY',0," +
+        "#{containerBookingId},#{oceanBookingId},#{containerNo},'AWAITING_PICKUP_READY',0," +
         "#{aggregateVersion},#{handoverVersion},NOW(3),NOW(3))")
-    int initialize(@Param("containerBookingId") String containerBookingId, @Param("customerId") String customerId,
+    int initialize(@Param("containerBookingId") String containerBookingId,
                    @Param("oceanBookingId") String oceanBookingId, @Param("containerNo") String containerNo,
                    @Param("aggregateVersion") long aggregateVersion, @Param("handoverVersion") long handoverVersion);
 
-    @Select("SELECT CASE WHEN COUNT(DISTINCT o.source_container_booking_id)=1 " +
-        "AND MIN(CASE WHEN g.status='RECEIVING_AVAILABLE' THEN 1 ELSE 0 END)=1 THEN 1 ELSE 0 END " +
-        "FROM ll_order o LEFT JOIN ll_container_shipping_gate g " +
-        "ON g.container_booking_id=o.source_container_booking_id AND g.customer_id=o.customer_id " +
-        "WHERE o.customer_id=#{customerId} AND o.container_no=#{containerNo}")
-    int receivingAvailable(@Param("customerId") String customerId, @Param("containerNo") String containerNo);
+    @Select("SELECT CASE WHEN COUNT(*)=1 AND MIN(CASE WHEN status='RECEIVING_AVAILABLE' THEN 1 ELSE 0 END)=1 " +
+        "THEN 1 ELSE 0 END FROM ll_container_shipping_gate " +
+        "WHERE container_booking_id=#{containerBookingId} AND container_no=#{containerNo}")
+    int receivingAvailable(@Param("containerBookingId") String containerBookingId,
+                           @Param("containerNo") String containerNo);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/shipping/service/ContainerShippingNodeConsumer.java

@@ -49,11 +49,10 @@ public class ContainerShippingNodeConsumer {
             return 1;
         }
 
-        gates.initialize(payload.containerBookingId(), payload.customerId(), payload.oceanBookingId(),
+        gates.initialize(payload.containerBookingId(), payload.oceanBookingId(),
             payload.containerNo(), 0, 1);
         ContainerShippingGate gate = gates.lock(payload.containerBookingId());
-        if (gate == null || !payload.customerId().equals(gate.getCustomerId())
-            || !payload.containerNo().equals(gate.getContainerNo())) {
+        if (gate == null || !payload.containerNo().equals(gate.getContainerNo())) {
             throw new IllegalArgumentException("船节点柜号快照与装柜交接不一致");
         }
         apply(gate, envelope, payload);
@@ -108,9 +107,8 @@ public class ContainerShippingNodeConsumer {
     }
 
     private void validateEnvelopePayload(EventEnvelope envelope, FirstLegContainerShippingNodeRecordedV1 payload) {
-        if (!envelope.tenantId().equals(payload.customerId())
-            || !envelope.aggregateId().equals(payload.containerBookingId())) {
-            throw new IllegalArgumentException("船节点交接客户或聚合标识不一致");
+        if (!"0".equals(envelope.tenantId()) || !envelope.aggregateId().equals(payload.containerBookingId())) {
+            throw new IllegalArgumentException("船节点交接平台作用域或聚合标识不一致");
         }
     }
 

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

@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS ll_loading_event_inbox (
 ) ENGINE=InnoDB COMMENT='头程装柜完成事件接收幂等箱';
 
 CREATE TABLE IF NOT EXISTS ll_container_shipping_gate (
-  container_booking_id VARCHAR(128) NOT NULL COMMENT '来源头程柜预订ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户标识',
+  container_booking_id VARCHAR(128) NOT NULL COMMENT '来源头程柜预订ID',
   ocean_booking_id VARCHAR(128) NOT NULL COMMENT '来源海运订舱ID', container_no VARCHAR(64) NOT NULL COMMENT '实际集装箱号',
   status VARCHAR(32) NOT NULL DEFAULT 'AWAITING_PICKUP_READY' COMMENT '海外收货门禁状态：AWAITING_PICKUP_READY、RECEIVING_AVAILABLE',
   standard_node VARCHAR(64) NULL COMMENT '最新有效标准船节点', node_sequence INT NOT NULL DEFAULT 0 COMMENT '最新有效节点单调序号',
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS ll_container_shipping_gate (
   handover_version BIGINT NOT NULL DEFAULT 1 COMMENT '跨区交接版本', last_event_id VARCHAR(128) NULL COMMENT '最近采纳的跨区事件ID',
   payload_hash VARCHAR(71) NULL COMMENT '最近采纳事件规范化负载摘要', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
-  PRIMARY KEY(container_booking_id), KEY idx_ll_shipping_gate_candidate(customer_id,container_no,status),
+  PRIMARY KEY(container_booking_id), KEY idx_ll_shipping_gate_candidate(container_no,status),
   KEY idx_ll_shipping_gate_version(container_booking_id,aggregate_version,node_sequence)
 ) ENGINE=InnoDB COMMENT='海外PDA柜号船节点收货资格快照';
 
@@ -58,9 +58,9 @@ CREATE TABLE IF NOT EXISTS ll_order (
   customer_name VARCHAR(255) COMMENT '货主名称',
   source_warehouse_id VARCHAR(128) COMMENT '来源国内装柜仓 ID 快照',
   source_warehouse_name VARCHAR(255) COMMENT '来源国内装柜仓名称快照',
-  overseas_warehouse_id VARCHAR(128) NOT NULL DEFAULT '193000000000200003' COMMENT '海外接柜仓ID，新产生普通尾程整柜默认洛杉矶仓',
-  overseas_warehouse_code VARCHAR(128) NOT NULL DEFAULT 'US-LAX-01' COMMENT '海外接柜仓业务编码快照',
-  overseas_warehouse_name VARCHAR(255) NOT NULL DEFAULT '洛杉矶仓' COMMENT '海外接柜仓名称快照',
+  overseas_warehouse_id VARCHAR(128) NULL COMMENT '海外接柜仓ID；新建尾程订单由业务服务预分配',
+  overseas_warehouse_code VARCHAR(128) NULL COMMENT '海外接柜仓业务编码快照',
+  overseas_warehouse_name VARCHAR(255) NULL COMMENT '海外接柜仓名称快照',
   receiving_warehouse_version INT NOT NULL DEFAULT 0 COMMENT '柜级接柜仓分配乐观锁版本',
   transfer_warehouse_id VARCHAR(128) COMMENT '转入目的仓 ID',
   transfer_warehouse_code VARCHAR(128) COMMENT '转入目的仓编码',
@@ -112,6 +112,22 @@ CREATE TABLE IF NOT EXISTS ll_order (
   KEY idx_ll_order_container_progress(source_container_booking_id,estimated_warehouse_at,created_at,id)
 ) ENGINE=InnoDB COMMENT='尾程订单主表';
 
+CREATE TABLE IF NOT EXISTS ll_order_source_pallet (
+  id BIGINT NOT NULL COMMENT '来源托盘快照ID',
+  customer_id VARCHAR(128) NOT NULL COMMENT '客户隔离键',
+  order_id BIGINT NOT NULL COMMENT '尾程订单ID',
+  source_pallet_no VARCHAR(128) NOT NULL COMMENT '头程冻结托盘码',
+  sequence_no INT NOT NULL COMMENT '订单内稳定顺序',
+  source_event_id VARCHAR(128) NOT NULL COMMENT '来源装柜完成事件ID',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  PRIMARY KEY(id),
+  UNIQUE KEY uk_ll_source_pallet_no(source_pallet_no),
+  UNIQUE KEY uk_ll_source_pallet_sequence(customer_id,order_id,sequence_no),
+  KEY idx_ll_source_pallet_order(customer_id,order_id),
+  CONSTRAINT fk_ll_source_pallet_order FOREIGN KEY(order_id) REFERENCES ll_order(id)
+) ENGINE=InnoDB COMMENT='头程交接的不可变托盘码快照';
+
+
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_order' AND column_name='pallet_merge_batch_id'), 'SELECT 1', 'ALTER TABLE ll_order ADD COLUMN pallet_merge_batch_id VARCHAR(64) NULL COMMENT ''平台预标记合托分组号'' AFTER pallet_merge_flag'));
 PREPARE ll_order_merge_batch_ddl FROM @ddl; EXECUTE ll_order_merge_batch_ddl; DEALLOCATE PREPARE ll_order_merge_batch_ddl;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_order' AND column_name='hold_chargeable'), 'SELECT 1', 'ALTER TABLE ll_order ADD COLUMN hold_chargeable TINYINT NOT NULL DEFAULT 0 COMMENT ''当前暂扣是否计费：0否1是'' AFTER detained'));
@@ -163,22 +179,6 @@ CREATE TABLE IF NOT EXISTS ll_loading_order_status_history (
   KEY idx_ll_loading_history_customer_order(customer_id,order_id,created_at)
 ) ENGINE=InnoDB COMMENT='尾程订单状态变更历史';
 
-CREATE TABLE IF NOT EXISTS ll_order_fee (
-  id BIGINT NOT NULL COMMENT '费用明细主键',
-  customer_id VARCHAR(128) NOT NULL COMMENT '客户数据隔离键',
-  order_id BIGINT NOT NULL COMMENT '尾程订单ID',
-  fee_item VARCHAR(128) NOT NULL COMMENT '费用项目',
-  currency VARCHAR(3) NOT NULL COMMENT '币种代码',
-  amount DECIMAL(18,2) NOT NULL COMMENT '费用金额',
-  status VARCHAR(32) NOT NULL DEFAULT 'PENDING_REVIEW' COMMENT '费用状态：PENDING_REVIEW待审核、APPROVED审核通过、REJECTED已驳回',
-  supplier_description VARCHAR(500) NULL COMMENT '供应商或费用说明',
-  created_by VARCHAR(128) NOT NULL COMMENT '创建操作人',
-  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
-  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
-  PRIMARY KEY(id),
-  KEY idx_ll_order_fee_customer_order(customer_id,order_id,created_at)
-) ENGINE=InnoDB COMMENT='尾程订单费用明细';
-
 CREATE TABLE IF NOT EXISTS ll_order_operation_log (
   id BIGINT NOT NULL COMMENT '操作记录主键',
   customer_id VARCHAR(128) NOT NULL COMMENT '客户数据隔离键',
@@ -302,12 +302,6 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE delivery_detail_stmt FROM @ddl; EXECUTE delivery_detail_stmt; DEALLOCATE PREPARE delivery_detail_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_delivery_order' AND column_name='total_weight_kg'), 'SELECT 1', 'ALTER TABLE ll_delivery_order ADD COLUMN total_weight_kg DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''总重量（千克）'', ADD COLUMN total_volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT ''总体积（立方米）'', ADD COLUMN planned_delivery_at DATETIME(3) NULL COMMENT ''预计派送时间'', ADD COLUMN dispatched_at DATETIME(3) NULL COMMENT ''实际派送时间'', ADD COLUMN expected_arrival_at DATETIME(3) NULL COMMENT ''预计到达时间'', ADD COLUMN signed_at DATETIME(3) NULL COMMENT ''签收时间'', ADD COLUMN remark VARCHAR(1000) NULL COMMENT ''派送备注'' AFTER pallet_count'));
 PREPARE delivery_detail_stmt FROM @ddl; EXECUTE delivery_detail_stmt; DEALLOCATE PREPARE delivery_detail_stmt;
-CREATE TABLE IF NOT EXISTS ll_delivery_fee (
-  id BIGINT NOT NULL COMMENT '派送费用主键', customer_id VARCHAR(128) NOT NULL COMMENT '客户数据隔离键', delivery_order_id BIGINT NOT NULL COMMENT '派送单ID',
-  fee_direction VARCHAR(16) NOT NULL DEFAULT 'PAYABLE' COMMENT '应收应付方向', fee_type VARCHAR(64) NOT NULL COMMENT '费用类型', currency VARCHAR(8) NOT NULL COMMENT '币种',
-  amount DECIMAL(18,2) NOT NULL COMMENT '费用金额', remark VARCHAR(500) NULL COMMENT '费用备注', created_by VARCHAR(128) NULL COMMENT '创建人ID',
-  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', PRIMARY KEY(id), KEY idx_ll_delivery_fee_order(customer_id,delivery_order_id,id)
-) ENGINE=InnoDB COMMENT='派送单费用明细';
 CREATE TABLE IF NOT EXISTS ll_delivery_document_revision (
   id BIGINT NOT NULL COMMENT '派送资料历史ID',
   customer_id VARCHAR(128) NOT NULL COMMENT '派送所属客户隔离键',
@@ -444,9 +438,9 @@ ALTER TABLE ll_order
   MODIFY COLUMN source_order_no VARCHAR(128) NULL COMMENT '来源订单号',
   MODIFY COLUMN root_order_id VARCHAR(128) NULL COMMENT '根订单 ID',
   MODIFY COLUMN customer_name VARCHAR(255) NULL COMMENT '货主名称',
-  MODIFY COLUMN overseas_warehouse_id VARCHAR(128) NOT NULL DEFAULT '193000000000200003' COMMENT '海外接柜仓ID，新产生普通尾程整柜默认洛杉矶仓',
-  MODIFY COLUMN overseas_warehouse_code VARCHAR(128) NOT NULL DEFAULT 'US-LAX-01' COMMENT '海外接柜仓业务编码快照',
-  MODIFY COLUMN overseas_warehouse_name VARCHAR(255) NOT NULL DEFAULT '洛杉矶仓' COMMENT '海外接柜仓名称快照',
+  MODIFY COLUMN overseas_warehouse_id VARCHAR(128) NULL COMMENT '海外接柜仓ID；新建尾程订单由业务服务预分配',
+  MODIFY COLUMN overseas_warehouse_code VARCHAR(128) NULL COMMENT '海外接柜仓业务编码快照',
+  MODIFY COLUMN overseas_warehouse_name VARCHAR(255) NULL COMMENT '海外接柜仓名称快照',
   MODIFY COLUMN receiving_warehouse_version INT NOT NULL DEFAULT 0 COMMENT '柜级接柜仓分配乐观锁版本',
   MODIFY COLUMN fba_warehouse_code VARCHAR(128) NULL COMMENT 'FBA 仓库编码',
   MODIFY COLUMN container_no VARCHAR(64) NULL COMMENT '集装箱号',
@@ -832,8 +826,13 @@ CREATE TABLE IF NOT EXISTS ll_finance_fee_source (
   supplier_category VARCHAR(32) NULL COMMENT '应付供应商类别约束', settlement_mode VARCHAR(16) NULL COMMENT 'ON_ACCOUNT账期应付或DIRECT_PAID业务已付',
   paid_at DATETIME(3) NULL COMMENT '直接已付时间', payment_method VARCHAR(32) NULL COMMENT '直接已付方式',
   payment_reference_no VARCHAR(128) NULL COMMENT '直接已付流水号', payment_voucher_file_ids JSON NULL COMMENT '直接已付凭证文件ID快照',
-  business_date DATE NOT NULL COMMENT '费用业务日期', currency CHAR(3) NOT NULL DEFAULT 'CNY' COMMENT '财务结算币种，当前固定CNY',
-  amount DECIMAL(20,6) NOT NULL COMMENT '费用金额', review_status VARCHAR(16) NOT NULL COMMENT 'DRAFT、PENDING、APPROVED或REJECTED',
+  business_date DATE NOT NULL COMMENT '费用业务日期', currency CHAR(3) NOT NULL DEFAULT 'CNY' COMMENT '财务结算币种，固定CNY',
+  amount DECIMAL(20,6) NOT NULL COMMENT '人民币结算金额', original_currency CHAR(3) NOT NULL COMMENT '业务原币种，支持CNY或USD',
+  original_amount DECIMAL(20,6) NOT NULL COMMENT '业务原币金额', exchange_rate DECIMAL(20,6) NOT NULL COMMENT '原币折算人民币汇率，人民币固定为1',
+  exchange_rate_month CHAR(7) NOT NULL COMMENT '汇率月份yyyy-MM', chargeable_quantity DECIMAL(20,6) NULL COMMENT '计费数量，如箱数、托数、体积或天数',
+  quantity_unit VARCHAR(32) NULL COMMENT '计费数量单位', unit_price DECIMAL(20,6) NULL COMMENT '原币计费单价',
+  period_start DATE NULL COMMENT '仓租等期间费用开始日期', period_end DATE NULL COMMENT '仓租等期间费用结束日期',
+  review_status VARCHAR(16) NOT NULL COMMENT 'DRAFT、PENDING、APPROVED或REJECTED',
   publication_status VARCHAR(16) NOT NULL COMMENT 'UNPUBLISHED或PUBLISHED', source_status VARCHAR(16) NOT NULL COMMENT 'ACTIVE、SUPERSEDED或VOIDED',
   review_reason VARCHAR(500) NULL COMMENT '审核或作废原因', reviewer_id VARCHAR(128) NULL COMMENT '审核人ID', reviewed_at DATETIME(3) NULL COMMENT '审核时间',
   created_by VARCHAR(128) NOT NULL COMMENT '创建人ID', updated_by VARCHAR(128) NOT NULL COMMENT '最后更新人ID',
@@ -842,6 +841,8 @@ CREATE TABLE IF NOT EXISTS ll_finance_fee_source (
   KEY idx_ll_finance_fee_customer(customer_id,source_status,created_at), KEY idx_ll_finance_fee_business(business_type,business_no,created_at),
   KEY idx_ll_finance_fee_container_customer(container_booking_id,customer_id,source_status,created_at),
   CONSTRAINT chk_ll_finance_fee_amount CHECK(amount>0), CONSTRAINT chk_ll_finance_fee_currency CHECK(currency='CNY'),
+  CONSTRAINT chk_ll_finance_fee_original_currency CHECK(original_currency IN('CNY','USD')),
+  CONSTRAINT chk_ll_finance_fee_period CHECK((period_start IS NULL AND period_end IS NULL) OR (period_start IS NOT NULL AND period_end IS NOT NULL AND period_start<=period_end)),
   CONSTRAINT chk_ll_finance_fee_direction CHECK(direction IN('RECEIVABLE','PAYABLE')),
   CONSTRAINT chk_ll_finance_fee_review CHECK(review_status IN('DRAFT','PENDING','APPROVED','REJECTED')),
   CONSTRAINT chk_ll_finance_fee_publication CHECK(publication_status IN('UNPUBLISHED','PUBLISHED')),
@@ -951,7 +952,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_pallet_merge (
   KEY idx_ll_inbound_merge_task (customer_id, task_id), KEY idx_ll_inbound_merge_group (merge_group_no)
 ) ENGINE=InnoDB COMMENT='入仓托盘合托记录';
 
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_line' AND column_name='fba_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_line ADD COLUMN fba_warehouse_code VARCHAR(128) NULL AFTER inbound_code'));
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_line' AND column_name='fba_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_line ADD COLUMN fba_warehouse_code VARCHAR(128) NULL COMMENT ''FBA仓库编码'' AFTER inbound_code'));
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_line' AND column_name='customer_id'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_line ADD COLUMN customer_id VARCHAR(128) NOT NULL DEFAULT '''' COMMENT ''客户账号标识'' AFTER id'));
 PREPARE receiving_container_line_stmt FROM @ddl; EXECUTE receiving_container_line_stmt; DEALLOCATE PREPARE receiving_container_line_stmt;
@@ -991,7 +992,7 @@ WHERE (l.fba_warehouse_code IS NULL AND o.fba_warehouse_code IS NOT NULL)
    OR l.destination_type IS NULL OR l.destination_type='' OR l.destination_type='OVERSEAS';
 
 CREATE TABLE IF NOT EXISTS ll_receiving_container_session (
-  id BIGINT NOT NULL COMMENT '柜号签收会话ID', customer_id VARCHAR(128) NOT NULL COMMENT '所选柜解析出的客户标识',
+  id BIGINT NOT NULL COMMENT '柜号签收会话ID',
   source_container_booking_id VARCHAR(128) NOT NULL COMMENT '稳定来源柜预订ID', container_fact_hash VARCHAR(64) NOT NULL COMMENT '领取时整柜订单与计划事实摘要',
   container_no VARCHAR(64) NOT NULL COMMENT '集装箱号', overseas_warehouse_id BIGINT NOT NULL COMMENT '平台预分配并由操作员Token匹配的海外接柜仓ID', overseas_warehouse_code VARCHAR(128) NOT NULL COMMENT '海外接柜仓业务编码快照', overseas_warehouse_name VARCHAR(255) NOT NULL COMMENT '仓库服务校验后的海外接柜仓名称快照', operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识',
   operator_name VARCHAR(255) NULL COMMENT '操作账号名称', active_operator_key VARCHAR(255) NULL COMMENT '未完成会话平台操作账号全局唯一锁键',
@@ -1001,7 +1002,7 @@ CREATE TABLE IF NOT EXISTS ll_receiving_container_session (
   completed_at DATETIME(3) NULL COMMENT '完成时间', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本',
   PRIMARY KEY(id), UNIQUE KEY uk_ll_receiving_active_operator(active_operator_key), UNIQUE KEY uk_ll_receiving_active_container(active_container_key),
-  KEY idx_ll_receiving_container(customer_id,container_no,status), KEY idx_ll_receiving_operator(customer_id,operator_key,created_at)
+  KEY idx_ll_receiving_container(container_no,status), KEY idx_ll_receiving_operator(operator_key,created_at)
 ) ENGINE=InnoDB COMMENT='海外PDA柜号签收收货会话';
 
 CREATE TABLE IF NOT EXISTS ll_receiving_sku_receipt (
@@ -1019,7 +1020,7 @@ CREATE TABLE IF NOT EXISTS ll_receiving_sku_receipt (
 ) ENGINE=InnoDB COMMENT='海外PDA柜号FBA SKU实收进度';
 
 CREATE TABLE IF NOT EXISTS ll_receiving_container_operation (
-  id BIGINT NOT NULL COMMENT '柜号收货操作ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户账号标识',
+  id BIGINT NOT NULL COMMENT '柜号收货操作ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
   operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识', action VARCHAR(32) NOT NULL COMMENT '操作动作', idempotency_key VARCHAR(255) NOT NULL COMMENT '客户端幂等键',
   request_hash VARCHAR(128) NOT NULL COMMENT '请求内容哈希', request_json LONGTEXT NOT NULL COMMENT '请求内容快照', result_json LONGTEXT NOT NULL COMMENT '响应内容快照',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', PRIMARY KEY(id),
@@ -1362,7 +1363,7 @@ PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_pallet_lock' AND column_name='dispatch_order_id' AND is_nullable='YES'), 'SELECT 1', 'ALTER TABLE ll_dispatch_pallet_lock MODIFY COLUMN dispatch_order_id BIGINT NULL COMMENT ''正式派车单ID，草稿锁阶段为空'''));
 PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;
 
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_item' AND column_name='order_refs'), 'SELECT 1', 'ALTER TABLE ll_dispatch_item ADD COLUMN order_refs VARCHAR(2000) NULL AFTER order_no'));
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_item' AND column_name='order_refs'), 'SELECT 1', 'ALTER TABLE ll_dispatch_item ADD COLUMN order_refs VARCHAR(2000) NULL COMMENT ''关联订单信息'' AFTER order_no'));
 PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;
 
 CREATE TABLE IF NOT EXISTS ll_dispatch_pda_task (
@@ -1459,8 +1460,6 @@ CREATE TABLE IF NOT EXISTS ll_outbound_pda_pick (
   inventory_position_id BIGINT NOT NULL COMMENT '库存仓位ID', packages BIGINT NOT NULL COMMENT '拣货箱数', idempotency_key VARCHAR(255) NOT NULL COMMENT '拣货幂等键',
   picked_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '拣货时间', PRIMARY KEY(id), UNIQUE KEY uk_ll_outbound_pda_pick_key(customer_id,idempotency_key)
 ) ENGINE=InnoDB COMMENT='一件代发出库PDA托盘拣货记录';
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_outbound_pda_pick' AND column_name='inventory_position_id' AND is_nullable='YES'), 'SELECT 1', 'ALTER TABLE ll_outbound_pda_pick MODIFY COLUMN inventory_position_id BIGINT NULL COMMENT ''库存仓位ID，退货箱唛出库为空'''));
-PREPARE outbound_pda_pick_position_stmt FROM @ddl; EXECUTE outbound_pda_pick_position_stmt; DEALLOCATE PREPARE outbound_pda_pick_position_stmt;
 
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_outbound_order' AND column_name='outbound_type'), 'SELECT 1', 'ALTER TABLE ll_outbound_order ADD COLUMN outbound_type VARCHAR(32) NOT NULL DEFAULT ''DISPATCH_DELIVERY'' COMMENT ''出库类型'' AFTER status'));
 PREPARE outbound_upgrade_stmt FROM @ddl; EXECUTE outbound_upgrade_stmt; DEALLOCATE PREPARE outbound_upgrade_stmt;
@@ -1613,9 +1612,6 @@ CREATE TABLE IF NOT EXISTS ll_relabel_application (
   customer_confirmation_key VARCHAR(255) NULL COMMENT '客户确认完成幂等键',
   customer_confirmed_at DATETIME(3) NULL COMMENT '客户确认换标完成时间',
   remark VARCHAR(1000) NULL COMMENT '备注',
-  total_file_id VARCHAR(128) NULL COMMENT '总换标PDF文件ID',
-  total_file_name VARCHAR(255) NULL COMMENT '总换标PDF文件名',
-  total_file_url VARCHAR(1000) NULL COMMENT '总换标PDF预览地址',
   status VARCHAR(32) NOT NULL DEFAULT 'PENDING_PROCESSING' COMMENT '业务状态',
   item_count INT NOT NULL DEFAULT 0 COMMENT '明细数量',
   total_package_count INT NOT NULL DEFAULT 0 COMMENT '总箱数',
@@ -1674,7 +1670,7 @@ CREATE TABLE IF NOT EXISTS ll_relabel_item (
   relabel_file_url VARCHAR(1000) NULL COMMENT '换标文件地址',
   carton_mark VARCHAR(255) NULL COMMENT '客户自有箱唛',
   fba_carton_mark VARCHAR(255) NULL COMMENT '关联FBA箱唛',
-  destination_warehouse_id VARCHAR(128) NOT NULL COMMENT '该箱目的海外仓ID',
+  destination_warehouse_id VARCHAR(128) NULL COMMENT '该箱目的海外仓ID',
   destination_fba_warehouse_code VARCHAR(128) NULL COMMENT '可选FBA目的仓编码（与海外操作仓分离）',
   operation_type VARCHAR(32) NOT NULL DEFAULT 'CARTON_LABEL' COMMENT '换标模式：箱唛、SKU或组合换标',
   sku_relabel_items_json JSON NULL COMMENT '同箱SKU换标子明细快照（数量按件）',
@@ -1690,7 +1686,7 @@ CREATE TABLE IF NOT EXISTS ll_relabel_item (
   PRIMARY KEY (id),
   KEY idx_ll_relabel_item_application (customer_id,application_id),
   KEY idx_ll_relabel_item_sku (customer_id,sku_code),
-  KEY idx_ll_relabel_item_source_position (customer_id,source_inventory_position_id)
+  KEY idx_ll_relabel_item_destination (customer_id,destination_warehouse_id,application_id)
 ) ENGINE=InnoDB COMMENT='换标货物冻结明细';
 
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name IN ('shipment_no','destination_fba_warehouse_code','source_inventory_balance_id','source_inventory_position_id','source_inbound_order_id') AND is_nullable='NO'), 'ALTER TABLE ll_relabel_item MODIFY COLUMN shipment_no VARCHAR(128) NULL COMMENT ''货件编号（无FBA去向时为空）'', MODIFY COLUMN destination_fba_warehouse_code VARCHAR(128) NULL COMMENT ''可选FBA目的仓编码（与海外操作仓分离）'', MODIFY COLUMN source_inventory_balance_id BIGINT NULL COMMENT ''原库存余额ID（预入仓换标任务可为空）'', MODIFY COLUMN source_inventory_position_id BIGINT NULL COMMENT ''原库存库位ID（预入仓换标任务可为空）'', MODIFY COLUMN source_inbound_order_id BIGINT NULL COMMENT ''原入仓单ID（预入仓换标任务可为空）''', 'SELECT 1'));
@@ -2077,17 +2073,6 @@ CREATE TABLE IF NOT EXISTS ll_exception_order_command (
   KEY idx_ll_exception_command_order(customer_id,exception_order_id,created_at)
 ) ENGINE=InnoDB COMMENT='异常处理命令幂等审计';
 
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_exception_order' AND column_name='handling_result'), 'SELECT 1', 'ALTER TABLE ll_exception_order ADD COLUMN handling_result VARCHAR(2000) NULL COMMENT ''异常处理结果'' AFTER handling_action'));
-PREPARE exception_lifecycle_stmt FROM @ddl; EXECUTE exception_lifecycle_stmt; DEALLOCATE PREPARE exception_lifecycle_stmt;
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_exception_order' AND column_name='evidence_file_ids_json'), 'SELECT 1', 'ALTER TABLE ll_exception_order ADD COLUMN evidence_file_ids_json JSON NULL COMMENT ''异常处理证据文件ID列表'' AFTER handling_result'));
-PREPARE exception_lifecycle_stmt FROM @ddl; EXECUTE exception_lifecycle_stmt; DEALLOCATE PREPARE exception_lifecycle_stmt;
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_exception_order' AND column_name='inventory_adjustment_id'), 'SELECT 1', 'ALTER TABLE ll_exception_order ADD COLUMN inventory_adjustment_id BIGINT NULL COMMENT ''退回库存恢复操作ID'' AFTER evidence_file_ids_json'));
-PREPARE exception_lifecycle_stmt FROM @ddl; EXECUTE exception_lifecycle_stmt; DEALLOCATE PREPARE exception_lifecycle_stmt;
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_exception_order' AND column_name='completed_at'), 'SELECT 1', 'ALTER TABLE ll_exception_order ADD COLUMN completed_at DATETIME(3) NULL COMMENT ''异常处理完成时间'' AFTER exception_at'));
-PREPARE exception_lifecycle_stmt FROM @ddl; EXECUTE exception_lifecycle_stmt; DEALLOCATE PREPARE exception_lifecycle_stmt;
-SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_exception_order' AND column_name='version'), 'SELECT 1', 'ALTER TABLE ll_exception_order ADD COLUMN version BIGINT NOT NULL DEFAULT 0 COMMENT ''异常订单乐观锁版本'' AFTER completed_at'));
-PREPARE exception_lifecycle_stmt FROM @ddl; EXECUTE exception_lifecycle_stmt; DEALLOCATE PREPARE exception_lifecycle_stmt;
-
 CREATE TABLE IF NOT EXISTS ll_customer_visit (
   id BIGINT NOT NULL COMMENT '客户回访记录ID',
   customer_id VARCHAR(128) NOT NULL COMMENT '客户数据隔离键',
@@ -2148,7 +2133,7 @@ CREATE TABLE IF NOT EXISTS ll_security_projection (
   KEY idx_security_projection_permission (aggregate_id,permission_version)
 ) ENGINE=InnoDB COMMENT='海外IAM安全状态与权限版本投影';
 
--- 兼容已有的旧版投影表：CREATE TABLE IF NOT EXISTS 不会补充后续新增字段。
+-- 收敛尚未具备授权快照字段的开发/测试库，CREATE TABLE IF NOT EXISTS 不会补充已存在表的字段。
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
   AND table_name='ll_security_projection' AND column_name='roles_json'), 'SELECT 1',
   'ALTER TABLE ll_security_projection ADD COLUMN roles_json JSON NULL COMMENT ''IAM投影的当前角色快照'' AFTER permission_version'));
@@ -2163,16 +2148,133 @@ ALTER TABLE ll_security_projection
   MODIFY COLUMN roles_json JSON NOT NULL COMMENT 'IAM投影的当前角色快照',
   MODIFY COLUMN authorities_json JSON NOT NULL COMMENT 'IAM投影的当前海外权限快照';
 
--- 开发基线固定管理员；后续真实 IAM 事件从 aggregate_version=1 单调覆盖该 version=0 投影。
+-- 空库基线固定管理员必须携带当前海外授权快照；后续真实 IAM 事件从 aggregate_version=1 单调覆盖该 version=0 投影。
+SET @platform_admin_overseas_roles = JSON_ARRAY('PLATFORM_ADMIN');
+SET @platform_admin_overseas_authorities = JSON_ARRAY(
+  'platform:finance:bill:adjust',
+  'platform:finance:bill:update',
+  'platform:finance:bill:void',
+  'platform:finance:cost:create',
+  'platform:finance:cost:view',
+  'platform:finance:customer-account:adjust',
+  'platform:finance:customer-account:export',
+  'platform:finance:customer-account:list',
+  'platform:finance:customer-arap:export',
+  'platform:finance:customer-arap:list',
+  'platform:finance:customer-statement:export',
+  'platform:finance:customer-statement:list',
+  'platform:finance:customer-terms:update',
+  'platform:finance:customer-terms:view',
+  'platform:finance:fee-source:edit',
+  'platform:finance:fee-source:review',
+  'platform:finance:payment:create',
+  'platform:finance:receipt:create',
+  'platform:finance:receipt:view',
+  'platform:finance:receivable-statistics:export',
+  'platform:finance:receivable-statistics:list',
+  'platform:finance:recharge:review',
+  'platform:finance:reconciliation:adjust',
+  'platform:finance:reconciliation:create',
+  'platform:finance:reconciliation:issue',
+  'platform:finance:reconciliation:review',
+  'platform:finance:reconciliation:void',
+  'platform:finance:settlement-ap:create',
+  'platform:finance:settlement-ap:export',
+  'platform:finance:settlement-ap:list',
+  'platform:finance:settlement-ar:create',
+  'platform:finance:settlement-ar:export',
+  'platform:finance:settlement-ar:list',
+  'platform:finance:settlement:void',
+  'platform:overseas-business:looseboard:create',
+  'platform:overseas-business:looseboard:edit',
+  'platform:overseas-business:looseboard:list',
+  'platform:overseas-business:looseboard:status',
+  'platform:overseas-business:purchase:edit',
+  'platform:overseas-business:purchase:list',
+  'platform:overseas-business:purchase:review',
+  'platform:overseas-business:truck:create',
+  'platform:overseas-business:truck:edit',
+  'platform:overseas-business:truck:list',
+  'platform:overseas-business:truck:status',
+  'platform:overseas-master-data:exchange-rate:create',
+  'platform:overseas-master-data:exchange-rate:edit',
+  'platform:overseas-master-data:exchange-rate:export',
+  'platform:overseas-master-data:exchange-rate:list',
+  'platform:overseas-master-data:exchange-rate:status',
+  'platform:overseas-master-data:quote:create',
+  'platform:overseas-master-data:quote:edit',
+  'platform:overseas-master-data:quote:export',
+  'platform:overseas-master-data:quote:list',
+  'platform:overseas-master-data:quote:status',
+  'platform:overseas-master-data:vehicle:create',
+  'platform:overseas-master-data:vehicle:edit',
+  'platform:overseas-master-data:vehicle:export',
+  'platform:overseas-master-data:vehicle:list',
+  'platform:overseas-master-data:vehicle:status',
+  'platform:overseas-warehouse:customer-visit:edit',
+  'platform:overseas-warehouse:customer-visit:list',
+  'platform:overseas-warehouse:delivery:documents',
+  'platform:overseas-warehouse:delivery:list',
+  'platform:overseas-warehouse:delivery:return',
+  'platform:overseas-warehouse:delivery:status',
+  'platform:overseas-warehouse:dispatch:cancel',
+  'platform:overseas-warehouse:dispatch:edit',
+  'platform:overseas-warehouse:dispatch:list',
+  'platform:overseas-warehouse:dispatch:transfer-delivery',
+  'platform:overseas-warehouse:exception-order:create',
+  'platform:overseas-warehouse:exception-order:list',
+  'platform:overseas-warehouse:exception-order:process',
+  'platform:overseas-warehouse:inbound-order:create',
+  'platform:overseas-warehouse:inbound-order:edit',
+  'platform:overseas-warehouse:inbound-order:fba-appointment',
+  'platform:overseas-warehouse:inbound-order:list',
+  'platform:overseas-warehouse:inbound-order:smart-dispatch',
+  'platform:overseas-warehouse:inventory:adjust',
+  'platform:overseas-warehouse:inventory:edit',
+  'platform:overseas-warehouse:inventory:export',
+  'platform:overseas-warehouse:inventory:list',
+  'platform:overseas-warehouse:last-mile-order:edit',
+  'platform:overseas-warehouse:last-mile-order:export',
+  'platform:overseas-warehouse:last-mile-order:list',
+  'platform:overseas-warehouse:location:create',
+  'platform:overseas-warehouse:location:delete',
+  'platform:overseas-warehouse:location:edit',
+  'platform:overseas-warehouse:location:list',
+  'platform:overseas-warehouse:outbound:cancel',
+  'platform:overseas-warehouse:outbound:create',
+  'platform:overseas-warehouse:outbound:list',
+  'platform:overseas-warehouse:pallet:create',
+  'platform:overseas-warehouse:pallet:delete',
+  'platform:overseas-warehouse:pallet:edit',
+  'platform:overseas-warehouse:pallet:list',
+  'platform:overseas-warehouse:relabel-order:create',
+  'platform:overseas-warehouse:relabel-order:list',
+  'platform:overseas-warehouse:relabel-order:status',
+  'platform:overseas-warehouse:return-cartons:list',
+  'platform:overseas-warehouse:return-inventory:list',
+  'platform:overseas-warehouse:warehouse:create',
+  'platform:overseas-warehouse:warehouse:edit',
+  'platform:overseas-warehouse:warehouse:list',
+  'platform:overseas-warehouse:warehouse:status'
+);
 INSERT IGNORE INTO ll_security_projection (
   aggregate_type,aggregate_id,tenant_id,security_status,permission_version,roles_json,authorities_json,aggregate_version,
   payload_hash,last_event_id,changed_at,updated_at
 ) VALUES
   ('USER','1000001',0,'ACTIVE',0,JSON_ARRAY(),JSON_ARRAY(),0,SHA2('lastleg-baseline:platform_admin:USER:0',256),
    'baseline-platform-admin-user-v0','1970-01-01 00:00:00.000','1970-01-01 00:00:00.000'),
-  ('AUTHORIZATION','1000001',0,NULL,0,JSON_ARRAY(),JSON_ARRAY(),0,SHA2('lastleg-baseline:platform_admin:AUTHORIZATION:0',256),
+  ('AUTHORIZATION','1000001',0,NULL,0,@platform_admin_overseas_roles,@platform_admin_overseas_authorities,0,
+   SHA2('lastleg-baseline:platform_admin:AUTHORIZATION:0:current-authorities',256),
    'baseline-platform-admin-authorization-v0','1970-01-01 00:00:00.000','1970-01-01 00:00:00.000');
 
+UPDATE ll_security_projection
+SET roles_json=@platform_admin_overseas_roles,
+    authorities_json=@platform_admin_overseas_authorities,
+    payload_hash=SHA2('lastleg-baseline:platform_admin:AUTHORIZATION:0:current-authorities',256),
+    updated_at=CURRENT_TIMESTAMP(3)
+WHERE aggregate_type='AUTHORIZATION' AND aggregate_id='1000001' AND tenant_id=0
+  AND aggregate_version=0 AND last_event_id='baseline-platform-admin-authorization-v0';
+
 
 CREATE TABLE IF NOT EXISTS ll_wallet_event_inbox (
   event_id VARCHAR(64) NOT NULL COMMENT '国内Finance资金结果事件ID',

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

@@ -29,8 +29,8 @@ paths:
         '409': { description: 入仓码跨客户或快照关系不一致 }
   /api/pda/v1/last-leg/receiving-containers/candidates:
     get:
-      summary: 查询当前客户待签收柜号
-      description: 权限 lastleg:pda:operate；仅 PLATFORM OVERSEAS_WAREHOUSE_PDA_OPERATOR 可用；仅返回已单调消费 PICKUP_READY(80) 或更高实际船节点、状态为 RECEIVING_AVAILABLE 的柜，不接收 customerId。
+      summary: 查询当前仓待签收柜号
+      description: 权限 lastleg:pda:operate；仅 PLATFORM OVERSEAS_WAREHOUSE_PDA_OPERATOR 可用；按来源柜跨客户聚合，仅返回已单调消费 PICKUP_READY(80) 或更高实际船节点、状态为 RECEIVING_AVAILABLE 的柜，不接收 customerId。
       security: [{ bearerAuth: [] }]
       responses: { '200': { description: 柜号候选及箱数进度, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingCandidateListApiResponse' } } } }, '403': { description: 缺少 PDA 操作权限 } }
   /api/pda/v1/last-leg/receiving-containers/warehouse-profile:
@@ -42,7 +42,7 @@ paths:
   /api/pda/v1/last-leg/receiving-containers/{containerNo}:
     get:
       summary: 查询待签收柜号详情
-      description: 权限 lastleg:pda:operate；按柜号唯一解析客户并返回柜内全部入仓码、目的类型、目的仓、托数和实收进度。
+      description: 权限 lastleg:pda:operate；按来源柜返回跨客户的全部入仓码、目的类型、目的仓、托数和实收进度；每个入仓码仍按自身客户隔离。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: containerNo, in: path, required: true, schema: { type: string } }]
       responses: { '200': { description: 柜号详情, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingSessionApiResponse' } } } }, '409': { description: 当前账号已锁定其他柜号 } }
@@ -121,6 +121,13 @@ paths:
       security: [{ bearerAuth: [] }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingCarton' } } } }
       responses: { '200': { description: 本次与累计实收进度, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingReceiptApiResponse' } } } }, '409': { description: FBA逐箱、跨柜、重复箱或托盘不匹配 } }
+  /api/pda/v1/last-leg/receiving-containers/current/receipts/pallet:
+    post:
+      summary: 一件代发按完整来源托盘收货
+      description: 权限 lastleg:pda:operate；只允许 ONE_CLICK_DROPSHIP，扫描国内封托后冻结的来源托盘号，一次接收该托全部箱和 SKU 快照；不允许逐箱或拆分接收。
+      security: [{ bearerAuth: [] }]
+      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingWholePallet' } } } }
+      responses: { '200': { description: 本次与累计实收进度, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingReceiptApiResponse' } } } }, '404': { description: 来源托盘不属于当前柜 }, '409': { description: 非一件代发、来源托盘重复或已操作 } }
   /api/pda/v1/last-leg/receiving-containers/current/complete:
     post:
       summary: 完成当前柜收货并入库存
@@ -194,11 +201,12 @@ paths:
   /api/platform/v1/last-leg/orders/{id}/fees:
     post:
       summary: 新增尾程订单费用
-      description: 权限 platform:overseas-warehouse:last-mile-order:edit；在订单客户范围内新增费用并记录操作人和处理结果。
+      description: 权限 platform:overseas-warehouse:last-mile-order:edit；在订单客户范围内创建统一费用来源并提交财务审核。
       security: [{ bearerAuth: [] }]
       parameters:
         - { name: id, in: path, required: true, schema: { type: integer, format: int64 } }
         - { name: customerId, in: query, required: false, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
+        - { name: Idempotency-Key, in: header, required: true, schema: { type: string, minLength: 1, maxLength: 128 } }
       requestBody:
         required: true
         content: { application/json: { schema: { $ref: '#/components/schemas/LastMileFeeCreate' } } }
@@ -346,7 +354,15 @@ paths:
           application/json:
             schema: { $ref: '#/components/schemas/ChangeReceivingWarehouseRequest' }
       responses:
-        '200': { description: 更新后的柜级摘要, content: { application/json: { schema: { type: object, properties: { code: { type: string, enum: ['200'] }, data: { $ref: '#/components/schemas/ContainerPlanProgressSummary' } } } } } }
+        '200':
+          description: 更新后的柜级摘要
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  code: { type: string, enum: ['200'] }
+                  data: { $ref: '#/components/schemas/ContainerPlanProgressSummary' }
         '400': { description: 请求无效或目标不是有效 OVERSEAS 仓 }
         '409': { description: 版本冲突、幂等键冲突或PDA接柜会话已建立 }
   /api/platform/v1/last-leg/orders/{id}/destination:
@@ -624,7 +640,7 @@ paths:
       description: 权限 platform:overseas-warehouse:outbound:list；只按全局唯一 outboundNo 定位并从记录解析客户范围，不接收 customerId。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: outboundNo, in: path, required: true, schema: { type: string } }]
-      responses: { '200': { description: "出库单、出库托盘及关联派送单详情；pallets[].palletNo 为 Warehouse 权威实物托盘码" }, '404': { description: 出库单不存在 } }
+      responses: { '200': { description: '出库单、出库托盘及关联派送单详情；pallets[].palletNo 为 Warehouse 权威实物托盘码' }, '404': { description: 出库单不存在 } }
   /api/platform/v1/last-leg/outbound-orders/{outboundNo}/cancel:
     post:
       summary: 取消未执行出库单
@@ -1620,28 +1636,44 @@ components:
         plannedArrivalAt: { type: string, format: date-time, nullable: true, description: ll_order.estimated_warehouse_at }
     LastMileFeeCreate:
       type: object
-      required: [feeItem, currency, amount, status]
+      required: [feeItemCode, feeItemName, direction, currency, amount, businessDate]
       properties:
-        feeItem: { type: string, minLength: 1, maxLength: 128 }
-        currency: { type: string, pattern: '^[A-Z]{3}$', example: USD }
+        feeItemCode: { type: string, minLength: 1, maxLength: 64 }
+        feeItemName: { type: string, minLength: 1, maxLength: 128 }
+        direction: { type: string, enum: [RECEIVABLE, PAYABLE] }
+        currency: { type: string, enum: [CNY, USD] }
         amount: { type: number, format: decimal, minimum: 0.01 }
-        status: { type: string, enum: [PENDING_REVIEW, APPROVED, REJECTED] }
-        supplierDescription: { type: string, maxLength: 500 }
+        businessDate: { type: string, format: date }
+        supplierId: { type: string, pattern: '^[1-9][0-9]*$' }
+        supplierName: { type: string, maxLength: 200 }
+        supplierCategory: { type: string, maxLength: 32 }
+        settlementMode: { type: string, enum: [ON_ACCOUNT, DIRECT_PAID] }
+        chargeableQuantity: { type: number, minimum: 0, exclusiveMinimum: true }
+        quantityUnit: { type: string, maxLength: 32 }
+        unitPrice: { type: number, minimum: 0, exclusiveMinimum: true }
+        periodStart: { type: string, format: date }
+        periodEnd: { type: string, format: date }
     LastMileFee:
       type: object
-      required: [id, customerId, orderId, feeItem, currency, amount, status, createdBy, createdAt, updatedAt]
+      required: [id, sourceFeeId, sourceVersion, customerId, feeItemCode, feeItemName, direction, currency, amount, originalCurrency, originalAmount, reviewStatus, publicationStatus, sourceStatus]
       properties:
-        id: { type: integer, format: int64 }
+        id: { type: string, pattern: '^[1-9][0-9]*$' }
+        sourceFeeId: { type: string, pattern: '^[1-9][0-9]*$' }
+        sourceVersion: { type: integer, minimum: 1 }
         customerId: { type: string }
-        orderId: { type: integer, format: int64 }
-        feeItem: { type: string }
-        currency: { type: string }
+        orderId: { type: string, pattern: '^[1-9][0-9]*$' }
+        feeItemCode: { type: string }
+        feeItemName: { type: string }
+        direction: { type: string, enum: [RECEIVABLE, PAYABLE] }
+        currency: { type: string, enum: [CNY] }
         amount: { type: number, format: decimal }
-        status: { type: string }
-        supplierDescription: { type: string, nullable: true }
-        createdBy: { type: string }
-        createdAt: { type: string, format: date-time }
-        updatedAt: { type: string, format: date-time }
+        originalCurrency: { type: string, enum: [CNY, USD] }
+        originalAmount: { type: number, format: decimal }
+        exchangeRate: { type: number, format: decimal }
+        exchangeRateMonth: { type: string, pattern: '^\\d{4}-\\d{2}$' }
+        reviewStatus: { type: string, enum: [DRAFT, PENDING, APPROVED, REJECTED] }
+        publicationStatus: { type: string }
+        sourceStatus: { type: string }
     LastMileFeeApiResponse:
       type: object
       required: [code, message, data]
@@ -1782,6 +1814,12 @@ components:
         cartonMark: { type: string, minLength: 1 }
         palletCode: { type: string, minLength: 1 }
         idempotencyKey: { type: string, minLength: 1, maxLength: 255 }
+    ReceivingWholePallet:
+      type: object
+      required: [sourcePalletNo, idempotencyKey]
+      properties:
+        sourcePalletNo: { type: string, minLength: 1 }
+        idempotencyKey: { type: string, minLength: 1, maxLength: 255 }
     ReceivingApiResponseBase:
       type: object
       required: [code, message, timestamp]
@@ -1793,7 +1831,7 @@ components:
         timestamp: { type: string, format: date-time }
     ReceivingInbound:
       type: object
-      required: [inboundCode, destinationType, plannedPalletCount, totalPackages, receivedPackages, pendingPackages, assigned, mergeAllowed, urgent]
+      required: [inboundCode, destinationType, plannedPalletCount, totalPackages, receivedPackages, pendingPackages, assigned, mergeAllowed, urgent, wholePalletInbound]
       properties:
         inboundCode: { type: string }
         destinationType: { type: string, enum: [FBA, OVERSEAS] }
@@ -1905,6 +1943,8 @@ components:
         mergeAllowed: { type: boolean, description: 现场可选择合托，不作为实收或完成门禁 }
         urgent: { type: boolean }
         mergeHint: { type: string, nullable: true }
+        orderType: { type: string, nullable: true }
+        wholePalletInbound: { type: boolean, description: 一件代发必须按完整来源托盘扫描收货 }
     ReceivingCandidateListApiResponse:
       allOf:
         - { $ref: '#/components/schemas/ReceivingApiResponseBase' }
@@ -2131,11 +2171,22 @@ components:
       enum: [START_PROCESSING, COMPLETE_EXCEPTION, CANCEL_EXCEPTION]
     DeliveryFeeInput:
       type: object
-      required: [feeType, currency, amount]
+      required: [feeType, feeName, direction, currency, amount]
       properties:
         feeType: { type: string, maxLength: 64 }
-        currency: { type: string, maxLength: 8 }
-        amount: { type: number, minimum: 0 }
+        feeName: { type: string, maxLength: 128 }
+        direction: { type: string, enum: [RECEIVABLE, PAYABLE] }
+        currency: { type: string, enum: [CNY, USD] }
+        amount: { type: number, minimum: 0, exclusiveMinimum: true }
+        supplierId: { type: string, pattern: '^[1-9][0-9]*$' }
+        supplierName: { type: string, maxLength: 200 }
+        supplierCategory: { type: string, maxLength: 32 }
+        settlementMode: { type: string, enum: [ON_ACCOUNT, DIRECT_PAID] }
+        chargeableQuantity: { type: number, minimum: 0, exclusiveMinimum: true }
+        quantityUnit: { type: string, maxLength: 32 }
+        unitPrice: { type: number, minimum: 0, exclusiveMinimum: true }
+        periodStart: { type: string, format: date }
+        periodEnd: { type: string, format: date }
         remark: { type: string, nullable: true, maxLength: 500 }
     OneClickOutboundCreate:
       type: object
@@ -2317,7 +2368,7 @@ components:
       required: [customerOrderNo, labelDeadline, contactName, contactPhone, chargeAmount, idempotencyKey, items]
       properties:
         customerOrderNo: { type: string, maxLength: 128 }
-        operationWarehouseId: { type: string, maxLength: 128, description: 换标操作所在海外中转仓，和FBA目的仓分离 }
+        overseasWarehouseId: { type: string, nullable: true, maxLength: 128, description: 统一目的海外仓；明细未填写目的仓时使用 }
         labelDeadline: { type: string, format: date-time }
         contactName: { type: string, maxLength: 128 }
         contactPhone: { type: string, maxLength: 64 }
@@ -2329,11 +2380,8 @@ components:
         items: { type: array, minItems: 1, maxItems: 500, items: { $ref: '#/components/schemas/RelabelItem' } }
     RelabelItem:
       type: object
-      required: [sourceInventoryBalanceId, sourceInventoryPositionId, sourceInboundOrderId, productNameZh, totalPackageCount, notifiedPackageCount, shipmentNo, cartonMark]
+      required: [productNameZh, totalPackageCount, notifiedPackageCount, shipmentNo, newSkuCode, cartonMark, fbaCartonMark]
       properties:
-        sourceInventoryBalanceId: { type: string, pattern: '^[0-9]+$', description: 来源库存余额ID }
-        sourceInventoryPositionId: { type: string, pattern: '^[0-9]+$', description: 来源库存仓位ID；同箱任务唯一冻结依据 }
-        sourceInboundOrderId: { type: string, pattern: '^[0-9]+$', description: 来源历史入仓单ID }
         skuCode: { type: string, nullable: true, maxLength: 128, description: 商品 SKU（选填） }
         productImageFileId: { type: string, nullable: true, maxLength: 128 }
         productImageFileName: { type: string, nullable: true, maxLength: 255 }
@@ -2343,24 +2391,14 @@ components:
         notifiedPackageCount: { type: integer, minimum: 1 }
         shipmentNo: { type: string, maxLength: 128 }
         trackingCode: { type: string, nullable: true, maxLength: 255 }
-        newSkuCode: { type: string, nullable: true, maxLength: 128, description: 箱唛换标时的单个新SKU兼容字段 }
+        newSkuCode: { type: string, maxLength: 128 }
         labelRequirement: { type: string, nullable: true, maxLength: 1000 }
         relabelFileId: { type: string, nullable: true, maxLength: 128 }
         relabelFileName: { type: string, nullable: true, maxLength: 255 }
         relabelFileUrl: { type: string, nullable: true, maxLength: 1000 }
-        cartonMark: { type: string, maxLength: 255, description: 我方箱唛；同一申请内不可重复，整箱库存只冻结一次 }
-        fbaCartonMark: { type: string, nullable: true, maxLength: 255, description: 新FBA箱唛；箱唛或组合换标必填 }
-        destinationFbaWarehouseCode: { type: string, nullable: true, maxLength: 128, description: FBA目的仓编码；箱唛或组合换标必填 }
-        operationType: { type: string, enum: [CARTON_LABEL, SKU_LABEL, CARTON_AND_SKU], description: 箱唛换标、SKU换标或组合换标 }
-        skuItems: { type: array, maxItems: 100, description: 同一箱唛内SKU换标子明细，数量按件；SKU或组合换标必填, items: { $ref: '#/components/schemas/RelabelSkuItem' } }
-    RelabelSkuItem:
-      type: object
-      required: [skuCode, newSkuCode, quantity]
-      properties:
-        skuCode: { type: string, maxLength: 128, description: 原SKU }
-        newSkuCode: { type: string, maxLength: 128, description: 换标后SKU }
-        quantity: { type: integer, minimum: 1, description: 换标件数 }
-        remark: { type: string, nullable: true, maxLength: 1000 }
+        cartonMark: { type: string, maxLength: 255, description: 客户自有箱唛（不在编辑列表展示） }
+        fbaCartonMark: { type: string, maxLength: 255, description: 关联 FBA 箱唛 }
+        destinationWarehouseId: { type: string, nullable: true, maxLength: 128, description: 该箱目的海外仓；为空时使用申请统一目的仓 }
     RelabelStatusChange:
       type: object
       required: [status]

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

@@ -42,7 +42,7 @@ paths:
       responses: { '200': { description: 当前费用来源版本 }, '409': { description: 状态、版本或幂等冲突 } }
 components:
   schemas:
-    BusinessType: { type: string, enum: [OVERSEAS_INBOUND, OVERSEAS_PROCUREMENT, US_TRUCK, LOCAL_LOOSEBOARD, WAREHOUSE_SERVICE, OVERSEAS_CONTAINER] }
+    BusinessType: { type: string, enum: [OVERSEAS_INBOUND, OVERSEAS_PROCUREMENT, PROCUREMENT_FEE, US_TRUCK, LOCAL_LOOSEBOARD, WAREHOUSE_SERVICE, OVERSEAS_CONTAINER, LASTLEG_ORDER, DELIVERY_ORDER, RELABEL_ORDER] }
     OverseasContainerFeeItem:
       type: string
       description: 海外阶段柜级费用项目：港口费、堆存费、修箱费、吊机费、码头拖车费、其他。
@@ -70,7 +70,7 @@ components:
       required: [customerId, sourceType, businessType, businessNo, feeItemCode, feeItemName, direction, businessDate, currency, amount]
       properties:
         customerId: { type: string }
-        sourceType: { type: string, enum: [OVERSEAS_INBOUND_FEE, OVERSEAS_PROCUREMENT_FEE, OVERSEAS_TRUCK_FEE, OVERSEAS_LOOSEBOARD_FEE, OVERSEAS_WAREHOUSE_FEE, OVERSEAS_CONTAINER_FEE] }
+        sourceType: { type: string, enum: [OVERSEAS_INBOUND_FEE, OVERSEAS_PROCUREMENT_FEE, OVERSEAS_TRUCK_FEE, OVERSEAS_LOOSEBOARD_FEE, OVERSEAS_WAREHOUSE_FEE, OVERSEAS_CONTAINER_FEE, OVERSEAS_ORDER_FEE, OVERSEAS_DELIVERY_FEE, OVERSEAS_RELABEL_FEE] }
         businessType: { $ref: '#/components/schemas/BusinessType' }
         businessId: { type: string, pattern: '^[1-9][0-9]*$', nullable: true }
         businessNo: { type: string, maxLength: 128 }
@@ -85,6 +85,11 @@ components:
         feeItemName: { type: string }
         direction: { type: string, enum: [RECEIVABLE, PAYABLE] }
         businessDate: { type: string, format: date }
-        currency: { type: string, enum: [CNY] }
-        amount: { type: number, format: decimal, minimum: 0, exclusiveMinimum: true }
+        currency: { type: string, enum: [CNY, USD], description: 业务原币；USD由服务端按业务月份有效汇率折算为CNY入池 }
+        amount: { type: number, format: decimal, minimum: 0, exclusiveMinimum: true, description: 业务原币金额 }
+        chargeableQuantity: { type: number, format: decimal, minimum: 0, exclusiveMinimum: true, nullable: true }
+        quantityUnit: { type: string, maxLength: 32, nullable: true }
+        unitPrice: { type: number, format: decimal, minimum: 0, exclusiveMinimum: true, nullable: true }
+        periodStart: { type: string, format: date, nullable: true }
+        periodEnd: { type: string, format: date, nullable: true }
   securitySchemes: { bearerAuth: { type: http, scheme: bearer, bearerFormat: JWT } }

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

@@ -64,7 +64,7 @@ class DeliverySchemaContractTest {
 
         String overseas = Files.readString(Path.of("..", "deploy", "sql", "海外区域统一增量-MySQL8.sql"),
             StandardCharsets.UTF_8).toLowerCase();
-        assertTrue(overseas.contains("空库先执行 lastleg-service/src/main/resources/db/lastleg.sql 基线"));
+        assertTrue(overseas.contains("begin inline empty-database baseline: lastleg"));
         assertTrue(overseas.contains(createToken));
         assertTrue(overseas.indexOf(createToken) < overseas.indexOf("assert_phase5_lastleg_identifiers_migratable"));
         assertTrue(overseas.contains("alter table ll_delivery_order add column overseas_warehouse_name"));

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/controller/MerchantDeliveryControllerTest.java

@@ -134,6 +134,8 @@ class MerchantDeliveryControllerTest {
     private static DeliveryRequests.Transfer transferRequest() {
         return new DeliveryRequests.Transfer("merchant-key", LocalDateTime.now(), "SELF_DELIVERY", null, null,
             "ONE_PICKUP_ONE_DROP", "PALLET", null, null, null, null, null, null, null, null,
-            List.of(new DeliveryRequests.FeeItem("DELIVERY_FEE", "USD", BigDecimal.ZERO, null)));
+            List.of(new DeliveryRequests.FeeItem("DELIVERY_FEE", "派送费", "RECEIVABLE", "CNY",
+                new BigDecimal("10.00"), null, null, null, null, null, null, null, null,
+                null, null, null, null, null, null)));
     }
 }

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

@@ -8,12 +8,12 @@ import com.baiyue.lastleg.delivery.entity.OutboundOrder;
 import com.baiyue.lastleg.delivery.entity.OutboundPalletItem;
 import com.baiyue.lastleg.delivery.entity.OutboundPdaTask;
 import com.baiyue.lastleg.delivery.mapper.DeliveryOrderMapper;
-import com.baiyue.lastleg.delivery.mapper.DeliveryFeeMapper;
 import com.baiyue.lastleg.delivery.mapper.DeliveryOperationMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundOrderMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPalletItemMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPdaTaskMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPdaPickMapper;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.lastleg.dispatch.entity.DispatchItem;
 import com.baiyue.lastleg.dispatch.entity.DispatchOrder;
 import com.baiyue.lastleg.dispatch.mapper.DispatchItemMapper;
@@ -68,7 +68,7 @@ class DeliveryTransferServiceTest {
     @Mock OutboundOrderMapper outboundOrders;
     @Mock OutboundPalletItemMapper outboundPallets;
     @Mock DeliveryOrderMapper deliveryOrders;
-    @Mock DeliveryFeeMapper deliveryFees;
+    @Mock OverseasFeeSourceService feeSources;
     @Mock DeliveryOperationMapper deliveryOperations;
     @Mock InboundPlanPalletAllocationMapper planAllocations;
     @Mock InboundPlanLineMapper planLines;
@@ -94,7 +94,7 @@ class DeliveryTransferServiceTest {
         ReflectionTestUtils.setField(service, "outboundOrders", outboundOrders);
         ReflectionTestUtils.setField(service, "outboundPallets", outboundPallets);
         ReflectionTestUtils.setField(service, "deliveryOrders", deliveryOrders);
-        ReflectionTestUtils.setField(service, "deliveryFees", deliveryFees);
+        ReflectionTestUtils.setField(service, "feeSources", feeSources);
         ReflectionTestUtils.setField(service, "deliveryOperations", deliveryOperations);
         ReflectionTestUtils.setField(service, "planAllocations", planAllocations);
         ReflectionTestUtils.setField(service, "planLines", planLines);
@@ -644,7 +644,13 @@ class DeliveryTransferServiceTest {
     private static DeliveryRequests.Transfer transferRequest(String idempotencyKey, String remark) {
         return new DeliveryRequests.Transfer(idempotencyKey, LocalDateTime.now(), "SELF_DELIVERY", null, null,
             "ONE_PICKUP_ONE_DROP", "PALLET", null, null, null, null, null, null, null, remark,
-            List.of(new DeliveryRequests.FeeItem("DELIVERY_FEE", "USD", BigDecimal.ZERO, null)));
+            List.of(receivableDeliveryFee()));
+    }
+
+    private static DeliveryRequests.FeeItem receivableDeliveryFee() {
+        return new DeliveryRequests.FeeItem("DELIVERY_FEE", "派送费", "RECEIVABLE", "CNY",
+            new BigDecimal("10.00"), null, null, null, null, null, null, null, null,
+            null, null, null, null, null, null);
     }
 
     private static DispatchItem item(Long id, Long warehousePalletId, String palletNo, String destinationCode,

lastleg-service/src/test/java/com/baiyue/lastleg/financefee/service/OverseasContainerFeeSourceServiceTest.java

@@ -4,6 +4,7 @@ import com.baiyue.lastleg.financefee.dto.OverseasFeeSourceDtos.SaveRequest;
 import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
 import com.baiyue.lastleg.financefee.mapper.OverseasFeeCommandMapper;
 import com.baiyue.lastleg.financefee.mapper.OverseasFeeSourceMapper;
+import com.baiyue.lastleg.masterdata.exchange.mapper.MonthlyExchangeRateMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -22,7 +23,9 @@ class OverseasContainerFeeSourceServiceTest {
     private final OverseasFeeBusinessGuard guard = mock(OverseasFeeBusinessGuard.class);
     private final OverseasFeeOutboxService outbox = mock(OverseasFeeOutboxService.class);
     private final OverseasFeeSourceService service = new OverseasFeeSourceService(
-        mapper, commands, guard, outbox, new ObjectMapper().findAndRegisterModules());
+        mapper, commands, guard, outbox,
+        new OverseasFeeCurrencyConverter(mock(MonthlyExchangeRateMapper.class)),
+        new ObjectMapper().findAndRegisterModules());
 
     @Test
     void createsContainerFeeUsingTheRealContainerAsItsStableBusinessReference() {
@@ -50,7 +53,8 @@ class OverseasContainerFeeSourceServiceTest {
             source.warehouseId(), "CUSTOM_FEE", "自定义费", source.direction(), source.supplierId(),
             source.supplierName(), source.supplierCategory(), source.settlementMode(), source.paidAt(),
             source.paymentMethod(), source.paymentReferenceNo(), source.paymentVoucherFileIds(),
-            source.businessDate(), source.currency(), source.amount());
+            source.businessDate(), source.currency(), source.amount(), source.chargeableQuantity(),
+            source.quantityUnit(), source.unitPrice(), source.periodStart(), source.periodEnd());
         when(commands.find("operator-a", "CREATE", "bad-container-fee")).thenReturn(null);
 
         assertThatThrownBy(() -> service.create("operator-a", "bad-container-fee", request))

lastleg-service/src/test/java/com/baiyue/lastleg/financefee/service/OverseasFeeBusinessGuardTest.java

@@ -57,7 +57,8 @@ class OverseasFeeBusinessGuardTest {
             source.warehouseId(), source.feeItemCode(), source.feeItemName(), source.direction(), source.supplierId(),
             source.supplierName(), source.supplierCategory(), source.settlementMode(), source.paidAt(),
             source.paymentMethod(), source.paymentReferenceNo(), source.paymentVoucherFileIds(),
-            source.businessDate(), source.currency(), source.amount());
+            source.businessDate(), source.currency(), source.amount(), source.chargeableQuantity(),
+            source.quantityUnit(), source.unitPrice(), source.periodStart(), source.periodEnd());
         StubJdbc jdbc = new StubJdbc();
 
         assertThatThrownBy(() -> new OverseasFeeBusinessGuard(jdbc).requireOwned(inconsistent))
@@ -83,7 +84,8 @@ class OverseasFeeBusinessGuardTest {
         return new SaveRequest(customerId, "客户A", "OVERSEAS_CONTAINER_FEE", "OVERSEAS_CONTAINER",
             bookingId, containerNo, null, null, null, null, bookingId, containerNo, 91L,
             "PORT_FEE", "港口费", "RECEIVABLE", null, null, null, null, null, null, null,
-            List.of(), LocalDate.of(2026, 9, 8), "CNY", new BigDecimal("88.00"));
+            List.of(), LocalDate.of(2026, 9, 8), "CNY", new BigDecimal("88.00"),
+            null, null, null, null, null);
     }
 
     private static final class StubJdbc extends JdbcTemplate {

lastleg-service/src/test/java/com/baiyue/lastleg/financefee/service/OverseasFeeCurrencyConverterTest.java

@@ -0,0 +1,37 @@
+package com.baiyue.lastleg.financefee.service;
+
+import com.baiyue.lastleg.masterdata.exchange.entity.MonthlyExchangeRate;
+import com.baiyue.lastleg.masterdata.exchange.mapper.MonthlyExchangeRateMapper;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class OverseasFeeCurrencyConverterTest {
+    private final MonthlyExchangeRateMapper rates = mock(MonthlyExchangeRateMapper.class);
+    private final OverseasFeeCurrencyConverter converter = new OverseasFeeCurrencyConverter(rates);
+
+    @Test
+    void convertsUsdUsingTheActiveRateForTheBusinessMonth() {
+        MonthlyExchangeRate rate = new MonthlyExchangeRate();
+        rate.setStatus("ACTIVE"); rate.setUsdToCnyAverage(new BigDecimal("7.120000"));
+        when(rates.findMonth("2026-09")).thenReturn(rate);
+
+        var result = converter.convert("USD", new BigDecimal("12.34"), LocalDate.of(2026, 9, 9));
+
+        assertThat(result.originalAmount()).isEqualByComparingTo("12.34");
+        assertThat(result.exchangeRate()).isEqualByComparingTo("7.120000");
+        assertThat(result.settlementAmount()).isEqualByComparingTo("87.86");
+    }
+
+    @Test
+    void refusesUsdWhenTheBusinessMonthHasNoActiveRate() {
+        assertThatThrownBy(() -> converter.convert("USD", BigDecimal.TEN, LocalDate.of(2026, 9, 9)))
+            .hasMessageContaining("缺少有效USD兑CNY汇率");
+    }
+}

lastleg-service/src/test/java/com/baiyue/lastleg/financefee/service/OverseasFeeOutboxServiceTest.java

@@ -38,6 +38,8 @@ class OverseasFeeOutboxServiceTest {
         source.setFeeItemCode("PROCUREMENT_SERVICE"); source.setFeeItemName("采购服务费");
         source.setDirection("RECEIVABLE"); source.setBusinessDate(LocalDate.of(2026, 9, 2));
         source.setCurrency("CNY"); source.setAmount(new BigDecimal("120.00"));
+        source.setOriginalCurrency("USD"); source.setOriginalAmount(new BigDecimal("16.85"));
+        source.setExchangeRate(new BigDecimal("7.122000")); source.setExchangeRateMonth("2026-09");
         source.setReviewStatus("APPROVED"); source.setPublicationStatus("PUBLISHED");
         source.setSourceStatus("ACTIVE"); source.setPaymentVoucherFileIds(List.of());
 
@@ -52,5 +54,7 @@ class OverseasFeeOutboxServiceTest {
         assertThat(payload.inboundId()).isNull();
         assertThat(payload.inboundCode()).isNull();
         assertThat(payload.sourceHash()).startsWith("sha256:").hasSize(71);
+        assertThat(payload.originalCurrency()).isEqualTo("USD");
+        assertThat(payload.exchangeRateMonth()).isEqualTo("2026-09");
     }
 }

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

@@ -95,8 +95,18 @@ class ReceivingContainerContractTest {
         assertTrue(schema.contains("柜号全局唯一锁键"));
         assertTrue(schema.contains("create table if not exists ll_receiving_container_operation"));
         assertTrue(schema.contains("unique key uk_ll_receiving_operation(operator_key,idempotency_key)"));
+        assertFalse(tableBlock(schema, "ll_receiving_container_session").contains("customer_id"));
+        assertFalse(tableBlock(schema, "ll_receiving_container_operation").contains("customer_id"));
+        assertFalse(tableBlock(schema, "ll_container_shipping_gate").contains("customer_id"));
+        assertTrue(unified.contains("alter table ll_receiving_container_session drop column customer_id"));
+        assertTrue(unified.contains("alter table ll_receiving_container_operation drop column customer_id"));
+        assertTrue(unified.contains("alter table ll_container_shipping_gate drop column customer_id"));
         assertTrue(schema.contains("create table if not exists ll_receiving_sku_receipt"));
         assertTrue(schema.contains("unique key uk_ll_receiving_sku_pallet (customer_id,line_id,pallet_id,sku_code)"));
+        String order = tableBlock(schema, "ll_order");
+        assertTrue(order.contains("overseas_warehouse_id varchar(128) null"));
+        assertTrue(order.contains("overseas_warehouse_code varchar(128) null"));
+        assertTrue(order.contains("overseas_warehouse_name varchar(255) null"));
         String receivingSession = tableBlock(schema, "ll_receiving_container_session");
         assertTrue(receivingSession.contains("sign_photos json"));
         assertTrue(receivingSession.contains("overseas_warehouse_id bigint not null"));
@@ -128,14 +138,15 @@ class ReceivingContainerContractTest {
         assertTrue(yaml.contains(prefix + "/current/receipts/bulk:"));
         assertFalse(yaml.contains(prefix + "/current/skus/resolve:"));
         assertTrue(yaml.contains(prefix + "/current/receipts/carton:"));
+        assertTrue(yaml.contains(prefix + "/current/receipts/pallet:"));
         assertTrue(yaml.contains(prefix + "/current/complete:"));
         assertTrue(yaml.contains(prefix + "/current/unload-photos/files/{fileId}/download:"));
         assertFalse(yaml.contains("/api/pda/v1/last-leg/receiving-containers/{planNo}"));
         String receivingPaths = yaml.substring(yaml.indexOf(prefix), yaml.indexOf("/api/platform/v1/last-leg/orders:"));
         List<String> successResponses = receivingPaths.lines().map(String::trim)
             .filter(line -> line.startsWith("responses: { '200':")).toList();
-        assertEquals(16, successResponses.size());
-        assertEquals(12, successResponses.stream().filter(line -> line.contains("/schemas/Receiving")).count());
+        assertEquals(17, successResponses.size());
+        assertEquals(13, successResponses.stream().filter(line -> line.contains("/schemas/Receiving")).count());
         assertEquals(4, successResponses.stream().filter(line -> line.contains("/schemas/Pda")).count());
         assertTrue(receivingPaths.contains("返回 WAIT_SIGN、SIGNED 或 RECEIVING 当前柜"));
         assertTrue(receivingPaths.contains("仅 PLATFORM OVERSEAS_WAREHOUSE_PDA_OPERATOR 可用"));

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

@@ -3,6 +3,7 @@ package com.baiyue.lastleg.inboundplan.pda.gateway;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
+import org.springframework.http.HttpStatus;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestClient;
@@ -116,6 +117,23 @@ class HttpWarehouseResourceGatewayTest {
         server.verify();
     }
 
+    @Test
+    void resolveReservedFallsBackToConfirmedPhysicalBindingForEarlierPlanDisplayCode() {
+        server.expect(requestTo("http://warehouse/internal/v1/warehouse-pallets/resolve/IP-ACY2-20260909-166786-P001"))
+            .andRespond(withStatus(HttpStatus.NOT_FOUND));
+        server.expect(requestTo("http://warehouse/internal/v1/warehouse-pallets/resolve/id/31"))
+            .andRespond(withSuccess("""
+                {"code":"200","data":{"palletId":31,"palletCode":"PLT-US-LAX-01-31",
+                "warehouseId":21,"locationId":41,"status":"OCCUPIED","version":3,
+                "reservable":false,"reservationBlockReason":"PALLET_NOT_IDLE"}}
+                """, MediaType.APPLICATION_JSON));
+
+        var result = gateway.resolveReservedPallet("IP-ACY2-20260909-166786-P001", "11", 21L, 31L, 41L, 51L);
+
+        assertThat(result.palletId()).isEqualTo(31L);
+        server.verify();
+    }
+
     @Test
     void resolveReservedRejectsDifferentPhysicalBinding() {
         server.expect(requestTo("http://warehouse/internal/v1/warehouse-pallets/resolve/PAL-RESERVED"))
@@ -221,7 +239,7 @@ class HttpWarehouseResourceGatewayTest {
 
         var result = gateway.ensurePalletBatch(new WarehouseResourceGateway.PalletBatchEnsure(31L, "BATCH-1",
             List.of(new WarehouseResourceGateway.PalletBatchItemRequest(
-                100L, "CIP:1:1", "IP-21", 1, "STANDARD", "ONT8"))));
+                100L, "CIP:1:1", "IP-21", 1, "STANDARD", "ONT8", "CONT-ONT8-001"))));
 
         assertThat(result.batchId()).isEqualTo(41L);
         assertThat(result.items().get(0).resourceLockId()).isEqualTo(71L);

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

@@ -46,13 +46,15 @@ class InboundPdaContainerCompletionTest {
     }
 
     @Test
-    void twoPlansOfOneContainerStockInTogetherAndPublishOneContainerEvent() {
+    void twoCustomerPlansOfOneContainerStockInTogetherAndPublishOneContainerEvent() {
         InboundPlan first = plan(1L, "PLAN-1");
         InboundPlan second = plan(2L, "PLAN-2");
+        second.setCustomerId("200");
         InboundPdaTask firstTask = task(11L, 1L);
         InboundPdaTask secondTask = task(22L, 2L);
+        secondTask.setCustomerId("200");
         when(repository.lockTask("100", 1L)).thenReturn(firstTask);
-        when(repository.lockTask("100", 2L)).thenReturn(secondTask);
+        when(repository.lockTask("200", 2L)).thenReturn(secondTask);
         when(repository.lines(1L)).thenReturn(List.of(line(101L)));
         when(repository.lines(2L)).thenReturn(List.of(line(202L)));
         when(repository.allocations(1L)).thenReturn(List.of(allocation(101L)));
@@ -63,11 +65,12 @@ class InboundPdaContainerCompletionTest {
         when(orders.selectById(101L)).thenReturn(source);
         when(orders.selectById(102L)).thenReturn(source);
 
-        service.completeContainer("100", List.of(second, first));
-        service.completeContainer("100", List.of(first, second));
+        service.completeContainer(List.of(second, first));
+        service.completeContainer(List.of(first, second));
 
-        verify(stockReceipts, times(2)).stockIn(eq("100"), any(), any(), any(), any(), any(), any());
-        verify(outbox, times(1)).publishContainerCompleted(eq("100"), eq("BOOKING-1"), eq("CONT-1"),
+        verify(stockReceipts).stockIn(eq("100"), any(), any(), any(), any(), any(), any());
+        verify(stockReceipts).stockIn(eq("200"), any(), any(), any(), any(), any(), any());
+        verify(outbox, times(1)).publishContainerCompleted(eq("BOOKING-1"), eq("CONT-1"),
             any(Instant.class), any(Instant.class), anyLong());
         verify(repository, times(2)).update(any(InboundPlan.class));
         verify(repository, times(2)).update(any(InboundPdaTask.class));

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

@@ -592,7 +592,7 @@ class InboundPdaWorkflowServiceTest {
         verify(repository).update(plan);
         verify(stockReceipts).stockIn(eq("100"), eq(plan), eq(task), eq(List.of(targetLine)),
             eq(List.of(target, moved)), any(), any());
-        verify(unloadCompletedOutbox).publishContainerCompleted(eq("100"), eq("BOOKING-1"), eq("CONT-1"),
+        verify(unloadCompletedOutbox).publishContainerCompleted(eq("BOOKING-1"), eq("CONT-1"),
             any(), any(), anyLong());
     }
 

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

@@ -45,7 +45,7 @@ class InboundUnloadCompletedOutboxServiceTest {
         Instant photoUploadedAt = Instant.parse("2026-08-24T08:00:00Z");
         Instant containerCompletedAt = Instant.parse("2026-08-24T09:30:00Z");
 
-        service.publishContainerCompleted("100", "booking-1", "MSCU6639870",
+        service.publishContainerCompleted("booking-1", "MSCU6639870",
             containerCompletedAt, photoUploadedAt, 7);
 
         ArgumentCaptor<LastlegEventOutbox> captured = ArgumentCaptor.forClass(LastlegEventOutbox.class);
@@ -57,6 +57,8 @@ class InboundUnloadCompletedOutboxServiceTest {
         assertThat(payload.unloadingCompletedAt()).isEqualTo(containerCompletedAt);
         assertThat(payload.unloadingPhotoUploadedAt()).isEqualTo(photoUploadedAt);
         assertThat(row.getEventKey()).isEqualTo(EventTypes.OVERSEAS_CONTAINER_UNLOADED + ":booking-1");
+        assertThat(row.getCustomerId()).isEqualTo("0");
+        assertThat(envelope.tenantId()).isEqualTo("0");
         assertThat(envelope.aggregateId()).isEqualTo("booking-1");
     }
 
@@ -87,11 +89,11 @@ class InboundUnloadCompletedOutboxServiceTest {
 
     @Test
     void repeatedContainerCompletionDoesNotPublishAnotherEvent() {
-        LastlegEventOutbox existing = existing("100", "booking-1", "MSCU6639870");
+        LastlegEventOutbox existing = existing("0", "booking-1", "MSCU6639870");
         when(mapper.findByEventKey(EventTypes.OVERSEAS_CONTAINER_UNLOADED + ":booking-1"))
             .thenReturn(existing);
 
-        service.publishContainerCompleted("100", "booking-1", "MSCU6639870",
+        service.publishContainerCompleted("booking-1", "MSCU6639870",
             Instant.parse("2026-08-24T10:00:00Z"), Instant.parse("2026-08-24T08:00:00Z"), 8);
 
         verify(mapper, never()).insert(any(LastlegEventOutbox.class));
@@ -99,11 +101,11 @@ class InboundUnloadCompletedOutboxServiceTest {
 
     @Test
     void sameIdempotencyKeyCannotRepresentAnotherPhysicalContainer() {
-        LastlegEventOutbox existing = existing("100", "booking-1", "MSCU6639870");
+        LastlegEventOutbox existing = existing("0", "booking-1", "MSCU6639870");
         when(mapper.findByEventKey(EventTypes.OVERSEAS_CONTAINER_UNLOADED + ":booking-1"))
             .thenReturn(existing);
 
-        assertThatThrownBy(() -> service.publishContainerCompleted("100", "booking-1", "ZCSU7881970",
+        assertThatThrownBy(() -> service.publishContainerCompleted("booking-1", "ZCSU7881970",
             Instant.parse("2026-08-24T10:00:00Z"), Instant.parse("2026-08-24T08:00:00Z"), 8))
             .isInstanceOf(IllegalStateException.class)
             .hasMessageContaining("conflicts with another container");

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

@@ -93,7 +93,7 @@ class ReceivingContainerServiceBehaviorTest {
         when(lines.selectList(any())).thenReturn(List.of(line("FBA")));
         LastlegOrder order = containerOrder(1L, "100", "CONT-A", "BOOKING-A", "IN-1");
         when(orders.selectList(any())).thenReturn(List.of(order));
-        when(shippingGates.receivingAvailable("100", "CONT-A")).thenReturn(0);
+        when(shippingGates.receivingAvailable("BOOKING-A", "CONT-A")).thenReturn(0);
 
         assertThat(service.candidates("7", 100L)).isEmpty();
         assertThatThrownBy(() -> service.prepare("7", "receiver", 100L, "CONT-A",
@@ -118,7 +118,6 @@ class ReceivingContainerServiceBehaviorTest {
         assertThat(response.overseasWarehouseName()).isEqualTo("Shared LAX");
         ArgumentCaptor<ReceivingContainerSession> selected = ArgumentCaptor.forClass(ReceivingContainerSession.class);
         verify(sessions).insert(selected.capture());
-        assertThat(selected.getValue().getCustomerId()).isEqualTo("100");
         assertThat(selected.getValue().getActiveOperatorKey()).isEqualTo("OPERATOR:7");
         assertThat(selected.getValue().getActiveContainerKey()).isEqualTo("CONTAINER:CONT-A");
         ArgumentCaptor<ReceivingContainerOperation> saved = ArgumentCaptor.forClass(ReceivingContainerOperation.class);
@@ -131,7 +130,7 @@ class ReceivingContainerServiceBehaviorTest {
     }
 
     @Test
-    void pickerCandidatesSpanCustomersButEachContainerMustResolveOneCustomer() {
+    void pickerCandidatesAllowMultipleCustomersInTheSameContainer() {
         InboundPlan first = plan("CONT-A");
         InboundPlan second = plan("CONT-B"); second.setId(3L); second.setCustomerId("200");
         when(plans.selectList(any())).thenReturn(List.of(first, second), List.of(first), List.of(second));
@@ -149,7 +148,7 @@ class ReceivingContainerServiceBehaviorTest {
         when(orders.selectList(any())).thenReturn(List.of(
             containerOrder(1L, "100", "CONT-A", "BOOKING-A", "IN-1"),
             containerOrder(2L, "200", "CONT-A", "BOOKING-A", "IN-2")));
-        assertThat(service.candidates("7", 100L)).isEmpty();
+        assertThat(service.candidates("7", 100L)).extracting("containerNo").containsExactly("CONT-A");
     }
 
     @Test
@@ -311,6 +310,9 @@ class ReceivingContainerServiceBehaviorTest {
     @Test
     void detailRejectsContainerReservedByAnotherOperator() {
         when(plans.selectList(any())).thenReturn(List.of(plan("CONT-B")));
+        when(lines.selectList(any())).thenReturn(List.of(line("FBA")));
+        when(orders.selectList(any())).thenReturn(List.of(
+            containerOrder(1L, "100", "CONT-B", "BOOKING-B", "IN-1")));
         ReceivingContainerSession other = session("CONT-B", "SIGNED");
         other.setOperatorKey("8"); other.setActiveOperatorKey("OPERATOR:8");
         other.setActiveContainerKey("CONTAINER:CONT-B");
@@ -324,6 +326,9 @@ class ReceivingContainerServiceBehaviorTest {
     @Test
     void waitSignSelectionAlreadyLocksAccountFromViewingAnotherContainer() {
         when(plans.selectList(any())).thenReturn(List.of(plan("CONT-B")));
+        when(lines.selectList(any())).thenReturn(List.of(line("FBA")));
+        when(orders.selectList(any())).thenReturn(List.of(
+            containerOrder(1L, "100", "CONT-B", "BOOKING-B", "IN-1")));
         when(sessions.findActiveByOperator("OPERATOR:7")).thenReturn(session("CONT-A", "WAIT_SIGN"));
         assertThatThrownBy(() -> service.detail("7", 100L, "CONT-B"))
             .isInstanceOf(ResponseStatusException.class).hasMessageContaining("409");
@@ -364,6 +369,22 @@ class ReceivingContainerServiceBehaviorTest {
         verifyNoInteractions(warehouse);
     }
 
+    @Test
+    void dropshipFbaBulkReceiveIsRejectedBeforeWarehouseCalls() {
+        stubCurrent("FBA", "CONT-A");
+        LastlegOrder dropshipOrder = order("FBA");
+        dropshipOrder.setOrderType("ONE_CLICK_DROPSHIP");
+        when(orders.selectById(1L)).thenReturn(dropshipOrder);
+
+        assertThatThrownBy(() -> service.receiveBulk("7", "receiver",
+            new ReceivingContainerRequests.BulkReceive("IN-1", "PAL-1", 1, "dropship-bulk-key")))
+            .isInstanceOf(ResponseStatusException.class)
+            .hasMessageContaining("complete source pallet");
+
+        verifyNoInteractions(warehouse);
+        verifyNoInteractions(workflow);
+    }
+
     @Test
     void crossContainerCartonAndMismatchedPalletAreRejectedBeforeReservation() {
         stubCurrent("OVERSEAS", "CONT-A");
@@ -397,8 +418,6 @@ class ReceivingContainerServiceBehaviorTest {
 
         org.mockito.Mockito.reset(plans, lines, orders, sessions, operations, cartons, warehouse, pallets, workflow);
         stubCurrent("OVERSEAS", "CONT-A");
-        when(cartons.selectOne(any())).thenReturn(carton(1L, "BOX-1"));
-        when(pallets.selectList(any())).thenReturn(List.of(planPallet()));
         assertThatThrownBy(() -> service.receiveCarton("7", "receiver",
             new ReceivingContainerRequests.CartonReceive("BOX-1", "PAL-1", "duplicate-key")))
             .isInstanceOf(ResponseStatusException.class);
@@ -429,7 +448,25 @@ class ReceivingContainerServiceBehaviorTest {
         when(allocations.selectList(any())).thenReturn(List.of(partial));
         assertThatThrownBy(() -> service.complete("7", new ReceivingContainerRequests.Action("complete-key")))
             .isInstanceOf(ResponseStatusException.class).hasMessageContaining("409");
-        verify(workflow, never()).completeContainer(any(), any());
+        verify(workflow, never()).completeContainer(any());
+    }
+
+    @Test
+    void dropshipWholePalletCanCompleteWithoutBulkSkuReceiptRows() {
+        stubCurrent("FBA", "CONT-A");
+        LastlegOrder dropshipOrder = order("FBA");
+        dropshipOrder.setOrderType("ONE_CLICK_DROPSHIP");
+        when(orders.selectById(1L)).thenReturn(dropshipOrder);
+        InboundPlanPalletAllocation received = new InboundPlanPalletAllocation();
+        received.setLineId(10L); received.setPickedPackageCount(2);
+        when(allocations.selectList(any())).thenReturn(List.of(received));
+        when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
+
+        var completed = service.complete("7", new ReceivingContainerRequests.Action("dropship-complete"));
+
+        assertThat(completed.status()).isEqualTo("COMPLETED");
+        verifyNoInteractions(skuReceipts);
+        verify(workflow).completeContainer(any());
     }
 
     @Test
@@ -492,6 +529,39 @@ class ReceivingContainerServiceBehaviorTest {
             org.mockito.ArgumentMatchers.same(occupied));
     }
 
+    @Test
+    void bulkReceivingAcceptsFrozenSourcePalletCodeForItsPreReservedResource() {
+        stubCurrent("FBA", "CONT-A");
+        stubSku();
+        InboundPlanPallet reserved = planPallet();
+        reserved.setPalletNo("PAL-RESERVED");
+        reserved.setSourcePalletNo("CC001");
+        reserved.setWarehousePalletId(30L);
+        reserved.setWarehouseLocationId(40L);
+        reserved.setWarehouseResourceLockId(50L);
+        reserved.setAssignmentStatus("RESERVED");
+        when(pallets.selectList(any())).thenReturn(List.of(reserved));
+        WarehouseResourceGateway.WarehousePalletReference occupied =
+            new WarehouseResourceGateway.WarehousePalletReference(30L, "PAL-RESERVED", 100L, 40L,
+                "OCCUPIED", "FBA-1", 0);
+        when(warehouse.resolveReservedPallet("PAL-RESERVED", "100", 100L, 30L, 40L, 50L))
+            .thenReturn(occupied);
+        when(workflow.receiveBulkResolved(any(), any(), any(), any(), anyInt(), any(), any()))
+            .thenReturn(1);
+        when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
+        when(operations.insert(any(ReceivingContainerOperation.class))).thenReturn(1);
+
+        var result = service.receiveBulk("7", "receiver",
+            new ReceivingContainerRequests.BulkReceive("IN-1", "CC001", 1, "source-code-key"));
+
+        assertThat(result.palletCode()).isEqualTo("PAL-RESERVED");
+        verify(warehouse).resolveReservedPallet("PAL-RESERVED", "100", 100L, 30L, 40L, 50L);
+        verify(warehouse, never()).resolveAvailablePallet("CC001");
+        verify(workflow).assignResolvedPallet(org.mockito.ArgumentMatchers.eq("100"),
+            any(InboundPlan.class), org.mockito.ArgumentMatchers.same(reserved),
+            org.mockito.ArgumentMatchers.same(occupied));
+    }
+
     @Test
     void signRequiresEachTypedPhotoExactlyOnceAndRestoresRoles() {
         when(sessions.lockActiveByOperator("OPERATOR:7")).thenReturn(session("CONT-A", "WAIT_SIGN"));
@@ -516,9 +586,9 @@ class ReceivingContainerServiceBehaviorTest {
                 "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/2092476334483931138/download",
                 "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/2/download",
                 "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/3/download");
-        verify(unloadPhotos).validate("100", 8L, 2092476334483931138L);
-        verify(unloadPhotos).validate("100", 8L, 2L);
-        verify(unloadPhotos).validate("100", 8L, 3L);
+        verify(unloadPhotos).validate("0", 8L, 2092476334483931138L);
+        verify(unloadPhotos).validate("0", 8L, 2L);
+        verify(unloadPhotos).validate("0", 8L, 3L);
     }
 
     @Test
@@ -558,7 +628,7 @@ class ReceivingContainerServiceBehaviorTest {
     }
 
     @Test
-    void currentSignedPhotoCanBeDownloadedOnlyThroughItsOperatorCustomerAndSessionScope() {
+    void currentSignedPhotoCanBeDownloadedOnlyThroughItsPlatformSessionScope() {
         ReceivingContainerSession current = session("CONT-A", "SIGNED");
         current.setSignPhotos("[{\"role\":\"LICENSE_PLATE\",\"fileId\":\"9\"},"
             + "{\"role\":\"CONTAINER_SEAL\",\"fileId\":\"10\"},"
@@ -566,10 +636,10 @@ class ReceivingContainerServiceBehaviorTest {
         when(sessions.findActiveByOperator("OPERATOR:7")).thenReturn(current);
         UnloadPhotoFileGateway.DownloadedFile expected =
             new UnloadPhotoFileGateway.DownloadedFile("image".getBytes(), "plate.jpg", "image/jpeg");
-        when(unloadPhotos.download("100", 8L, 9L)).thenReturn(expected);
+        when(unloadPhotos.download("0", 8L, 9L)).thenReturn(expected);
 
         assertThat(service.downloadCurrentPhoto("7", "9")).isSameAs(expected);
-        verify(unloadPhotos).download("100", 8L, 9L);
+        verify(unloadPhotos).download("0", 8L, 9L);
     }
 
     @Test
@@ -743,6 +813,38 @@ class ReceivingContainerServiceBehaviorTest {
         verify(cartons, never()).insert(any(InboundPlanCarton.class));
     }
 
+    @Test
+    void dropshipReceivesTheCompleteFrozenSourcePalletThroughTheContainerSession() {
+        stubCurrent("OVERSEAS", "CONT-A");
+        LastlegOrder dropship = order("OVERSEAS"); dropship.setOrderType("ONE_CLICK_DROPSHIP");
+        when(orders.selectById(1L)).thenReturn(dropship);
+        InboundPlanPallet pallet = planPallet();
+        pallet.setPalletNo("PAL-PHYSICAL-1"); pallet.setSourcePalletNo("DP-260909-0001");
+        InboundPlanPalletAllocation pending = new InboundPlanPalletAllocation();
+        pending.setId(30L); pending.setCustomerId("100"); pending.setPlanId(2L);
+        pending.setLineId(10L); pending.setPalletId(20L); pending.setPlannedPackageCount(2);
+        InboundPlanPalletAllocation received = new InboundPlanPalletAllocation();
+        received.setId(30L); received.setCustomerId("100"); received.setPlanId(2L);
+        received.setLineId(10L); received.setPalletId(20L); received.setPlannedPackageCount(2);
+        received.setPickedPackageCount(2);
+        when(pallets.selectList(any())).thenReturn(List.of(pallet));
+        when(allocations.selectList(any())).thenReturn(List.of(pending), List.of(received));
+        when(operations.insert(any(ReceivingContainerOperation.class))).thenReturn(1);
+        when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
+
+        var result = service.receiveWholePallet("7", "receiver",
+            new ReceivingContainerRequests.WholePalletReceive("DP-260909-0001", "whole-key"));
+
+        assertThat(result.acceptedPackages()).isEqualTo(2);
+        assertThat(result.receivedPackages()).isEqualTo(2);
+        assertThat(result.pendingPackages()).isZero();
+        assertThat(result.palletCode()).isEqualTo("PAL-PHYSICAL-1");
+        verify(workflow).pickWholePallet(org.mockito.ArgumentMatchers.eq("100"),
+            org.mockito.ArgumentMatchers.eq("PLAN-1"), org.mockito.ArgumentMatchers.eq(30L),
+            any(com.baiyue.lastleg.inboundplan.pda.dto.PdaRequests.WholePalletOperation.class));
+        verifyNoInteractions(warehouse);
+    }
+
     private void stubCurrent(String destinationType, String containerNo) {
         InboundPlan plan = plan(containerNo);
         InboundPlanLine line = line(destinationType);
@@ -800,7 +902,7 @@ class ReceivingContainerServiceBehaviorTest {
 
     private static ReceivingContainerSession session(String containerNo, String status) {
         ReceivingContainerSession value = new ReceivingContainerSession();
-        value.setId(8L); value.setCustomerId("100"); value.setContainerNo(containerNo); value.setOperatorKey("7");
+        value.setId(8L); value.setContainerNo(containerNo); value.setOperatorKey("7");
         value.setOverseasWarehouseId(100L); value.setOverseasWarehouseCode("SHARED-LAX");
         value.setOverseasWarehouseName("Shared LAX");
         value.setStatus(status); value.setVersion(0);

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

@@ -117,7 +117,7 @@ class ContainerInboundPlanConversionCoordinatorTest {
     @Test
     void reservationMustMatchEveryStableItemIdentity() throws Exception {
         var expected = new ContainerInboundPlanConversionCoordinator.PreparedItem(
-            "100", 11L, 21L, "IP-21", 1, 1, "CIP:1:1", "ONT8");
+            "100", 11L, 21L, "IP-21", 1, 1, "CIP:1:1", "ONT8", "CONT-ONT8-001");
         var preparation = new ContainerInboundPlanConversionCoordinator.Preparation(31L, List.of(expected));
         var response = new WarehouseResourceGateway.PalletBatchResponse(41L, "BATCH-1", "RESERVED", 1,
             false, List.of(new WarehouseResourceGateway.PalletBatchItem(
@@ -239,6 +239,8 @@ class ContainerInboundPlanConversionCoordinatorTest {
         when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
         when(numbers.next(eq("INBOUND_PLAN"), any(String.class), any(Long.class)))
             .thenReturn("IP-FBA", "IP-OVERSEAS");
+        when(plans.sourcePalletNos("100", 11L, "ONE_CLICK_DROPSHIP")).thenReturn(List.of("MSCU6639870-ABE3-001"));
+        when(plans.sourcePalletNos("200", 12L, "ONE_CLICK_DROPSHIP")).thenReturn(List.of("MSCU6639870-US-LAX-01-001"));
 
         ContainerPlanConversionCommand command = ReflectionTestUtils.invokeMethod(coordinator, "prepareCommand",
             1L, 2L, BOOKING_ID, "FIRST-KEY", request,
@@ -256,6 +258,38 @@ class ContainerInboundPlanConversionCoordinatorTest {
             .map(ContainerInboundPlanConversionCoordinator.PreparedItem::fbaWarehouseCode).toList());
     }
 
+    @Test
+    void standardOverseasOrdersLetWarehouseGeneratePhysicalPalletCodes() {
+        ConvertContainerInboundPlanRequest request = request();
+        var overseas = new ContainerInboundPlanPreviewResponse.Order(
+            "200", "Customer 200", "12", "LM-12", "RK-OVERSEAS", "FIRST_LEG", "FIRST_LEG",
+            "31", "US-LAX-01", "Los Angeles", null, 10, BigDecimal.ONE, 2,
+            null, null, null, 0, "READY", List.of());
+        var preview = new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
+            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 2, 2, 0, 1, 0, true,
+            List.of(new ContainerInboundPlanPreviewResponse.Group("FIRST_LEG", "31", "US-LAX-01", "Los Angeles",
+                1, 1, 2, 0, 2, 0, List.of(overseas))));
+        when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
+        when(numbers.next(eq("INBOUND_PLAN"), any(String.class), any(Long.class))).thenReturn("IP-OVERSEAS");
+        when(plans.sourcePalletNos("200", 12L, "FIRST_LEG")).thenReturn(List.of());
+
+        ContainerPlanConversionCommand command = ReflectionTestUtils.invokeMethod(coordinator, "prepareCommand",
+            1L, 2L, BOOKING_ID, "FIRST-KEY", request,
+            ReflectionTestUtils.invokeMethod(coordinator, "hash",
+                List.of(BOOKING_ID, request.snapshotVersion(), request.snapshotHash())));
+        ContainerInboundPlanConversionCoordinator.Preparation preparation;
+        try {
+            preparation = objectMapper.readValue(command.getPreparationJson(),
+                ContainerInboundPlanConversionCoordinator.Preparation.class);
+        } catch (Exception exception) {
+            throw new AssertionError(exception);
+        }
+
+        assertEquals(2, preparation.items().size());
+        assertEquals(java.util.Arrays.asList(null, null), preparation.items().stream()
+            .map(ContainerInboundPlanConversionCoordinator.PreparedItem::palletCode).toList());
+    }
+
     private ContainerInboundPlanPreviewResponse.Order previewOrder(String customerId, String orderId,
                                                                     String inboundCode, String destinationCode,
                                                                     String fbaWarehouseCode) {
@@ -291,7 +325,7 @@ class ContainerInboundPlanConversionCoordinatorTest {
 
     private void setOnePreparedItem(ContainerPlanConversionCommand command) throws Exception {
         var item = new ContainerInboundPlanConversionCoordinator.PreparedItem(
-            "100", 11L, 21L, "IP-21", 1, 1, "CIP:1:1", "ONT8");
+            "100", 11L, 21L, "IP-21", 1, 1, "CIP:1:1", "ONT8", "CONT-ONT8-001");
         command.setPreparationJson(objectMapper.writeValueAsString(
             new ContainerInboundPlanConversionCoordinator.Preparation(31L, List.of(item))));
     }

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

@@ -7,11 +7,19 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 class DestuffingPalletCostServiceTest {
+    @Test void publishesDestuffingReceivableAsOverseasContainerBusiness() {
+        assertThat(DestuffingPalletCostService.DESTUFF_BUSINESS_TYPE).isEqualTo("OVERSEAS_CONTAINER");
+    }
     @Test void newestCompletedBookingsAreNotStarvedByOldUnbillableRows() {
         assertThat(DestuffingPalletCostService.READY_BOOKINGS_SQL)
             .contains("ORDER BY MAX(t.completed_at) DESC LIMIT 50")
             .doesNotContain("ORDER BY MIN(t.completed_at)");
     }
+    @Test void chargesOnlyPalletsWithPositiveReceivedPackagesAndVolume() {
+        assertThat(DestuffingPalletCostService.RECEIVED_PALLET_IDS_SQL)
+            .contains("pp.actual_package_count>0")
+            .contains("pp.actual_volume_cbm>0");
+    }
     @Test void preservesTotalAndLetsFinalCustomerAbsorbRoundingRemainder() {
         List<BigDecimal> result = DestuffingPalletCostService.allocate(new BigDecimal("10.00"),
             List.of(new BigDecimal("1"), new BigDecimal("1"), new BigDecimal("1")));

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

@@ -18,6 +18,7 @@ import com.baiyue.lastleg.dropship.model.DropshipPalletSnapshot;
 import com.baiyue.lastleg.dropship.service.DropshipOrderService;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.mapper.LastlegOrderCommandRecordMapper;
+import com.baiyue.lastleg.mapper.LastlegSourcePalletMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -55,6 +57,7 @@ class InboundPlanServiceTest {
     @Mock DropshipOrderService dropshipOrders;
     @Mock WarehouseResourceGateway warehouseGateway;
     @Mock LastlegOrderCommandRecordMapper commandMapper;
+    @Mock LastlegSourcePalletMapper sourcePalletMapper;
 
     private InboundPlanService service;
 
@@ -70,11 +73,14 @@ class InboundPlanServiceTest {
         ReflectionTestUtils.setField(service, "dropshipOrders", dropshipOrders);
         ReflectionTestUtils.setField(service, "warehouseGateway", warehouseGateway);
         ReflectionTestUtils.setField(service, "commandMapper", commandMapper);
+        ReflectionTestUtils.setField(service, "sourcePalletMapper", sourcePalletMapper);
         ReflectionTestUtils.setField(service, "objectMapper", JsonMapper.builder().findAndAddModules().build());
         ReflectionTestUtils.setField(service, "orderNoGenerator", new com.baiyue.lastleg.service.LastlegOrderNoGenerator());
         org.mockito.Mockito.lenient().when(lineMapper.selectList(any())).thenReturn(List.of());
         org.mockito.Mockito.lenient().when(palletMapper.selectList(any())).thenReturn(List.of());
         org.mockito.Mockito.lenient().when(allocationMapper.selectList(any())).thenReturn(List.of());
+        org.mockito.Mockito.lenient().when(sourcePalletMapper.palletNos(any(), anyLong()))
+            .thenAnswer(invocation -> List.of("MSCU6639870-WH-" + invocation.getArgument(1)));
         org.mockito.Mockito.lenient().when(orderMapper.findReceivingWarehouse(any(), any())).thenReturn(
             new InboundPlanOrderMapper.ReceivingWarehouseSnapshot(
                 "193000000000200003", "US-LAX-01", "洛杉矶仓"));
@@ -472,6 +478,41 @@ class InboundPlanServiceTest {
             .map(InboundPlanPalletAllocation::getPlannedPackageCount).toList());
     }
 
+    @Test
+    void standardOverseasContainerConversionAllowsMissingSourcePalletSnapshot() {
+        when(orderMapper.lockContainerOrders("BOOKING-1")).thenReturn(List.of(
+            new InboundPlanOrderMapper.ContainerOrderRef("100", 1L, "PENDING_ASSIGNMENT",
+                "MSCU6639870", "STANDARD")));
+        when(orderMapper.lockOrder("100", 1L)).thenReturn(List.of(order("100", 1L, "RK-1", "WH-A")));
+        when(sourcePalletMapper.palletNos("100", 1L)).thenReturn(List.of());
+        when(orderMapper.markPlanned(any(), any(), any(), org.mockito.ArgumentMatchers.anyInt(), any()))
+            .thenReturn(1);
+
+        var result = service.convertContainer("BOOKING-1");
+
+        assertEquals(1, result.size());
+        verify(planMapper).insert(any(InboundPlan.class));
+    }
+
+    @Test
+    void standardFbaContainerConversionStillRequiresSourcePalletSnapshot() {
+        when(orderMapper.lockContainerOrders("BOOKING-1")).thenReturn(List.of(
+            new InboundPlanOrderMapper.ContainerOrderRef("100", 1L, "PENDING_ASSIGNMENT",
+                "MSCU6639870", "STANDARD")));
+        SourceOrderSnapshot fba = new SourceOrderSnapshot(1L, "100", "MSCU6639870", "RK-1",
+            "PENDING_ASSIGNMENT", null, BigDecimal.ONE, 10, 1,
+            "193000000000200003", "US-LAX-01", "洛杉矶仓", "ABE3",
+            "FBA-1", "ABE3", "ABE3", 1, 0);
+        when(orderMapper.lockOrder("100", 1L)).thenReturn(List.of(fba));
+        when(sourcePalletMapper.palletNos("100", 1L)).thenReturn(List.of());
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class,
+            () -> service.convertContainer("BOOKING-1"));
+
+        assertEquals("散货订单缺少头程托盘码快照", error.getReason());
+        verify(planMapper, never()).insert(any(InboundPlan.class));
+    }
+
     @Test
     void invalidLaterOrderCausesNoWritesBecauseWholeContainerIsPrevalidated() {
         when(orderMapper.lockContainerOrders("BOOKING-1")).thenReturn(List.of(

lastleg-service/src/test/java/com/baiyue/lastleg/pda/warehouse/PdaWarehouseContractTest.java

@@ -60,6 +60,14 @@ class PdaWarehouseContractTest {
             .contains("unique key uk_ll_pda_history_idempotency(operator_key,idempotency_key)");
     }
 
+    @Test
+    void sharedContainerHistoryDoesNotReadRemovedCustomerScope() throws Exception {
+        String mapper = Files.readString(Path.of(
+            "src/main/java/com/baiyue/lastleg/pda/warehouse/mapper/PdaWarehouseMapper.java"));
+        assertThat(mapper).contains("NULL customer_id")
+            .doesNotContain("s.customer_id");
+    }
+
     @Test
     void openApiAndGatewayPublishOnlyStablePdaPaths() throws Exception {
         String openapi = Files.readString(Path.of("src/main/resources/openapi/overseas-pda-operations-v1.yaml"));

lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/OverseasProcurementServiceTest.java

@@ -10,6 +10,8 @@ import com.baiyue.lastleg.procurement.mapper.OverseasProcurementFileMapper;
 import com.baiyue.lastleg.procurement.mapper.OverseasProcurementFeeMapper;
 import com.baiyue.lastleg.procurement.gateway.ProcurementFileGateway;
 import com.baiyue.lastleg.wallet.WalletCommandOutboxService;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
 import com.baiyue.lastleg.masterdata.quote.service.PartnerWarehouseDirectory;
 import com.baiyue.lastleg.masterdata.quote.dto.OverseasQuoteResponses;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -46,6 +48,7 @@ class OverseasProcurementServiceTest {
     @Mock OverseasProcurementFeeMapper procurementFees;
     @Mock ProcurementFileGateway fileGateway;
     @Mock WalletCommandOutboxService walletCommands;
+    @Mock OverseasFeeSourceService feeSources;
     private OverseasProcurementService service;
 
     @BeforeEach
@@ -60,6 +63,8 @@ class OverseasProcurementServiceTest {
         ReflectionTestUtils.setField(service, "procurementFees", procurementFees);
         ReflectionTestUtils.setField(service, "fileGateway", fileGateway);
         ReflectionTestUtils.setField(service, "walletCommands", walletCommands);
+        ReflectionTestUtils.setField(service, "feeSources", feeSources);
+        lenient().when(feeSources.publishApproved(anyString(), anyString(), any())).thenReturn(new OverseasFeeSource());
         lenient().when(orderNoGenerator.next(anyString(), any())).thenReturn("ACME202609050001");
         lenient().when(procurementFiles.selectList(any())).thenReturn(List.of());
         lenient().when(procurementFees.selectList(any())).thenReturn(List.of());

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

@@ -28,6 +28,8 @@ import com.baiyue.lastleg.delivery.entity.OutboundPdaTask;
 import com.baiyue.lastleg.delivery.mapper.OutboundOrderMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPalletItemMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPdaTaskMapper;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -69,6 +71,7 @@ class RelabelApplicationServiceTest {
     @Mock OutboundOrderMapper outboundOrders;
     @Mock OutboundPalletItemMapper outboundItems;
     @Mock OutboundPdaTaskMapper outboundTasks;
+    @Mock OverseasFeeSourceService feeSources;
     @Spy LastlegOrderNoGenerator orderNoGenerator = new LastlegOrderNoGenerator();
 
     private RelabelApplicationService service;
@@ -99,6 +102,8 @@ class RelabelApplicationServiceTest {
         balance.setOverseasWarehouseId("WH-1"); balance.setInboundOrderId(301L); balance.setInboundOrderNo("IN-1");
         balance.setInboundCode("CODE-1"); balance.setSkuCode("SKU-A"); balance.setProductNameZh("Chinese name");
         lenient().when(inventoryBalances.selectById(any(Long.class))).thenReturn(balance);
+        ReflectionTestUtils.setField(service, "feeSources", feeSources);
+        lenient().when(feeSources.publishApproved(any(), any(), any())).thenReturn(new OverseasFeeSource());
     }
 
     @Test

lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java

@@ -14,7 +14,7 @@ class Phase5OverseasUpgradeSqlContractTest {
     private static final List<String> PHASE5_TABLES = List.of(
         "ll_dispatch_pda_task", "ll_dispatch_pda_pick", "ll_dispatch_pda_operation",
         "ll_dispatch_pda_pick_order", "ll_outbound_order", "ll_outbound_pallet_item",
-        "ll_outbound_pda_task", "ll_outbound_pda_pick", "ll_delivery_order", "ll_delivery_fee",
+        "ll_outbound_pda_task", "ll_outbound_pda_pick", "ll_delivery_order",
         "ll_delivery_operation", "ll_dropship_order_profile", "ll_dropship_carton",
         "ll_dropship_sku_inventory", "ll_dropship_carton_ledger", "ll_exception_order",
         "ll_exception_return_item", "ll_exception_order_command", "ll_customer_visit");

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

@@ -27,11 +27,21 @@ class LastlegSecurityContractTest {
                 "UPDATE ll_security_projection SET roles_json=JSON_ARRAY() WHERE roles_json IS NULL",
                 "UPDATE ll_security_projection SET authorities_json=JSON_ARRAY() WHERE authorities_json IS NULL");
         for (String sql : new String[]{baseline, migration}) {
-            assertThat(sql).contains("('USER','1000001',0,'ACTIVE',0,JSON_ARRAY(),JSON_ARRAY(),0",
-                    "('AUTHORIZATION','1000001',0,NULL,0,JSON_ARRAY(),JSON_ARRAY(),0",
+            assertThat(sql).contains("SET @platform_admin_overseas_roles = JSON_ARRAY('PLATFORM_ADMIN')",
+                    "SET @platform_admin_overseas_authorities = JSON_ARRAY(",
+                    "('USER','1000001',0,'ACTIVE',0,JSON_ARRAY(),JSON_ARRAY(),0",
+                    "('AUTHORIZATION','1000001',0,NULL,0,@platform_admin_overseas_roles,@platform_admin_overseas_authorities,0",
                     "baseline-platform-admin-user-v0",
-                    "baseline-platform-admin-authorization-v0")
-                    .doesNotContain("baseline-merchant-admin");
+                    "baseline-platform-admin-authorization-v0",
+                    "platform:overseas-warehouse:last-mile-order:list",
+                    "platform:overseas-warehouse:inbound-order:list",
+                    "platform:overseas-warehouse:dispatch:list",
+                    "platform:overseas-business:purchase:list",
+                    "platform:overseas-master-data:quote:list",
+                    "platform:finance:fee-source:review",
+                    "AND aggregate_version=0 AND last_event_id='baseline-platform-admin-authorization-v0'")
+                    .doesNotContain("('AUTHORIZATION','1000001',0,NULL,0,JSON_ARRAY(),JSON_ARRAY(),0",
+                            "baseline-merchant-admin");
         }
         assertThat(authSeed).contains("(1000001, 'platform_admin'", "default_tenant_id",
                 "default_app_code");

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

@@ -12,7 +12,8 @@ import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
-import com.baiyue.lastleg.mapper.LastlegOrderFeeMapper;
+import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
+import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
@@ -28,6 +29,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import java.util.List;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.math.BigDecimal;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,7 +55,7 @@ class LastlegOrderServiceTest {
     @Mock LastlegOrderMapper orders;
     @Mock LastlegOrderDetailMapper details;
     @Mock LastlegOrderStatusHistoryMapper histories;
-    @Mock LastlegOrderFeeMapper fees;
+    @Mock OverseasFeeSourceService feeSources;
     @Mock LastlegOrderOperationLogMapper operations;
     @Mock LastlegOrderManualNodeMapper manualNodes;
     @Mock InboundPlanCartonMapper cartons;
@@ -70,7 +72,7 @@ class LastlegOrderServiceTest {
         ReflectionTestUtils.setField(service, "orderMapper", orders);
         ReflectionTestUtils.setField(service, "detailMapper", details);
         ReflectionTestUtils.setField(service, "historyMapper", histories);
-        ReflectionTestUtils.setField(service, "feeMapper", fees);
+        ReflectionTestUtils.setField(service, "feeSources", feeSources);
         ReflectionTestUtils.setField(service, "operationLogMapper", operations);
         ReflectionTestUtils.setField(service, "manualNodeMapper", manualNodes);
         ReflectionTestUtils.setField(service, "cartonMapper", cartons);
@@ -140,7 +142,7 @@ class LastlegOrderServiceTest {
         when(orders.selectOne(any())).thenReturn(order);
         when(details.selectList(any())).thenReturn(List.of());
         when(histories.selectList(any())).thenReturn(List.of());
-        when(fees.selectList(any())).thenReturn(List.of());
+        when(feeSources.listForBusiness("100", "LASTLEG_ORDER", 11L)).thenReturn(List.of());
         when(operations.selectList(any())).thenReturn(List.of());
         when(manualNodes.selectList(any())).thenReturn(List.of());
 
@@ -186,14 +188,21 @@ class LastlegOrderServiceTest {
     void createFeePersistsFeeAndOperationForOwnedOrder() {
         when(orders.selectOne(any())).thenReturn(order(11L, "100", "PENDING_ASSIGNMENT", null));
         var request = new LastlegOrderRequests.CreateFee(
-            "清关费", "USD", new BigDecimal("420.00"), "PENDING_REVIEW", "报关代理");
+            "CUSTOMS_CLEARANCE", "清关费", "RECEIVABLE", "USD", new BigDecimal("420.00"),
+            LocalDate.of(2026, 9, 9), null, null, null, null, null, null, null, List.of(),
+            null, null, null, null, null);
+        OverseasFeeSource draft = new OverseasFeeSource();
+        draft.setSourceFeeId(701L); draft.setCustomerId("100"); draft.setFeeItemName("清关费");
+        draft.setOriginalCurrency("USD"); draft.setOriginalAmount(new BigDecimal("420.00"));
+        when(feeSources.create(eq("platform_admin"), eq("fee-key"), any())).thenReturn(draft);
+        when(feeSources.submit(701L, "platform_admin", "fee-key:submit")).thenReturn(draft);
 
-        var fee = service.createFee("100", 11L, request, "platform_admin");
+        var fee = service.createFee("100", 11L, request, "platform_admin", "fee-key");
 
         assertEquals("100", fee.getCustomerId());
-        assertEquals("清关费", fee.getFeeItem());
-        assertEquals(new BigDecimal("420.00"), fee.getAmount());
-        verify(fees).insert(any(com.baiyue.lastleg.entity.LastlegOrderFee.class));
+        assertEquals("清关费", fee.getFeeItemName());
+        verify(feeSources).create(eq("platform_admin"), eq("fee-key"), any());
+        verify(feeSources).submit(701L, "platform_admin", "fee-key:submit");
         verify(operations).insert(any(com.baiyue.lastleg.entity.LastlegOrderOperationLog.class));
     }
 

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

@@ -4,17 +4,17 @@ import com.baiyue.common.event.*; import com.baiyue.lastleg.entity.*; import com
 class LoadingCompletedConsumerTest {
  private final Map<String,String> frozenContainerNos=new HashMap<>();
  @Mock LastlegEventInboxMapper inbox; @Mock LastlegOrderMapper orders; @Mock LastlegInboundOrderMapper inboundOrders; @Mock LastlegOrderDetailMapper details; @Mock LastlegOrderStatusHistoryMapper histories; @Mock InboundPlanCartonMapper cartons; @Mock DropshipOrderService dropshipOrders; @Mock InventoryCommandService inventory; @Mock com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper shippingGates; @Mock LastlegOrderNoDailySequenceMapper sequences; ObjectMapper json=new ObjectMapper().findAndRegisterModules(); LoadingCompletedConsumer service;
- @BeforeEach void setup(){ service=new LoadingCompletedConsumer(); ReflectionTestUtils.setField(service,"inboxMapper",inbox); ReflectionTestUtils.setField(service,"orderMapper",orders); ReflectionTestUtils.setField(service,"inboundOrderMapper",inboundOrders); ReflectionTestUtils.setField(service,"detailMapper",details); ReflectionTestUtils.setField(service,"historyMapper",histories); ReflectionTestUtils.setField(service,"cartonMapper",cartons); ReflectionTestUtils.setField(service,"dropshipOrders",dropshipOrders); ReflectionTestUtils.setField(service,"inventory",inventory); ReflectionTestUtils.setField(service,"shippingGates",shippingGates); ReflectionTestUtils.setField(service,"objectMapper",json); LastlegOrderNoGenerator generator=new LastlegOrderNoGenerator(); ReflectionTestUtils.setField(generator,"sequenceMapper",sequences); ReflectionTestUtils.setField(service,"orderNoGenerator",generator); lenient().when(sequences.currentValue()).thenReturn(1L); lenient().doAnswer(i->{ LastlegOrder o=i.getArgument(0); o.setId(Math.abs(o.getSourceInboundId().hashCode())+1L); return 1; }).when(orders).insert(any(LastlegOrder.class)); lenient().when(orders.lockContainerNumbers(anyString())).thenReturn(List.of()); lenient().when(shippingGates.initialize(anyString(),anyString(),anyString(),anyString(),anyLong(),anyLong())).thenAnswer(i->{ String key=i.getArgument(0); String value=i.getArgument(3); return frozenContainerNos.putIfAbsent(key,value)==null?1:0; }); lenient().when(shippingGates.lock(anyString())).thenAnswer(i->{ String key=i.getArgument(0); String value=frozenContainerNos.get(key); if(value==null)return null; var gate=new com.baiyue.lastleg.shipping.entity.ContainerShippingGate(); gate.setContainerBookingId(key); gate.setContainerNo(value); return gate; }); }
+ @BeforeEach void setup(){ service=new LoadingCompletedConsumer(); ReflectionTestUtils.setField(service,"inboxMapper",inbox); ReflectionTestUtils.setField(service,"orderMapper",orders); ReflectionTestUtils.setField(service,"inboundOrderMapper",inboundOrders); ReflectionTestUtils.setField(service,"detailMapper",details); ReflectionTestUtils.setField(service,"historyMapper",histories); ReflectionTestUtils.setField(service,"cartonMapper",cartons); ReflectionTestUtils.setField(service,"dropshipOrders",dropshipOrders); ReflectionTestUtils.setField(service,"inventory",inventory); ReflectionTestUtils.setField(service,"shippingGates",shippingGates); ReflectionTestUtils.setField(service,"objectMapper",json); LastlegOrderNoGenerator generator=new LastlegOrderNoGenerator(); ReflectionTestUtils.setField(generator,"sequenceMapper",sequences); ReflectionTestUtils.setField(service,"orderNoGenerator",generator); lenient().when(sequences.currentValue()).thenReturn(1L); lenient().doAnswer(i->{ LastlegOrder o=i.getArgument(0); o.setId(Math.abs(o.getSourceInboundId().hashCode())+1L); return 1; }).when(orders).insert(any(LastlegOrder.class)); lenient().when(orders.lockContainerNumbers(anyString())).thenReturn(List.of()); lenient().when(shippingGates.initialize(anyString(),anyString(),anyString(),anyLong(),anyLong())).thenAnswer(i->{ String key=i.getArgument(0); String value=i.getArgument(2); return frozenContainerNos.putIfAbsent(key,value)==null?1:0; }); lenient().when(shippingGates.lock(anyString())).thenAnswer(i->{ String key=i.getArgument(0); String value=frozenContainerNos.get(key); if(value==null)return null; var gate=new com.baiyue.lastleg.shipping.entity.ContainerShippingGate(); gate.setContainerBookingId(key); gate.setContainerNo(value); return gate; }); }
   @Test void createsPendingOrdersAndInTransitSnapshotsWithoutInboundPlans(){ EventEnvelope event=event(); assertEquals(2,service.consume(event)); assertThrows(NoSuchFieldException.class,()->LoadingCompletedConsumer.class.getDeclaredField("inboundPlans")); verify(orders,times(2)).insert(any(LastlegOrder.class)); ArgumentCaptor<InventoryCommandRequests.InTransit> inTransit=ArgumentCaptor.forClass(InventoryCommandRequests.InTransit.class); verify(inventory,times(2)).registerInTransit(eq("100"),eq("SYSTEM"),inTransit.capture()); assertEquals(Set.of("RK1","RK2"),inTransit.getAllValues().stream().map(InventoryCommandRequests.InTransit::inboundOrderNo).collect(java.util.stream.Collectors.toSet())); verify(details,times(2)).insert(any(LastlegOrderDetail.class)); verify(histories,times(2)).insert(any(LastlegOrderStatusHistory.class)); ArgumentCaptor<LastlegOrder> c=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(2)).insert(c.capture()); assertEquals(Set.of("in-1","in-2"),c.getAllValues().stream().map(LastlegOrder::getSourceInboundId).collect(java.util.stream.Collectors.toSet())); assertTrue(c.getAllValues().stream().allMatch(o->"PENDING_ASSIGNMENT".equals(o.getCurrentStatus()))); assertTrue(c.getAllValues().stream().allMatch(o->o.getInboundOrderNo()==null)); assertTrue(c.getAllValues().stream().allMatch(o->o.getId()!=null)); assertTrue(c.getAllValues().stream().allMatch(o->"MSCU6639870".equals(o.getContainerNo()))); assertTrue(c.getAllValues().stream().allMatch(o->"FBA".equals(o.getDestinationType()))); assertTrue(c.getAllValues().stream().allMatch(o->"Customer 100".equals(o.getCustomerName()))); assertTrue(c.getAllValues().stream().allMatch(o->"ow-1".equals(o.getSourceWarehouseId())&&"193000000000200003".equals(o.getOverseasWarehouseId())&&"US-LAX-01".equals(o.getOverseasWarehouseCode())&&"洛杉矶仓".equals(o.getOverseasWarehouseName())&&Integer.valueOf(0).equals(o.getReceivingWarehouseVersion()))); ArgumentCaptor<LastlegInboundOrder> snapshots=ArgumentCaptor.forClass(LastlegInboundOrder.class); verify(inboundOrders,times(2)).insert(snapshots.capture()); assertTrue(snapshots.getAllValues().stream().allMatch(o->"100".equals(o.getCustomerId())&&"FBA".equals(o.getDestinationType()))); assertEquals(1,c.getAllValues().stream().map(LastlegOrder::getOrderNo).distinct().count()); assertTrue(c.getAllValues().get(0).getOrderNo().matches("FL-WH-[0-9]{8}-[0-9]{6}")); }
   @Test void oneContainerWith15InboundRowsSharesOneStableContainerOrderNumber(){ EventEnvelope source=event(); com.fasterxml.jackson.databind.node.ObjectNode node=source.payload().deepCopy(); com.fasterxml.jackson.databind.node.ArrayNode rows=json.createArrayNode(); for(int index=1;index<=15;index++){ com.fasterxml.jackson.databind.node.ObjectNode row=node.path("orders").get(0).deepCopy(); row.put("sourceInboundId","in-"+index).put("rootInboundId","root-"+index).put("sourceOrderId","order-"+index).put("sourceOrderNo","FL-"+index).put("rootOrderId","root-order-"+index).put("inboundCode","RK-"+index); rows.add(row); } node.set("orders",rows); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope fifteen=new EventEnvelope("123e4567-e89b-12d3-a456-426614174015",source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); assertEquals(15,service.consume(fifteen)); ArgumentCaptor<LastlegOrder> captured=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(15)).insert(captured.capture()); assertEquals(1,captured.getAllValues().stream().map(LastlegOrder::getOrderNo).distinct().count()); assertTrue(captured.getAllValues().get(0).getOrderNo().matches("^FL-WH-\\d{8}-\\d{6}$")); verify(sequences,never()).nextValue(any(java.time.LocalDate.class)); }
   @Test void rejectsMissingOwnerSnapshotBeforeAnyLastlegWrite(){ EventEnvelope source=event(); com.fasterxml.jackson.databind.node.ObjectNode node=source.payload().deepCopy(); ((com.fasterxml.jackson.databind.node.ObjectNode)node.path("orders").get(0)).put("customerName"," "); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope missing=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); IllegalArgumentException error=assertThrows(IllegalArgumentException.class,()->service.consume(missing)); assertTrue(error.getMessage().contains("尾程事件负载无效")||error.getMessage().contains("货主快照")); verify(inbox,never()).insert(any(LastlegEventInbox.class)); verify(orders,never()).insert(any(LastlegOrder.class)); }
  @Test void freezesFormalPlannedWarehouseArrivalFromLoadingEvent(){ EventEnvelope source=event(); JsonNode node=source.payload().deepCopy(); ((com.fasterxml.jackson.databind.node.ObjectNode)node).put("estimatedWarehouseArrivalAt","2026-10-03T09:00"); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope changed=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); service.consume(changed); ArgumentCaptor<LastlegOrder> captor=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(2)).insert(captor.capture()); assertTrue(captor.getAllValues().stream().allMatch(order->java.time.LocalDateTime.of(2026,10,3,9,0).equals(order.getEstimatedWarehouseAt()))); }
- @Test void loadingCreatesAwaitingPickupReadyGateWithoutPollutingShippingVersion(){ service.consume(event()); verify(shippingGates).initialize("book-1","100","","MSCU6639870",0L,1L); }
+ @Test void loadingCreatesAwaitingPickupReadyGateWithoutPollutingShippingVersion(){ service.consume(event()); verify(shippingGates).initialize("book-1","","MSCU6639870",0L,1L); }
  @Test void rejectsUnnormalizedActualContainerNumberInsteadOfUsingCabinetNumber(){ EventEnvelope source=event(); JsonNode node=source.payload().deepCopy(); ((com.fasterxml.jackson.databind.node.ObjectNode)node).put("containerNo"," mscu6639870 ").put("cabinetNo","FALLBACK-CABINET"); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope changed=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); assertThrows(IllegalArgumentException.class,()->service.consume(changed)); verify(inbox,never()).insert(any(LastlegEventInbox.class)); verify(orders,never()).insert(any(LastlegOrder.class)); }
  @Test void rejectsBlankActualContainerNumberEvenWhenCabinetNumberExists(){ EventEnvelope source=event(); JsonNode node=source.payload().deepCopy(); ((com.fasterxml.jackson.databind.node.ObjectNode)node).put("containerNo","   ").put("cabinetNo","CABINET-ONLY"); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope changed=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),node,hash); assertThrows(IllegalArgumentException.class,()->service.consume(changed)); verify(inbox,never()).insert(any(LastlegEventInbox.class)); verify(orders,never()).insert(any(LastlegOrder.class)); }
  @Test void rejectsDifferentContainerNumberForSameSourceBookingBeforeAnyBusinessWrite(){ EventEnvelope source=event(); frozenContainerNos.put("book-1","CSQU3054383"); IllegalStateException error=assertThrows(IllegalStateException.class,()->service.consume(source)); assertTrue(error.getMessage().contains("sourceContainerBookingId")); verify(inbox,never()).insert(any(LastlegEventInbox.class)); verify(orders,never()).insert(any(LastlegOrder.class)); }
  @Test void rejectsExistingOrderContainerDriftForSameSourceBooking(){ when(orders.lockContainerNumbers("book-1")).thenReturn(List.of("MSCU6639870","CSQU3054383")); assertThrows(IllegalStateException.class,()->service.consume(event())); verify(inbox,never()).insert(any(LastlegEventInbox.class)); verify(orders,never()).insert(any(LastlegOrder.class)); }
- @Test void acceptsSeparateCustomerEventsForTheSameFrozenContainerIdentity(){ EventEnvelope first=event(); assertEquals(2,service.consume(first)); com.fasterxml.jackson.databind.node.ObjectNode node=first.payload().deepCopy(); int index=0; for(JsonNode order:node.path("orders")){ ((com.fasterxml.jackson.databind.node.ObjectNode)order).put("customerId","200").put("customerName","Customer 200").put("sourceInboundId","customer-200-in-"+(++index)); } String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope second=new EventEnvelope("123e4567-e89b-12d3-a456-426614174200",first.eventType(),first.eventVersion(),first.occurredAt(),first.sourceRegion(),first.targetRegion(),"200",first.aggregateType(),first.aggregateId(),first.aggregateVersion(),first.handoverVersion(),first.traceId(),first.correlationId(),first.causationId(),node,hash); assertEquals(2,service.consume(second)); verify(shippingGates,times(2)).initialize(eq("book-1"),anyString(),eq(""),eq("MSCU6639870"),eq(0L),eq(1L)); ArgumentCaptor<LastlegOrder> captured=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(4)).insert(captured.capture()); assertEquals(Set.of("100","200"),captured.getAllValues().stream().map(LastlegOrder::getCustomerId).collect(java.util.stream.Collectors.toSet())); assertTrue(captured.getAllValues().stream().allMatch(order->"MSCU6639870".equals(order.getContainerNo()))); }
+ @Test void acceptsSeparateCustomerEventsForTheSameFrozenContainerIdentity(){ EventEnvelope first=event(); assertEquals(2,service.consume(first)); com.fasterxml.jackson.databind.node.ObjectNode node=first.payload().deepCopy(); int index=0; for(JsonNode order:node.path("orders")){ ((com.fasterxml.jackson.databind.node.ObjectNode)order).put("customerId","200").put("customerName","Customer 200").put("sourceInboundId","customer-200-in-"+(++index)); } String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); EventEnvelope second=new EventEnvelope("123e4567-e89b-12d3-a456-426614174200",first.eventType(),first.eventVersion(),first.occurredAt(),first.sourceRegion(),first.targetRegion(),"200",first.aggregateType(),first.aggregateId(),first.aggregateVersion(),first.handoverVersion(),first.traceId(),first.correlationId(),first.causationId(),node,hash); assertEquals(2,service.consume(second)); verify(shippingGates,times(2)).initialize(eq("book-1"),eq(""),eq("MSCU6639870"),eq(0L),eq(1L)); ArgumentCaptor<LastlegOrder> captured=ArgumentCaptor.forClass(LastlegOrder.class); verify(orders,times(4)).insert(captured.capture()); assertEquals(Set.of("100","200"),captured.getAllValues().stream().map(LastlegOrder::getCustomerId).collect(java.util.stream.Collectors.toSet())); assertTrue(captured.getAllValues().stream().allMatch(order->"MSCU6639870".equals(order.getContainerNo()))); }
  @Test void replayPreservesExistingLmoNumberAndAddsNothing(){ EventEnvelope event=event(); LastlegEventInbox row=new LastlegEventInbox(); row.setPayloadHash(event.payloadHash()); when(inbox.selectById(event.eventId())).thenReturn(row); when(orders.countContainer("100","MSCU6639870")).thenReturn(2L); assertEquals(2,service.consume(event)); verify(orders).countContainer("100","MSCU6639870"); verify(sequences,never()).nextValue(any(java.time.LocalDate.class)); verify(orders,never()).insert(any(LastlegOrder.class)); verify(details,never()).insert(any(LastlegOrderDetail.class)); verify(histories,never()).insert(any(LastlegOrderStatusHistory.class)); }
  @Test void sameEventWithDifferentHashIsRejected(){ EventEnvelope event=event(); LastlegEventInbox row=new LastlegEventInbox(); row.setPayloadHash("sha256:"+"0".repeat(64)); when(inbox.selectById(event.eventId())).thenReturn(row); assertThrows(IllegalArgumentException.class,()->service.consume(event)); }
  @Test void tamperedPayloadHashIsRejectedBeforeInboxMutation(){ EventEnvelope source=event(); EventEnvelope tampered=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),source.sourceRegion(),source.targetRegion(),source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),source.payload(),"sha256:"+"0".repeat(64)); IllegalArgumentException error=assertThrows(IllegalArgumentException.class,()->service.consume(tampered)); assertTrue(error.getMessage().contains("payloadHash")); verify(inbox,never()).insert(any(LastlegEventInbox.class)); }

lastleg-service/src/test/java/com/baiyue/lastleg/shipping/service/ContainerShippingNodeConsumerTest.java

@@ -113,7 +113,7 @@ class ContainerShippingNodeConsumerTest {
 
     private ContainerShippingGate gate(String status, int sequence, long version, Instant actualAt) {
         ContainerShippingGate gate = new ContainerShippingGate(); gate.setContainerBookingId("CB-1");
-        gate.setCustomerId("100"); gate.setOceanBookingId("OB-1"); gate.setContainerNo("MSCU6639870");
+        gate.setOceanBookingId("OB-1"); gate.setContainerNo("MSCU6639870");
         gate.setStatus(status); gate.setNodeSequence(sequence); gate.setAggregateVersion(version);
         gate.setHandoverVersion(version + 1); gate.setActualAt(java.time.LocalDateTime.ofInstant(actualAt,
             java.time.ZoneOffset.UTC)); return gate;
@@ -121,12 +121,12 @@ class ContainerShippingNodeConsumerTest {
 
     private EventEnvelope event(String eventId, String node, int sequence, long version, Instant actualAt) {
         FirstLegContainerShippingNodeRecordedV1 payload = new FirstLegContainerShippingNodeRecordedV1(
-            "Q-1", "100", "OB-1", "CB-1", "MSCU6639870", node, sequence, actualAt,
+            "Q-1", "OB-1", "CB-1", "MSCU6639870", node, sequence, actualAt,
             actualAt, "LAX", "Los Angeles", "CARRIER", "PE-1", node, "REF-1", "a".repeat(64));
         JsonNode payloadNode = json.valueToTree(payload);
         String hash = EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(payloadNode));
         return new EventEnvelope(eventId, EventTypes.FIRST_LEG_CONTAINER_SHIPPING_NODE_RECORDED, 1,
-            actualAt, RegionCode.CN, RegionCode.OVERSEAS, "100", "CONTAINER_BOOKING", "CB-1",
+            actualAt, RegionCode.CN, RegionCode.OVERSEAS, "0", "CONTAINER_BOOKING", "CB-1",
             version, version + 1, "123e4567-e89b-12d3-a456-426614174199", "shipping:CB-1", null,
             payloadNode, hash);
     }