优化

firstleg/src/main/java/com/baiyue/firstleg/dto/SmartLoadingDtos.java

@@ -1,5 +1,5 @@
 package com.baiyue.firstleg.dto;
-import com.baiyue.firstleg.entity.LoadingPlanItemEntity; import jakarta.validation.constraints.*; import java.math.BigDecimal; import java.util.List;
+import com.baiyue.firstleg.entity.LoadingPlanItemEntity; import jakarta.validation.constraints.*; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List;
 public final class SmartLoadingDtos { private SmartLoadingDtos(){}
  public record ChannelSummary(String channelCode, String channelName,
   long candidateInboundCount, long availablePackageCount, long availableContainerCount) {}
@@ -9,12 +9,12 @@ public final class SmartLoadingDtos { private SmartLoadingDtos(){}
   Integer availablePackageCount, BigDecimal unitGrossWeightKg, BigDecimal unitNetWeightKg,
   BigDecimal averageUnitVolumeCbm, BigDecimal availableVolumeCbm,
   Long coLoadGroupId, String groupNo, Integer memberCount, Integer groupTotalBoxes,
-  Boolean locked, String blockReason) {}
+  Boolean locked, String blockReason, String orderStatusSnapshot, LocalDateTime expectedArrivalAt) {}
  public record Candidate(Long accountId, Long inboundId, Long inboundDetailId, Long orderId, String orderNo, String inboundCode,
  Long warehouseId, String channelCode, String channelName, Long destinationWarehouseId, String destinationWarehouseCode, String destinationWarehouseName, String customerName, String goodsName, Integer availablePackageCount,
   BigDecimal unitGrossWeightKg, BigDecimal unitNetWeightKg, BigDecimal unitVolumeCbm,
   Long coLoadGroupId, String groupNo, Integer memberCount, Integer groupTotalBoxes,
-  Boolean locked, String blockReason) {}
+  Boolean locked, String blockReason, String orderStatusSnapshot, LocalDateTime expectedArrivalAt) {}
  public record AssignRequest(@NotNull @Positive Long inboundId,@NotNull @Positive Long inboundDetailId,
   @NotNull @Positive Integer packageCount,@NotNull @Min(0) Integer expectedVersion,@NotBlank @Size(max=128) String operationId) {}
  public record AssignInboundRequest(@NotNull @Positive Long inboundId,

firstleg/src/main/java/com/baiyue/firstleg/mapper/SmartLoadingCandidateMapper.java

@@ -15,6 +15,7 @@ import com.baiyue.firstleg.dto.SmartLoadingDtos.Candidate; import org.apache.iba
  @Select("""
   SELECT o.tenant_id accountId,o.id inboundId,i.inbound_detail_id inboundDetailId,
          o.order_id orderId,o.order_no orderNo,o.inbound_code inboundCode,
+         o.order_status_snapshot orderStatusSnapshot,o.expected_arrival_at expectedArrivalAt,
          o.warehouse_id warehouseId,o.channel_code channelCode,o.channel_name channelName,o.destination_warehouse_id destinationWarehouseId,
          o.destination_code destinationWarehouseCode,o.destination_name destinationWarehouseName,
          o.customer_name customerName,COALESCE(m.actual_goods_name,'') goodsName,
@@ -64,6 +65,7 @@ import com.baiyue.firstleg.dto.SmartLoadingDtos.Candidate; import org.apache.iba
  @Select("""
   SELECT o.tenant_id accountId,o.id inboundId,i.inbound_detail_id inboundDetailId,
          o.order_id orderId,o.order_no orderNo,o.inbound_code inboundCode,
+         o.order_status_snapshot orderStatusSnapshot,o.expected_arrival_at expectedArrivalAt,
          o.warehouse_id warehouseId,o.channel_code channelCode,o.channel_name channelName,o.destination_warehouse_id destinationWarehouseId,
          o.destination_code destinationWarehouseCode,o.destination_name destinationWarehouseName,
          o.customer_name customerName,COALESCE(m.actual_goods_name,'') goodsName,

firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java

@@ -113,7 +113,8 @@ public class SmartLoadingService {
             first.destinationWarehouseId(), first.destinationWarehouseCode(), first.destinationWarehouseName(),
             first.customerName(), goods, packages, first.unitGrossWeightKg(), first.unitNetWeightKg(),
             averageVolume, volume, first.coLoadGroupId(), first.groupNo(), first.memberCount(),
-            first.groupTotalBoxes(), first.locked(), first.blockReason());
+            first.groupTotalBoxes(), first.locked(), first.blockReason(), first.orderStatusSnapshot(),
+            first.expectedArrivalAt());
     }
 
     public Plan draftByBooking(long bookingId) {
@@ -563,7 +564,8 @@ public class SmartLoadingService {
                 candidate.customerName(), candidate.goodsName(), candidate.availablePackageCount(),
                 candidate.unitGrossWeightKg(), candidate.unitNetWeightKg(), candidate.unitVolumeCbm(),
                 group.groupId(), group.groupNo(), group.members().size(), group.fullPackageCount(),
-                group.lockedPlanId() != null, blocks.get(group.groupId()));
+                group.lockedPlanId() != null, blocks.get(group.groupId()), candidate.orderStatusSnapshot(),
+                candidate.expectedArrivalAt());
         }).toList();
     }
 

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -409,6 +409,7 @@ paths:
       description: >-
         需要 platform:firstleg:smart-loading:list 权限。每个入库单/入仓码只返回一行；
         平均单箱毛重、净重按整票实测重量除以总箱数，平均单箱体积按剩余规格数量加权。
+        响应携带订单状态快照 orderStatusSnapshot 与预计到货时间 expectedArrivalAt，供平台筛选候选入仓码；
         这些数据用于数量级计划，不表示具体箱号已核验归属。
       parameters:
         - {name: bookingId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}

firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java

@@ -13,7 +13,7 @@ class SmartLoadingCandidateMapperContractTest {
     @Test
     void candidateHasOnlyTheCanonicalMybatisConstructor() {
         assertThat(Candidate.class.getDeclaredConstructors()).singleElement()
-            .satisfies(constructor -> assertThat(constructor.getParameterCount()).isEqualTo(24));
+            .satisfies(constructor -> assertThat(constructor.getParameterCount()).isEqualTo(26));
     }
 
     @Test
@@ -23,6 +23,8 @@ class SmartLoadingCandidateMapperContractTest {
 
         assertThat(sql)
             .contains("o.destination_warehouse_id destinationWarehouseId")
+            .contains("o.order_status_snapshot orderStatusSnapshot")
+            .contains("o.expected_arrival_at expectedArrivalAt")
             .contains("m.status='APPROVED'")
             .contains("SELECT MAX(m2.id)")
             .contains("m2.status='APPROVED'")
@@ -51,6 +53,8 @@ class SmartLoadingCandidateMapperContractTest {
 
         assertThat(sql)
             .contains("o.destination_warehouse_id destinationWarehouseId")
+            .contains("o.order_status_snapshot orderStatusSnapshot")
+            .contains("o.expected_arrival_at expectedArrivalAt")
             .contains("m.status='APPROVED'")
             .contains("SELECT MAX(m2.id)")
             .contains("o.warehouse_id=#{warehouseId}")

firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java

@@ -122,11 +122,11 @@ class SmartLoadingServiceTest {
         Candidate first = new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "服装", 3,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.2"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, "WAIT_SPLIT", LocalDateTime.parse("2026-09-10T09:30:00"));
         Candidate second = new Candidate(9L, 10L, 21L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "鞋类", 7,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.5"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, "WAIT_SPLIT", LocalDateTime.parse("2026-09-10T09:30:00"));
         when(repository.booking(99L)).thenReturn(booking());
         when(repository.candidates(100L)).thenReturn(List.of(first, second));
 
@@ -139,6 +139,8 @@ class SmartLoadingServiceTest {
             assertThat(candidate.averageUnitVolumeCbm()).isEqualByComparingTo("0.410000");
             assertThat(candidate.availableVolumeCbm()).isEqualByComparingTo("4.1000");
             assertThat(candidate.unitGrossWeightKg()).isEqualByComparingTo("2");
+            assertThat(candidate.orderStatusSnapshot()).isEqualTo("WAIT_SPLIT");
+            assertThat(candidate.expectedArrivalAt()).isEqualTo(LocalDateTime.parse("2026-09-10T09:30:00"));
         });
     }
 
@@ -440,15 +442,15 @@ class SmartLoadingServiceTest {
         Candidate first = new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "A", 30,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.2"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, null, null);
         Candidate second = new Candidate(9L, 10L, 21L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "B", 40,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.5"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, null, null);
         Candidate third = new Candidate(9L, 10L, 22L, 30L, "O", "I", 100L,
             "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "C", 30,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.8"),
-            null, null, null, null, null, null);
+            null, null, null, null, null, null, null, null);
 
         var result = service.proportionalAllocations(List.of(first, second, third), 60);
 
@@ -1109,7 +1111,7 @@ class SmartLoadingServiceTest {
         return new Candidate(tenantId, inboundId, detailId, orderId, "O" + orderId, "I" + inboundId,
             100L, "FBA", "FBA渠道", 200L, destinationCode, "FBA仓", "客户", "货物", boxes,
             new BigDecimal("2"), new BigDecimal("1.5"),
-            new BigDecimal("0.5"), null, null, null, null, null, null);
+            new BigDecimal("0.5"), null, null, null, null, null, null, null, null);
     }
 
     private static Candidate withChannel(Candidate value, String channelCode, String channelName) {
@@ -1118,7 +1120,8 @@ class SmartLoadingServiceTest {
             value.destinationWarehouseId(), value.destinationWarehouseCode(), value.destinationWarehouseName(),
             value.customerName(), value.goodsName(), value.availablePackageCount(), value.unitGrossWeightKg(),
             value.unitNetWeightKg(), value.unitVolumeCbm(), value.coLoadGroupId(), value.groupNo(),
-            value.memberCount(), value.groupTotalBoxes(), value.locked(), value.blockReason());
+            value.memberCount(), value.groupTotalBoxes(), value.locked(), value.blockReason(),
+            value.orderStatusSnapshot(), value.expectedArrivalAt());
     }
 
     private static ChannelRow channel(String channelCode, String channelName) {