1

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

@@ -112,7 +112,7 @@ class PlatformDispatchOutboundContractTest {
         assertTrue(Arrays.stream(DispatchController.class.getDeclaredMethods())
             .noneMatch(method -> "depart".equals(method.getName())));
         assertEquals(Set.of("vehiclePlate", "driverName", "driverPhone", "carrierName",
-                "fbaAppointmentNo", "fbaAppointmentStatus", "vehicleAppointmentStatus", "estimatedArrivalAt"),
+                "departAt", "fbaAppointmentNo", "fbaAppointmentStatus", "vehicleAppointmentStatus", "estimatedArrivalAt"),
             Arrays.stream(DispatchRequests.Update.class.getRecordComponents())
                 .map(component -> component.getName()).collect(java.util.stream.Collectors.toSet()));
     }

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/DispatchCandidateMapperContractTest.java

@@ -12,8 +12,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 class DispatchCandidateMapperContractTest {
     private static final List<String> CONSTRUCTOR_ALIASES = List.of(
         "planId", "planPalletId", "warehousePalletId", "orderId", "customerId", "customerName",
-        "planNo", "orderType", "volumeWeightKg", "containerNo", "appointmentAt", "expectedLoadingAt",
-        "overseasWarehouseId", "overseasWarehouseName", "orderNo", "orderRefs", "inboundCode", "palletNo",
+        "planNo", "orderType", "volumeWeightKg", "grossWeightKg", "containerNo", "appointmentAt", "expectedLoadingAt",
+        "overseasWarehouseId", "overseasWarehouseCode", "overseasWarehouseName", "orderNo", "orderRefs", "inboundCode", "palletNo",
         "destinationWarehouseId", "destinationWarehouseCode", "destinationWarehouseName", "fbaWarehouseCode",
         "packageCount", "volumeCbm", "sourceStage", "cartonMarks", "relabelCartonMarks",
         "destinationType", "deliveryAddress", "postalCode", "contactName", "contactPhone"
@@ -70,7 +70,12 @@ class DispatchCandidateMapperContractTest {
             String sql = String.join(" ", method.getAnnotation(Select.class).value());
             assertTrue(sql.contains("CASE WHEN p.warehouse_pallet_id IS NOT NULL"));
             assertTrue(sql.contains("pos.overseas_warehouse_id"));
-            assertTrue(sql.contains("CAST(ip.overseas_warehouse_id AS CHAR)"));
+            assertTrue(sql.contains("NULLIF(CAST(ip.overseas_warehouse_id AS CHAR),'')"));
+            assertTrue(sql.contains("source_order.id=ip.source_order_id"));
+            assertTrue(sql.contains("source_order.customer_id=ip.customer_id"));
+            assertTrue(sql.contains("source_order.overseas_warehouse_id"));
+            assertTrue(sql.contains("AS overseasWarehouseCode"));
+            assertTrue(sql.contains("b.overseas_warehouse_code"));
             assertTrue(sql.contains("ll_inventory_balance"));
         }
     }
@@ -89,6 +94,22 @@ class DispatchCandidateMapperContractTest {
         }
     }
 
+    @Test
+    void candidateGrossWeightIsAllocatedByPalletAndFallsBackToVolumeWeight() throws Exception {
+        for (Method method : List.of(
+            DispatchCandidateMapper.class.getMethod("available", String.class, List.class, String.class,
+                String.class, String.class, String.class),
+            DispatchCandidateMapper.class.getMethod("lockSelected", String.class, List.class))) {
+            String sql = String.join(" ", method.getAnnotation(Select.class).value());
+            assertTrue(sql.contains("SUM(d.gross_weight_kg)"));
+            assertTrue(sql.contains("inbound.gross_weight_kg"));
+            assertTrue(sql.contains("ll_inbound_order inbound"));
+            assertTrue(sql.contains("a.allocated_volume_cbm"));
+            assertTrue(sql.contains("a2.line_id=a.line_id"));
+            assertTrue(sql.contains("MIN(o.volume_weight_kg)) AS grossWeightKg"));
+        }
+    }
+
     private void assertConstructorColumnOrder(Method method) {
         String sql = String.join(" ", method.getAnnotation(Select.class).value());
         int previous = -1;

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/SmartDispatchOpenApiContractTest.java

@@ -31,12 +31,15 @@ class SmartDispatchOpenApiContractTest {
         assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:smart-dispatch"));
         assertTrue(yaml.contains("SmartDispatchPreArrange"));
         assertTrue(yaml.contains("SmartDispatchCandidate"));
+        assertTrue(yaml.contains("overseasWarehouseCode: { type: string, nullable: true, description: 实际海外接柜仓编码"));
+        assertTrue(yaml.contains("grossWeightKg: { type: number, nullable: true, description: 候选托盘实际毛重"));
         String preArrangeSchema = yaml.substring(yaml.indexOf("    SmartDispatchPreArrange:"),
             yaml.indexOf("    SmartDispatchDraftPallet:"));
         String updateSchema = yaml.substring(yaml.indexOf("    DispatchUpdate:"),
             yaml.indexOf("    DeliveryTransfer:"));
         assertFalse(preArrangeSchema.contains("route:"));
         assertFalse(updateSchema.contains("route:"));
+        assertTrue(updateSchema.contains("departAt: { type: string, format: date-time, nullable: true }"));
         assertTrue(yaml.contains("name: planIds"));
         String planIdsParameter = yaml.substring(yaml.indexOf("name: planIds"),
             yaml.indexOf("name: orderNo", yaml.indexOf("name: planIds")));

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java

@@ -370,13 +370,16 @@ class DispatchServiceTest {
         DispatchItem ont8 = item(11L, "ONT8");
         DispatchItem abe4 = item(12L, "ABE4");
         when(items.findByDispatchOrder("100", 1L)).thenReturn(List.of(ont8, abe4, item(13L, "ONT8")));
+        LocalDateTime departAt = LocalDateTime.of(2026, 9, 18, 10, 30);
         DispatchRequests.Update request = new DispatchRequests.Update("ABC-1", "Driver", null, null,
-            null, null, null, LocalDateTime.now());
+            departAt, null, null, null, LocalDateTime.now());
 
         DispatchResponse result = service.update("PC1", request);
 
         assertEquals(DispatchService.PENDING_DEPARTURE, dispatch.getStatus());
         assertEquals("ABC-1", result.vehiclePlate());
+        assertEquals(departAt, result.departAt());
+        assertEquals(departAt, dispatch.getDepartAt());
         assertEquals("ONT8,ABE4", result.route());
         assertEquals("ONT8,ABE4", dispatch.getRoute());
         verify(orders).updateById(dispatch);
@@ -390,7 +393,7 @@ class DispatchServiceTest {
         dispatch.setStatus("DEPARTED");
         when(orders.lockGlobalByDispatchNo("PC1")).thenReturn(dispatch);
         DispatchRequests.Update request = new DispatchRequests.Update(null, null, null, null,
-            null, null, null, null);
+            null, null, null, null, null);
 
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
             () -> service.update("PC1", request));

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

lastleg-service/src/test/java/com/baiyue/lastleg/inventory/InventorySchemaContractTest.java

@@ -88,6 +88,21 @@ class InventorySchemaContractTest {
     void balanceQueriesHideZeroRowsAndMutationsKeepWarehouseDimensionCanonical() throws Exception {
         assertTrue(InventoryQueryMapper.BALANCE_FILTER.contains("procurement_packages)>0"));
         assertTrue(InventoryQueryMapper.JOINED_BALANCE_FILTER.contains("b.procurement_packages)>0"));
+        String balancesSql = String.join(" ", InventoryQueryMapper.class
+            .getMethod("balances", String.class, InventoryQueryRequests.BalanceQuery.class, long.class, long.class)
+            .getAnnotation(Select.class).value());
+        assertTrue(balancesSql.contains("SUM(available_packages)"));
+        assertTrue(balancesSql.contains("GROUP BY customer_id,overseas_warehouse_id,destination_warehouse_id,destination_warehouse_code,sku_code"));
+        assertTrue(balancesSql.contains("NULL inbound_order_id"));
+        String balanceCountSql = String.join(" ", InventoryQueryMapper.class
+            .getMethod("countBalances", String.class, InventoryQueryRequests.BalanceQuery.class)
+            .getAnnotation(Select.class).value());
+        assertTrue(balanceCountSql.contains("FROM (SELECT 1 FROM ll_inventory_balance"));
+        assertTrue(balanceCountSql.contains("GROUP BY customer_id,overseas_warehouse_id,destination_warehouse_id,destination_warehouse_code,sku_code"));
+        String sourceBalancesSql = String.join(" ", InventoryQueryMapper.class
+            .getMethod("sourceBalances", String.class, InventoryQueryRequests.BalanceQuery.class, long.class, long.class)
+            .getAnnotation(Select.class).value());
+        assertFalse(sourceBalancesSql.contains("GROUP BY"));
         String bindSql = String.join(" ", com.baiyue.lastleg.inventory.mapper.InventoryBalanceMapper.class
             .getMethod("bindInboundPlan", String.class, String.class, Long.class, String.class,
                 String.class, java.time.LocalDateTime.class)

lastleg-service/src/test/java/com/baiyue/lastleg/inventory/query/service/InventoryQueryServiceTest.java

@@ -207,7 +207,7 @@ class InventoryQueryServiceTest {
     @Test
     void balanceExportUsesInboundOrderPackageColumnsOnly() {
         InventoryQueryRequests.BalanceQuery query = balanceQuery(null);
-        when(mapper.balances("100", query, 0, 10_000)).thenReturn(List.of());
+        when(mapper.sourceBalances("100", query, 0, 10_000)).thenReturn(List.of());
 
         String csv = new String(service.exportBalances("100", query), StandardCharsets.UTF_8);
 

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

@@ -20,6 +20,7 @@ import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
 import com.baiyue.lastleg.mapper.ContainerArrivalTimeOperationMapper;
+import com.baiyue.lastleg.model.LastlegOrderStatus;
 import com.baiyue.lastleg.entity.ContainerArrivalTimeOperation;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.shipping.entity.ContainerShippingGate;
@@ -37,6 +38,7 @@ import java.util.List;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -387,6 +389,31 @@ class LastlegOrderServiceTest {
         assertEquals(25, page.getValue().getSize());
     }
 
+    @Test
+    void exportUsesChineseBooleanAndMainStatusLabels() {
+        LastlegOrder order = order(11L, "100", "PENDING_ASSIGNMENT", null);
+        order.setAbnormal(false);
+        order.setDetained(true);
+        var resultPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<LastlegOrder>(1, 1000);
+        resultPage.setRecords(List.of(order));
+        resultPage.setTotal(1);
+        when(orders.selectPage(any(), any())).thenReturn(resultPage);
+
+        String csv = new String(service.exportCsv(null, new LastlegOrderRequests.Query(
+            1L, 20L, null, null, null, null, null, null, null, null, null, null,
+            null, null, null, null)), StandardCharsets.UTF_8);
+
+        assertTrue(csv.contains("\"否\",\"是\""));
+        assertTrue(csv.contains("\"待分配\""));
+        assertFalse(csv.contains("\"false\""));
+        assertFalse(csv.contains("\"PENDING_ASSIGNMENT\""));
+        assertEquals("草稿", LastlegOrderStatus.labelOf("DRAFT"));
+        assertEquals("审核通过", LastlegOrderStatus.labelOf("APPROVED"));
+        assertEquals("已分配目的仓", LastlegOrderStatus.labelOf("DESTINATION_ASSIGNED"));
+        assertEquals("已生成入库计划", LastlegOrderStatus.labelOf("INBOUND_PLANNED"));
+        assertEquals("处理中", LastlegOrderStatus.labelOf("PROCESSING"));
+    }
+
     @Test
     void pageWarehouseFilterMatchesFrozenWarehouseName() {
         assertWarehouseFilter("洛杉矶仓", "洛杉矶仓", true);