优化

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchController.java

@@ -29,7 +29,7 @@ public class DispatchController {
 
     @PutMapping("/{dispatchNo}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_EDIT + "')")
-    @Operation(summary = "Edit vehicle, driver, appointment and route data")
+    @Operation(summary = "Edit vehicle, driver and appointment data; route is derived from assigned FBA warehouses")
     public ApiResponse<DispatchResponse> update(
         @AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String dispatchNo,

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchRequests.java

@@ -20,18 +20,18 @@ public final class DispatchRequests {
     }
 
     public record PreArrange(@NotEmpty @Size(max = 500) List<@NotNull Long> planPalletIds,
-                             @Size(max = 255) String route, @Size(max = 64) String fbaAppointmentNo,
+                             @Size(max = 64) String fbaAppointmentNo,
                              @Size(max = 32) String fbaAppointmentStatus,
                              @Size(max = 32) String vehicleAppointmentStatus,
                              @Size(max = 64) String draftToken,
                              @Size(max = 64) String relabelNo) {
-        public PreArrange(List<Long> planPalletIds, String route, String fbaAppointmentNo,
+        public PreArrange(List<Long> planPalletIds, String fbaAppointmentNo,
                           String fbaAppointmentStatus, String vehicleAppointmentStatus) {
-            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, null, null);
+            this(planPalletIds, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, null, null);
         }
-        public PreArrange(List<Long> planPalletIds, String route, String fbaAppointmentNo,
+        public PreArrange(List<Long> planPalletIds, String fbaAppointmentNo,
                           String fbaAppointmentStatus, String vehicleAppointmentStatus, String draftToken) {
-            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, draftToken, null);
+            this(planPalletIds, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, draftToken, null);
         }
     }
 
@@ -51,7 +51,6 @@ public final class DispatchRequests {
 
     public record Update(@Size(max = 64) String vehiclePlate, @Size(max = 128) String driverName,
                          @Size(max = 64) String driverPhone, @Size(max = 255) String carrierName,
-                         @Size(max = 255) String route,
                          @Size(max = 64) String fbaAppointmentNo,
                          @Size(max = 32) String fbaAppointmentStatus,
                          @Size(max = 32) String vehicleAppointmentStatus,

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java

@@ -305,7 +305,7 @@ public class DispatchService {
             dispatch.setCreatedBy(trimToNull(operatorId));
             dispatch.setCreatedAt(now);
         }
-        dispatch.setRoute(StringUtils.hasText(request.route()) ? request.route().trim() : route(selected));
+        dispatch.setRoute(candidateRoute(selected));
         dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo()));
         dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus()));
         dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus()));
@@ -427,7 +427,7 @@ public class DispatchService {
         LocalDateTime now = LocalDateTime.now();
         DispatchOrder dispatch = new DispatchOrder(); dispatch.setId(IdWorker.getId()); dispatch.setCustomerId(customerId);
         dispatch.setDispatchNo(orderNoGenerator.next("DISPATCH", warehouse, dispatch.getId())); dispatch.setOverseasWarehouseId(warehouse); dispatch.setOverseasWarehouseName(selected.get(0).overseasWarehouseName());
-        dispatch.setRoute(StringUtils.hasText(request.route()) ? request.route().trim() : route(selected)); dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo())); dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus())); dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus())); dispatch.setStatus(PENDING_DEPARTURE); dispatch.setItemCount(selected.size()); dispatch.setPalletCount(selected.size()); dispatch.setPackageCount(selected.stream().map(DispatchPalletCandidate::packageCount).filter(Objects::nonNull).mapToInt(Integer::intValue).sum()); dispatch.setPickedPackageCount(0); dispatch.setShippedPackageCount(0); dispatch.setCreatedBy(trimToNull(operatorId)); dispatch.setCreatedAt(now); dispatch.setUpdatedAt(now); orders.insert(dispatch);
+        dispatch.setRoute(candidateRoute(selected)); dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo())); dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus())); dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus())); dispatch.setStatus(PENDING_DEPARTURE); dispatch.setItemCount(selected.size()); dispatch.setPalletCount(selected.size()); dispatch.setPackageCount(selected.stream().map(DispatchPalletCandidate::packageCount).filter(Objects::nonNull).mapToInt(Integer::intValue).sum()); dispatch.setPickedPackageCount(0); dispatch.setShippedPackageCount(0); dispatch.setCreatedBy(trimToNull(operatorId)); dispatch.setCreatedAt(now); dispatch.setUpdatedAt(now); orders.insert(dispatch);
         for (DispatchPalletCandidate candidate : selected) { DispatchItem item = new DispatchItem(); item.setId(IdWorker.getId()); item.setDispatchOrderId(dispatch.getId()); item.setCustomerId(customerId); item.setWarehousePalletId(candidate.warehousePalletId()); item.setOrderId(candidate.orderId()); item.setOverseasWarehouseId(candidate.overseasWarehouseId()); item.setOverseasWarehouseName(candidate.overseasWarehouseName()); item.setOrderNo(candidate.orderNo()); item.setOrderRefs(candidate.orderRefs()); item.setInboundCode(candidate.inboundCode()); item.setPalletNo(candidate.palletNo()); item.setDestinationWarehouseCode(candidate.destinationWarehouseCode()); item.setDestinationWarehouseName(candidate.destinationWarehouseName()); item.setFbaWarehouseCode(candidate.fbaWarehouseCode()); item.setPackageCount(Objects.requireNonNullElse(candidate.packageCount(), 0)); item.setVolumeCbm(Objects.requireNonNullElse(candidate.volumeCbm(), BigDecimal.ZERO)); item.setSourceStage("RELABEL"); item.setCartonMarks(candidate.relabelCartonMarks()); item.setSourceBusinessType("RELABEL_ORDER"); item.setSourceBusinessNo(request.relabelNo()); item.setCreatedAt(now); items.insert(item); }
         DispatchPdaTask task = new DispatchPdaTask(); task.setId(IdWorker.getId()); task.setCustomerId(customerId); task.setDispatchOrderId(dispatch.getId()); task.setTaskNo("DPDA" + task.getId()); task.setStatus("PDA_PENDING"); task.setWarehouseId(warehouse); task.setPushedAt(now); task.setCreatedAt(now); task.setUpdatedAt(now); pdaTasks.insert(task);
         if (candidates.markRelabelPreDispatched(customerId, request.relabelNo()) != 1) throw new ResponseStatusException(HttpStatus.CONFLICT, "换标订单已被其他排车占用");
@@ -502,18 +502,19 @@ public class DispatchService {
                 "Only a pending dispatch can be edited");
         }
         String customerId = dispatch.getCustomerId();
+        List<DispatchItem> assignedItems = items.findByDispatchOrder(customerId, dispatch.getId());
         dispatch.setVehiclePlate(trimToNull(request.vehiclePlate()));
         dispatch.setDriverName(trimToNull(request.driverName()));
         dispatch.setDriverPhone(trimToNull(request.driverPhone()));
         dispatch.setCarrierName(trimToNull(request.carrierName()));
-        dispatch.setRoute(trimToNull(request.route()));
+        dispatch.setRoute(itemRoute(assignedItems));
         dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo()));
         dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus()));
         dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus()));
         dispatch.setEstimatedArrivalAt(request.estimatedArrivalAt());
         dispatch.setUpdatedAt(LocalDateTime.now());
         orders.updateById(dispatch);
-        return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
+        return response(dispatch, assignedItems);
     }
 
     @Transactional
@@ -545,6 +546,7 @@ public class DispatchService {
         dispatch.setPalletCount(remaining.size());
         dispatch.setPackageCount(remaining.stream().map(DispatchItem::getPackageCount).filter(Objects::nonNull)
             .mapToInt(Integer::intValue).sum());
+        dispatch.setRoute(itemRoute(remaining));
         dispatch.setUpdatedAt(now);
         orders.updateById(dispatch);
         return response(dispatch, remaining);
@@ -608,7 +610,7 @@ public class DispatchService {
         String orderNos = itemList.stream().flatMap(item -> splitOrderRefs(item.getOrderRefs(), item.getOrderNo()).stream())
             .distinct().collect(Collectors.joining(","));
         return new DispatchResponse(order.getId(), order.getDispatchNo(), order.getVehiclePlate(), order.getDriverName(),
-            order.getDriverPhone(), order.getCarrierName(), orderNos, order.getRoute(),
+            order.getDriverPhone(), order.getCarrierName(), orderNos, itemRoute(itemList),
             order.getOverseasWarehouseId(), order.getOverseasWarehouseName(), order.getDepartAt(),
             order.getFbaAppointmentNo(), order.getFbaAppointmentStatus(), order.getVehicleAppointmentStatus(),
             order.getEstimatedArrivalAt(), order.getStatus(), Objects.requireNonNullElse(order.getItemCount(), 0),
@@ -625,9 +627,24 @@ public class DispatchService {
             bolLineList == null ? List.of() : bolLineList);
     }
 
-    private static String route(List<DispatchPalletCandidate> selected) {
-        return selected.stream().map(DispatchPalletCandidate::destinationWarehouseCode).filter(StringUtils::hasText)
-            .distinct().collect(Collectors.joining(" -> "));
+    private static String candidateRoute(List<DispatchPalletCandidate> selected) {
+        return selected.stream().map(DispatchService::candidateFbaCode).filter(StringUtils::hasText)
+            .distinct().collect(Collectors.joining(","));
+    }
+
+    private static String itemRoute(List<DispatchItem> assignedItems) {
+        return assignedItems.stream().map(DispatchService::itemFbaCode).filter(StringUtils::hasText)
+            .distinct().collect(Collectors.joining(","));
+    }
+
+    private static String candidateFbaCode(DispatchPalletCandidate candidate) {
+        return StringUtils.hasText(candidate.fbaWarehouseCode())
+            ? candidate.fbaWarehouseCode().trim() : trimToNull(candidate.destinationWarehouseCode());
+    }
+
+    private static String itemFbaCode(DispatchItem item) {
+        return StringUtils.hasText(item.getFbaWarehouseCode())
+            ? item.getFbaWarehouseCode().trim() : trimToNull(item.getDestinationWarehouseCode());
     }
 
     private DispatchPalletCandidate requireDraftCandidate(String customerId, Long planPalletId) {

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -2113,7 +2113,6 @@ components:
       required: [planPalletIds]
       properties:
         planPalletIds: { type: array, minItems: 1, maxItems: 500, uniqueItems: true, items: { type: string } }
-        route: { type: string, nullable: true, maxLength: 255 }
         fbaAppointmentNo: { type: string, nullable: true, maxLength: 64 }
         fbaAppointmentStatus: { type: string, nullable: true, maxLength: 32, default: PENDING }
         vehicleAppointmentStatus: { type: string, nullable: true, maxLength: 32, default: PENDING }
@@ -2160,13 +2159,12 @@ components:
         palletIds: { type: array, items: { type: string } }
     DispatchUpdate:
       type: object
-      description: 普通编辑字段；不包含 status 或 departAt。
+      description: 普通编辑字段；不包含 status、departAt 或路线，路线由已排托盘关联的 FBA 仓自动汇总。
       properties:
         vehiclePlate: { type: string, nullable: true, maxLength: 64 }
         driverName: { type: string, nullable: true, maxLength: 128 }
         driverPhone: { type: string, nullable: true, maxLength: 64 }
         carrierName: { type: string, nullable: true, maxLength: 255 }
-        route: { type: string, nullable: true, maxLength: 255 }
         fbaAppointmentNo: { type: string, nullable: true, maxLength: 64 }
         fbaAppointmentStatus: { type: string, nullable: true, maxLength: 32 }
         vehicleAppointmentStatus: { type: string, nullable: true, maxLength: 32 }

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

@@ -31,6 +31,12 @@ class SmartDispatchOpenApiContractTest {
         assertTrue(yaml.contains("platform:overseas-warehouse:inbound-order:smart-dispatch"));
         assertTrue(yaml.contains("SmartDispatchPreArrange"));
         assertTrue(yaml.contains("SmartDispatchCandidate"));
+        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(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/controller/SmartDispatchControllerTest.java

@@ -53,7 +53,7 @@ class SmartDispatchControllerTest {
     @Test
     void preArrangeResolvesSingleCustomerAndAuthenticatedOperator() {
         DispatchRequests.PreArrange request = new DispatchRequests.PreArrange(
-            List.of(10L, 11L), "ONT8 -> LAX9", "APT-1", "SUCCESS", "PENDING");
+            List.of(10L, 11L), "APT-1", "SUCCESS", "PENDING");
         when(service.resolveCustomerScopeForPallets(List.of(10L, 11L))).thenReturn("100");
 
         controller.preArrange(platform(), request);

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

@@ -101,6 +101,7 @@ class DispatchServiceTest {
         assertNotNull(DispatchService.class.getMethod("preArrange", String.class, String.class,
             DispatchRequests.PreArrange.class).getAnnotation(Transactional.class));
         when(candidates.lockSelected("100", List.of(10L))).thenReturn(List.of(candidate(10L, null, "ONT8")));
+        when(items.findByDispatchOrder(eq("100"), any())).thenReturn(List.of(item(11L, "ONT8")));
 
         var result = service.preArrange("100", "7", new DispatchRequests.PreArrange(List.of(10L), null,
             null, null, null));
@@ -119,6 +120,22 @@ class DispatchServiceTest {
         verify(items).insert(any(DispatchItem.class));
     }
 
+    @Test
+    void preArrangeBuildsCommaSeparatedDistinctFbaRouteFromAssignedPallets() {
+        when(candidates.lockSelected("100", List.of(10L, 11L, 12L))).thenReturn(List.of(
+            candidate(10L, null, "ONT8"), candidate(11L, null, "ABE4"), candidate(12L, null, "ONT8")));
+        when(items.findByDispatchOrder(eq("100"), any())).thenReturn(List.of(
+            item(21L, "ONT8"), item(22L, "ABE4"), item(23L, "ONT8")));
+
+        DispatchResponse result = service.preArrange("100", "7",
+            new DispatchRequests.PreArrange(List.of(10L, 11L, 12L), null, null, null));
+
+        assertEquals("ONT8,ABE4", result.route());
+        ArgumentCaptor<DispatchOrder> dispatch = ArgumentCaptor.forClass(DispatchOrder.class);
+        verify(orders).insert(dispatch.capture());
+        assertEquals("ONT8,ABE4", dispatch.getValue().getRoute());
+    }
+
     @Test
     void movingPalletIntoDraftImmediatelyCreatesExpiringExclusiveLock() {
         when(candidates.lockSelected("100", List.of(10L))).thenReturn(List.of(candidate(10L, null, "ONT8")));
@@ -197,7 +214,7 @@ class DispatchServiceTest {
         when(locks.lockActive("100", "PLAN:10")).thenReturn(lock);
         when(drafts.lockActive("draft-1", "7")).thenReturn(draft);
 
-        service.preArrange("100", "7", new DispatchRequests.PreArrange(List.of(10L), null, null, null, null, "draft-1"));
+        service.preArrange("100", "7", new DispatchRequests.PreArrange(List.of(10L), null, null, null, "draft-1"));
 
         assertNotNull(lock.getDispatchOrderId());
         assertEquals("draft-1", lock.getDraftToken());
@@ -326,13 +343,18 @@ class DispatchServiceTest {
         dispatch.setId(1L); dispatch.setCustomerId("100"); dispatch.setDispatchNo("PC1");
         dispatch.setStatus(DispatchService.PENDING_DEPARTURE);
         when(orders.lockGlobalByDispatchNo("PC1")).thenReturn(dispatch);
-        DispatchRequests.Update request = new DispatchRequests.Update("ABC-1", "Driver", null, null, null,
+        DispatchItem ont8 = item(11L, "ONT8");
+        DispatchItem abe4 = item(12L, "ABE4");
+        when(items.findByDispatchOrder("100", 1L)).thenReturn(List.of(ont8, abe4, item(13L, "ONT8")));
+        DispatchRequests.Update request = new DispatchRequests.Update("ABC-1", "Driver", null, null,
             null, null, null, LocalDateTime.now());
 
         DispatchResponse result = service.update("PC1", request);
 
         assertEquals(DispatchService.PENDING_DEPARTURE, dispatch.getStatus());
         assertEquals("ABC-1", result.vehiclePlate());
+        assertEquals("ONT8,ABE4", result.route());
+        assertEquals("ONT8,ABE4", dispatch.getRoute());
         verify(orders).updateById(dispatch);
         verify(items).findByDispatchOrder("100", 1L);
     }
@@ -343,7 +365,7 @@ class DispatchServiceTest {
         dispatch.setId(1L); dispatch.setCustomerId("100"); dispatch.setDispatchNo("PC1");
         dispatch.setStatus("DEPARTED");
         when(orders.lockGlobalByDispatchNo("PC1")).thenReturn(dispatch);
-        DispatchRequests.Update request = new DispatchRequests.Update(null, null, null, null, null,
+        DispatchRequests.Update request = new DispatchRequests.Update(null, null, null, null,
             null, null, null, null);
 
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
@@ -442,4 +464,11 @@ class DispatchServiceTest {
             "LIP1-P001", destination, destination, destination, destination, packageCount,
             new BigDecimal("1.2000"), warehousePalletId == null ? "PLAN" : "RECEIVED");
     }
+
+    private DispatchItem item(long id, String fbaWarehouseCode) {
+        DispatchItem item = new DispatchItem();
+        item.setId(id);
+        item.setFbaWarehouseCode(fbaWarehouseCode);
+        return item;
+    }
 }