优化

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

@@ -17,5 +17,21 @@ class InboundPlanOrderMapperContractTest {
         assertTrue(sql.contains("COALESCE(NULLIF(o.transfer_warehouse_code,''),MIN(NULLIF(d.destination_warehouse_code,'')))"));
         assertTrue(sql.contains("THEN 1 ELSE COUNT(DISTINCT"));
         assertTrue(sql.contains("0 AS destinationMismatchCount"));
+        assertTrue(sql.contains("o.overseas_warehouse_id AS overseasWarehouseId"));
+        assertTrue(sql.contains("o.overseas_warehouse_code AS overseasWarehouseCode"));
+        assertTrue(sql.contains("o.overseas_warehouse_name AS overseasWarehouseName"));
+    }
+
+    @Test
+    void receivingWarehouseSnapshotIsReadFromTenantScopedOrderFact() throws Exception {
+        Select select = InboundPlanOrderMapper.class
+            .getMethod("findReceivingWarehouse", String.class, Long.class)
+            .getAnnotation(Select.class);
+        String sql = String.join(" ", select.value());
+
+        assertTrue(sql.contains("overseas_warehouse_code AS overseasWarehouseCode"));
+        assertTrue(sql.contains("overseas_warehouse_name AS overseasWarehouseName"));
+        assertTrue(sql.contains("customer_id=#{customerId} AND id=#{orderId}"));
+        assertTrue(!sql.contains("destination_warehouse"));
     }
 }

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

@@ -112,9 +112,6 @@ class ReceivingContainerServiceBehaviorTest {
         when(sessions.insert(any(ReceivingContainerSession.class))).thenReturn(1);
         when(operations.insert(any(ReceivingContainerOperation.class))).thenReturn(1);
         when(warehouse.requireActiveSharedWarehouse(100L)).thenReturn(warehouseReference());
-        when(plans.claimReceivingWarehouse("100", 2L, 100L)).thenReturn(1);
-        InboundPlan claimed = plan("CONT-A"); claimed.setOverseasWarehouseId(100L);
-        when(plans.selectById(2L)).thenReturn(claimed);
         var response = service.prepare("7", "receiver", 100L, "CONT-A",
             new ReceivingContainerRequests.Action("same-key"));
         assertThat(response.overseasWarehouseId()).isEqualTo(100L);
@@ -652,7 +649,7 @@ class ReceivingContainerServiceBehaviorTest {
     private static InboundPlan plan(String containerNo) {
         InboundPlan value = new InboundPlan();
         value.setId(2L); value.setPlanNo("PLAN-1"); value.setCustomerId("100"); value.setContainerNo(containerNo);
-        value.setStatus("SIGNED");
+        value.setStatus("SIGNED"); value.setOverseasWarehouseId(100L);
         return value;
     }
 
@@ -668,7 +665,9 @@ class ReceivingContainerServiceBehaviorTest {
     private static LastlegOrder order(String destinationType) {
         LastlegOrder value = new LastlegOrder();
         value.setId(1L); value.setCustomerId("100"); value.setDestinationType(destinationType);
-        value.setOverseasWarehouseId("100"); value.setFbaWarehouseCode("FBA".equals(destinationType) ? "FBA-1" : null);
+        value.setOverseasWarehouseId("100"); value.setOverseasWarehouseCode("SHARED-LAX");
+        value.setOverseasWarehouseName("Shared LAX");
+        value.setFbaWarehouseCode("FBA".equals(destinationType) ? "FBA-1" : null);
         return value;
     }
 
@@ -690,7 +689,8 @@ 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.setOverseasWarehouseId(100L); value.setOverseasWarehouseName("Shared LAX");
+        value.setOverseasWarehouseId(100L); value.setOverseasWarehouseCode("SHARED-LAX");
+        value.setOverseasWarehouseName("Shared LAX");
         value.setStatus(status); value.setVersion(0);
         return value;
     }

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

@@ -48,9 +48,9 @@ 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", "FIRST_LEG", "W1", "ONT", "安大略仓", "ONT8", "客户A", 10,
-            BigDecimal.ONE, 1, "PENDING_ASSIGNMENT", null, null, null, null, "UNSCHEDULED",
-            LocalDateTime.of(2026, 8, 20, 10, 0));
+            3L, "IN-1", null, "FIRST_LEG", "US-LAX-01", "洛杉矶仓", "W1", "ONT", "安大略仓",
+            "ONT8", "客户A", 10, 0, BigDecimal.ONE, 1, "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));
 
@@ -59,6 +59,8 @@ class InboundPlanPaginationTest {
         assertThat(result.records()).containsExactly(row);
         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.pages()).isEqualTo(2);
         verify(queryMapper).count("100", query);
         verify(queryMapper).rows("100", query, 10, 10);
@@ -71,6 +73,10 @@ 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",
+            "o.overseas_warehouse_name overseasWarehouseName",
+            "o.overseas_warehouse_id=#{q.overseasWarehouseId}");
+        assertThat(sql).doesNotContain("l.destination_warehouse_id=#{q.overseasWarehouseId}");
         assertThat(sql).contains("q.planNo", "q.inboundCode", "q.status", "q.overseasWarehouseId",
             "q.destinationWarehouseCode", "q.warehouse",
             "q.fbaWarehouseCode", "q.appointmentStatus", "q.dispatchStatus", "q.createdFrom", "q.createdTo");

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

@@ -64,6 +64,9 @@ class InboundPlanServiceTest {
         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(orderMapper.findReceivingWarehouse(any(), any())).thenReturn(
+            new InboundPlanOrderMapper.ReceivingWarehouseSnapshot(
+                "193000000000200003", "US-LAX-01", "洛杉矶仓"));
     }
 
     @Test
@@ -105,12 +108,15 @@ class InboundPlanServiceTest {
         verify(orderMapper).lockOrder("100", 2L);
         assertEquals(2L, result.sourceOrderId());
         assertEquals("MSCU6639870", result.containerNo());
+        assertEquals("US-LAX-01", result.overseasWarehouseCode());
+        assertEquals("洛杉矶仓", result.overseasWarehouseName());
     }
 
     @Test
     void convertsAConsistentDestinationAssignedOrder() {
         SourceOrderSnapshot assigned = new SourceOrderSnapshot(2L, "100", "MSCU6639870", "RK-2",
-            "DESTINATION_ASSIGNED", null, new BigDecimal("1.0000"), 10,
+            "DESTINATION_ASSIGNED", null, new BigDecimal("1.0000"), 10, 0,
+            "193000000000200003", "US-LAX-01", "洛杉矶仓", null,
             "2090000000000000001", "LAX-02", "Los Angeles 02", 1, 0);
         when(orderMapper.lockOrder("100", 2L)).thenReturn(List.of(assigned));
         when(orderMapper.markPlanned(any(), any(), any(), org.mockito.ArgumentMatchers.anyInt(), any()))
@@ -148,6 +154,32 @@ class InboundPlanServiceTest {
         verify(inventoryBalanceMapper, never()).bindInboundPlan(any(), any(), any(), any(), any());
     }
 
+    @Test
+    void detailReturnsReceivingWarehouseFromTenantScopedOrderFact() {
+        InboundPlan plan = existingPlan("100", 1L, "LIP-1");
+        when(planMapper.selectOne(any())).thenReturn(plan);
+        when(orderMapper.findReceivingWarehouse("100", 1L)).thenReturn(
+            new InboundPlanOrderMapper.ReceivingWarehouseSnapshot("88", "US-NY-01", "纽约仓"));
+
+        var result = service.detailByPlanNo("100", "LIP-1");
+
+        assertEquals("US-NY-01", result.overseasWarehouseCode());
+        assertEquals("纽约仓", result.overseasWarehouseName());
+        verify(orderMapper).findReceivingWarehouse("100", 1L);
+    }
+
+    @Test
+    void detailFailsClosedWhenReceivingWarehouseFactIsMissing() {
+        InboundPlan plan = existingPlan("100", 1L, "LIP-1");
+        when(planMapper.selectOne(any())).thenReturn(plan);
+        when(orderMapper.findReceivingWarehouse("100", 1L)).thenReturn(null);
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class,
+            () -> service.detailByPlanNo("100", "LIP-1"));
+
+        assertEquals(409, error.getStatusCode().value());
+    }
+
     @Test
     void rejectsReversedInboundPlanDateRange() {
         InboundPlanRequests.Query query = new InboundPlanRequests.Query(1, 20, null, null, null, null,
@@ -160,7 +192,9 @@ class InboundPlanServiceTest {
     @Test
     void rejectsMissingDestinationWarehouse() {
         SourceOrderSnapshot invalid = new SourceOrderSnapshot(1L, "100", "MSCU6639870", "RK-1",
-            "PENDING_ASSIGNMENT", null, BigDecimal.ONE, 1, null, null, null, 1, 0);
+            "PENDING_ASSIGNMENT", null, BigDecimal.ONE, 1, 0,
+            "193000000000200003", "US-LAX-01", "洛杉矶仓", null,
+            null, null, null, 1, 0);
         when(orderMapper.lockOrder("100", 1L)).thenReturn(List.of(invalid));
 
         assertThrows(ResponseStatusException.class, () -> service.convert("100", 1L));
@@ -190,7 +224,9 @@ class InboundPlanServiceTest {
     @Test
     void transferWarehouseOverridesOriginalCargoDestination() {
         SourceOrderSnapshot transferred = new SourceOrderSnapshot(1L, "100", "MSCU6639870", "RK-1",
-            "DESTINATION_ASSIGNED", null, BigDecimal.ONE, 1, "WH-B", "WH-B", "Warehouse B", 1, 1);
+            "DESTINATION_ASSIGNED", null, BigDecimal.ONE, 1, 0,
+            "193000000000200003", "US-LAX-01", "洛杉矶仓", null,
+            "WH-B", "WH-B", "Warehouse B", 1, 1);
         when(orderMapper.lockOrder("100", 1L)).thenReturn(List.of(transferred));
         when(orderMapper.markPlanned(any(), any(), any(), org.mockito.ArgumentMatchers.anyInt(), any()))
             .thenReturn(1);
@@ -332,7 +368,9 @@ class InboundPlanServiceTest {
             new InboundPlanOrderMapper.ContainerOrderRef("100", 2L, "PENDING_ASSIGNMENT", "MSCU6639870", "STANDARD")));
         when(orderMapper.lockOrder("100", 1L)).thenReturn(List.of(order(1L, "RK-1", "1", "WH-A")));
         when(orderMapper.lockOrder("100", 2L)).thenReturn(List.of(new SourceOrderSnapshot(2L, "100", "MSCU6639870", "RK-2",
-            "PENDING_ASSIGNMENT", null, BigDecimal.ONE, 1, null, null, null, 1, 0)));
+            "PENDING_ASSIGNMENT", null, BigDecimal.ONE, 1, 0,
+            "193000000000200003", "US-LAX-01", "洛杉矶仓", null,
+            null, null, null, 1, 0)));
 
         assertThrows(ResponseStatusException.class, () -> service.convertContainer("BOOKING-1"));
 
@@ -419,12 +457,14 @@ class InboundPlanServiceTest {
 
     private SourceOrderSnapshot order(String customerId, Long id, String inboundCode, String warehouse) {
         return new SourceOrderSnapshot(id, customerId, "MSCU6639870", inboundCode, "PENDING_ASSIGNMENT", null,
-            BigDecimal.ONE, 10, warehouse, warehouse, warehouse, 1, 0);
+            BigDecimal.ONE, 10, 0, "193000000000200003", "US-LAX-01", "洛杉矶仓", null,
+            warehouse, warehouse, warehouse, 1, 0);
     }
 
     private SourceOrderSnapshot order(Long id, String inboundCode, String volume, String warehouse) {
         return new SourceOrderSnapshot(id, "100", "MSCU6639870", inboundCode, "PENDING_ASSIGNMENT", null,
             new BigDecimal(volume), new BigDecimal(volume).multiply(BigDecimal.TEN).intValue(),
+            0, "193000000000200003", "US-LAX-01", "洛杉矶仓", null,
             warehouse, warehouse, warehouse, 1, 0);
     }
 }