优化

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

@@ -86,5 +86,9 @@ public final class ContainerDtos {
         @Size(max = 64) String voyageNo,
         @NotNull @PositiveOrZero Integer version,
         @NotBlank @Size(max = 500) String reason
-    ) {}
+    ) {
+        public TransportUpdateRequest(String containerNo, String voyageNo, Integer version) {
+            this(containerNo, voyageNo, version, "运输信息更新");
+        }
+    }
 }

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

@@ -65,6 +65,11 @@ public final class LoadingPickDtos {
         @NotBlank @Size(max = 64) String inventorySnapshotToken,
         @NotEmpty @Size(max = 500) List<@Valid BatchItemRequest> items
     ) {
+        @Deprecated
+        public BatchRequest(Long warehouseId, String containerNo, Integer expectedVersion,
+                            String inventorySnapshotToken, List<BatchItemRequest> items) {
+            this(warehouseId, null, null, containerNo, expectedVersion, inventorySnapshotToken, items);
+        }
     }
 
     public record BatchItemRequest(

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

@@ -9,6 +9,12 @@ public final class SmartLoadingDtos { private SmartLoadingDtos(){}
    BigDecimal unitWeightKg, BigDecimal unitVolumeCbm) {
    this(accountId,inboundId,inboundDetailId,orderId,orderNo,inboundCode,warehouseId,null,null,null,destinationWarehouseCode,null,customerName,goodsName,availablePackageCount,unitWeightKg,unitVolumeCbm);
   }
+  public Candidate(Long accountId, Long inboundId, Long inboundDetailId, Long orderId, String orderNo, String inboundCode,
+   Long warehouseId, Long destinationWarehouseId, String destinationWarehouseCode, String destinationWarehouseName,
+   String customerName, String goodsName, Integer availablePackageCount, BigDecimal unitWeightKg, BigDecimal unitVolumeCbm) {
+   this(accountId,inboundId,inboundDetailId,orderId,orderNo,inboundCode,warehouseId,null,null,destinationWarehouseId,
+    destinationWarehouseCode,destinationWarehouseName,customerName,goodsName,availablePackageCount,unitWeightKg,unitVolumeCbm);
+  }
  }
  public record CreateRequest(@NotNull @Positive Long bookingId, @Size(max=500) String remark) {}
  public record AssignRequest(@NotNull @Positive Long inboundId,@NotNull @Positive Long inboundDetailId,

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

@@ -132,7 +132,7 @@ class Phase3FinalUnifiedSqlContractTest {
             .contains("存在缺失中文注释的业务字段")
             .doesNotContain("CREATE PROCEDURE upgrade_column_comment");
         assertThat(count(sql, "CALL queue_table_comment(")).isEqualTo(150);
-        assertThat(count(sql, "CALL queue_column_comment(")).isEqualTo(2457);
+        assertThat(count(sql, "CALL queue_column_comment(")).isEqualTo(2459);
         assertThat(sql.indexOf("CALL apply_queued_comments();",
             sql.indexOf("-- END GENERATED NINE-SCHEMA COMMENT UPGRADE CALLS")))
             .isGreaterThan(sql.indexOf("-- END GENERATED NINE-SCHEMA COMMENT UPGRADE CALLS"));

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

@@ -226,7 +226,7 @@ class LoadingPickServiceTest {
             ApiResponse.success(List.of(new WarehousePalletLocationClient.OccupiedResource(
                 71L, 72L, 0, 101L, 73L, 74L, "A-01", false, 2))));
         String snapshotToken = service.inventorySnapshot(20L, 101L).snapshotToken();
-        BatchRequest request = new BatchRequest(101L, "CSLU1234567", 0, snapshotToken, List.of(
+        BatchRequest request = new BatchRequest(101L, 10L, 99L, "CSLU1234567", 0, snapshotToken, List.of(
             new BatchItemRequest(30L, "PICK", 2, null, "MANUAL", List.of(), 0, null),
             new BatchItemRequest(31L, "SKIP", null, null, null, null, 0, "damaged carton")));
 
@@ -256,7 +256,7 @@ class LoadingPickServiceTest {
         when(repository.assignment(20L)).thenReturn(assignment());
         when(repository.items(20L)).thenReturn(items);
         when(repository.items(20L, 101L)).thenReturn(items);
-        BatchRequest request = new BatchRequest(101L, "CSLU1234567", 0, "stale-token", List.of(
+        BatchRequest request = new BatchRequest(101L, 10L, 99L, "CSLU1234567", 0, "stale-token", List.of(
             new BatchItemRequest(30L, "PICK", 2, null, "MANUAL", List.of(), 0, null),
             new BatchItemRequest(31L, "PARTIAL", null, 4, "AUTO", null, 0, null)));
 
@@ -280,7 +280,7 @@ class LoadingPickServiceTest {
         when(warehouse.occupiedResources(any(), any(Long.class), any(), any(Long.class))).thenReturn(
             ApiResponse.success(List.of(new WarehousePalletLocationClient.OccupiedResource(
                 71L, 72L, 0, 101L, 73L, 74L, "A-01", false, 2))));
-        BatchRequest request = new BatchRequest(101L, "CSLU1234567", 0, "0".repeat(64), List.of(
+        BatchRequest request = new BatchRequest(101L, 10L, 99L, "CSLU1234567", 0, "0".repeat(64), List.of(
             new BatchItemRequest(30L, "PICK", 2, null, "MANUAL", List.of(), 0, null)));
 
         assertThatThrownBy(() -> service.batch(20L, "batch-inventory-stale", request, 9L, "operator"))
@@ -298,7 +298,7 @@ class LoadingPickServiceTest {
         LoadingPickTaskEntity task = task();
         task.setVersion(3);
         when(repository.taskForUpdate(20L)).thenReturn(task);
-        BatchRequest request = new BatchRequest(101L, "CSLU1234567", 2, "stale-token", List.of(
+        BatchRequest request = new BatchRequest(101L, 10L, 99L, "CSLU1234567", 2, "stale-token", List.of(
             new BatchItemRequest(30L, "PICK", 2, null, "AUTO", null, 0, null)));
 
         assertThatThrownBy(() -> service.batch(20L, "batch-stale", request, 9L, "operator"))
@@ -334,6 +334,7 @@ class LoadingPickServiceTest {
         LoadingPickTaskEntity task = new LoadingPickTaskEntity();
         task.setId(20L);
         task.setLoadingPlanId(10L);
+        task.setContainerBookingId(99L);
         task.setContainerNo("CSLU1234567");
         task.setTaskStatus("LOADING");
         task.setVersion(0);

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

@@ -455,13 +455,14 @@ class SmartLoadingServiceTest {
     }
 
     private static Candidate candidate(int boxes) {
-        return new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L, 200L,
+        return new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L, "FBA", "FBA渠道", 200L,
             "FBA1", "FBA仓", "客户", "货物", boxes, new BigDecimal("2"), new BigDecimal("0.5"));
     }
 
     private static ContainerBookingEntity booking() {
         ContainerBookingEntity value = new ContainerBookingEntity();
         value.setId(99L); value.setWarehouseId(100L); value.setDestinationWarehouseCode("FBA1");
+        value.setChannelCode("FBA");
         value.setContainerNo("MSCU1234567");
         value.setCapacityCbm(new BigDecimal("60")); value.setMaxWeightKg(new BigDecimal("20000"));
         return value;