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/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);
     }