1

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