1

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

@@ -28,6 +28,8 @@ class InboundPlanSchemaContractTest {
             assertTrue(schema.contains("create table if not exists ll_inbound_fba_appointment"));
             assertTrue(schema.contains("unique key uk_ll_fba_appointment_no (customer_id, appointment_no)"));
             assertTrue(schema.contains("expected_loading_at"));
+            assertTrue(schema.contains("change column tenant_id customer_id"));
+            assertTrue(schema.contains("set expected_loading_at=appointment_at"));
             assertTrue(schema.contains("planned_arrival_date"));
             assertTrue(schema.contains("creation_mode varchar(32)"));
             assertTrue(schema.contains("modify column creation_mode varchar(32)"));

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanQueryMapperContractTest.java

@@ -16,6 +16,9 @@ class InboundPlanQueryMapperContractTest {
         String sql = String.join(" ", select.value());
 
         assertTrue(sql.contains("p.version version"));
+        assertTrue(sql.contains("l.order_id orderId,l.inbound_code inboundCode,o.lx_code lxCode,o.order_type orderType"));
+        assertTrue(sql.contains("p.overseas_warehouse_id overseasWarehouseId"));
+        assertTrue(sql.contains("p.overseas_warehouse_id=#{q.overseasWarehouseId}"));
         assertTrue(sql.contains("WHERE <if test='customerId != null and customerId != \"\"'>di.customer_id=#{customerId} AND </if>di.order_id=l.order_id"));
     }
 }

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

@@ -3,6 +3,7 @@ package com.baiyue.lastleg.inboundplan.service;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanQueryMapper;
+import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import jakarta.validation.Validation;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -22,12 +23,14 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class InboundPlanPaginationTest {
     @Mock InboundPlanQueryMapper queryMapper;
+    @Mock WarehouseResourceGateway warehouseGateway;
     private InboundPlanService service;
 
     @BeforeEach
     void setUp() {
         service = new InboundPlanService();
         ReflectionTestUtils.setField(service, "queryMapper", queryMapper);
+        ReflectionTestUtils.setField(service, "warehouseGateway", warehouseGateway);
     }
 
     @Test
@@ -48,19 +51,22 @@ class InboundPlanPaginationTest {
             null, "PENDING_ASSIGNMENT", null, null, "ONT", "ONT8", "UNAPPOINTED", "UNSCHEDULED",
             LocalDateTime.of(2026, 8, 1, 0, 0), LocalDateTime.of(2026, 8, 31, 23, 59));
         InboundPlanListResponse row = new InboundPlanListResponse(9007199254740993L, 2L, "LIP2", "100",
-            3L, "IN-1", null, "FIRST_LEG", "US-LAX-01", "洛杉矶仓", "W1", "ONT", "安大略仓",
+            3L, "IN-1", null, "FIRST_LEG", 193000000000200003L, "ACY2", "错误目的仓", "W1", "ONT", "安大略仓",
             "ONT8", "客户A", 10, 0, BigDecimal.ONE, 1, true, true, true, "PENDING_ASSIGNMENT", null, null, null,
             null, "UNSCHEDULED", LocalDateTime.of(2026, 8, 20, 10, 0), 0);
         when(queryMapper.count("100", query)).thenReturn(11L);
         when(queryMapper.rows("100", query, 10, 10)).thenReturn(List.of(row));
+        when(warehouseGateway.requireActiveSharedWarehouse(193000000000200003L)).thenReturn(
+            new WarehouseResourceGateway.WarehouseReference(193000000000200003L, "US-LAX-01", "洛杉矶仓", "ACTIVE"));
 
         var result = service.page("100", query);
 
-        assertThat(result.records()).containsExactly(row);
+        assertThat(result.records()).containsExactly(row.withReceivingWarehouse("US-LAX-01", "洛杉矶仓"));
         assertThat(result.records().get(0).lineId()).isEqualTo(9007199254740993L);
         assertThat(result.records().get(0).appointmentStatus()).isNull();
         assertThat(result.records().get(0).overseasWarehouseCode()).isEqualTo("US-LAX-01");
         assertThat(result.records().get(0).overseasWarehouseName()).isEqualTo("洛杉矶仓");
+        assertThat(result.records().get(0).overseasWarehouseId()).isEqualTo(193000000000200003L);
         assertThat(result.records().get(0).assigned()).isTrue();
         assertThat(result.records().get(0).mergeAllowed()).isTrue();
         assertThat(result.records().get(0).urgent()).isTrue();
@@ -76,9 +82,9 @@ class InboundPlanPaginationTest {
             .getAnnotation(org.apache.ibatis.annotations.Select.class).value()) + InboundPlanQueryMapper.FROM_AND_FILTER;
         assertThat(sql).contains("a2.customer_id=#{customerId}", "ORDER BY a2.created_at DESC,ai2.id DESC LIMIT 1");
         assertThat(sql).contains("di.customer_id=#{customerId} AND </if>di.order_id=l.order_id");
-        assertThat(sql).contains("o.overseas_warehouse_code overseasWarehouseCode",
+        assertThat(sql).contains("p.overseas_warehouse_id overseasWarehouseId", "o.overseas_warehouse_code overseasWarehouseCode",
             "o.overseas_warehouse_name overseasWarehouseName",
-            "o.overseas_warehouse_id=#{q.overseasWarehouseId}");
+            "p.overseas_warehouse_id=#{q.overseasWarehouseId}");
         assertThat(sql).contains("p.assigned_flag assigned", "p.merge_required mergeAllowed",
             "p.urgent_flag urgent");
         assertThat(sql).doesNotContain("l.destination_warehouse_id=#{q.overseasWarehouseId}");