优化提交

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

@@ -38,6 +38,17 @@ public class DispatchController {
         return ApiResponse.success(service.update(dispatchNo, request));
     }
 
+    @DeleteMapping("/{dispatchNo}/items/{itemId}")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_EDIT + "')")
+    @Operation(summary = "Remove one unpicked pallet before an outbound order is generated")
+    public ApiResponse<DispatchResponse> removeItem(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String dispatchNo,
+        @PathVariable Long itemId) {
+        requirePlatform(user);
+        return ApiResponse.success(service.removeItem(dispatchNo, itemId));
+    }
+
     @DeleteMapping("/{dispatchNo}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_CANCEL + "')")
     @Operation(summary = "Cancel a pending dispatch and release its pallet locks")

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

@@ -74,7 +74,9 @@ public class SmartDispatchController {
         @AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody DispatchRequests.PreArrange request) {
         requirePlatform(user);
-        String scopedCustomer = service.resolveCustomerScopeForPallets(request.planPalletIds());
+        String scopedCustomer = request.relabelNo() == null || request.relabelNo().isBlank()
+            ? service.resolveCustomerScopeForPallets(request.planPalletIds())
+            : service.resolveCustomerScopeForRelabel(request.relabelNo());
         String operatorId = user.userId() == null ? user.username() : String.valueOf(user.userId());
         return ApiResponse.success(service.preArrange(scopedCustomer, operatorId, request));
     }

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchCandidateMapper.java

@@ -53,7 +53,18 @@ public interface DispatchCandidateMapper {
         "ELSE a.planned_package_count END),0) END AS packageCount,p.allocated_volume_cbm AS volumeCbm," +
         "CASE WHEN p.warehouse_pallet_id IS NULL THEN 'PLAN' ELSE 'RECEIVED' END AS sourceStage," +
         "(SELECT GROUP_CONCAT(DISTINCT c.carton_mark ORDER BY c.carton_mark SEPARATOR ',') " +
-        "FROM ll_inbound_plan_carton c WHERE c.plan_pallet_id=p.id) AS cartonMarks " +
+        "FROM ll_inbound_plan_carton c WHERE c.plan_pallet_id=p.id AND NOT EXISTS (" +
+        "SELECT 1 FROM ll_relabel_item ri JOIN ll_inventory_position rp ON rp.id=ri.source_inventory_position_id " +
+        "JOIN ll_relabel_application ra ON ra.id=ri.application_id AND ra.customer_id=ri.customer_id " +
+        "WHERE ri.customer_id=ip.customer_id AND rp.pallet_id=p.warehouse_pallet_id " +
+        "AND ri.carton_mark=c.carton_mark AND ri.fba_carton_mark IS NOT NULL AND ri.fba_carton_mark != '' " +
+        "AND ra.status NOT IN ('REJECTED','CANCELLED'))) AS cartonMarks," +
+        "(SELECT GROUP_CONCAT(DISTINCT ri.fba_carton_mark ORDER BY ri.fba_carton_mark SEPARATOR ',') " +
+        "FROM ll_relabel_item ri JOIN ll_inventory_position rp ON rp.id=ri.source_inventory_position_id " +
+        "JOIN ll_relabel_application ra ON ra.id=ri.application_id AND ra.customer_id=ri.customer_id " +
+        "WHERE ri.customer_id=ip.customer_id AND rp.pallet_id=p.warehouse_pallet_id " +
+        "AND ri.fba_carton_mark IS NOT NULL AND ri.fba_carton_mark != '' " +
+        "AND ra.status NOT IN ('REJECTED','CANCELLED')) AS relabelCartonMarks " +
         "FROM ll_inbound_plan_pallet p JOIN ll_inbound_plan ip ON ip.id=p.plan_id " +
         "LEFT JOIN ll_inbound_plan_pallet_allocation a ON a.pallet_id=p.id " +
         "LEFT JOIN ll_inbound_plan_line l ON l.id=a.line_id " +
@@ -81,6 +92,9 @@ public interface DispatchCandidateMapper {
         "AND NOT EXISTS (SELECT 1 FROM ll_warehouse_transfer_inventory_allocation ta " +
         "JOIN ll_inventory_position tp ON tp.id=ta.inventory_position_id " +
         "WHERE ta.customer_id=ip.customer_id AND ta.status='RESERVED' AND tp.pallet_id=p.warehouse_pallet_id) " +
+        "AND NOT EXISTS (SELECT 1 FROM ll_relabel_item rli JOIN ll_relabel_application rla ON rla.id=rli.application_id AND rla.customer_id=rli.customer_id " +
+        "WHERE rli.customer_id=ip.customer_id AND rli.source_inbound_order_id IS NOT NULL " +
+        "AND rli.source_inbound_order_id=o.id AND rla.status NOT IN ('REJECTED','CANCELLED','COMPLETED')) " +
         "GROUP BY p.plan_id,p.id,p.warehouse_pallet_id,p.pallet_no,p.destination_warehouse_id," +
         "p.destination_warehouse_code,p.destination_warehouse_name,p.allocated_volume_cbm " +
         "ORDER BY p.plan_id,p.sequence_no" +
@@ -121,7 +135,18 @@ public interface DispatchCandidateMapper {
         "ELSE a.planned_package_count END),0) END AS packageCount,p.allocated_volume_cbm AS volumeCbm," +
         "CASE WHEN p.warehouse_pallet_id IS NULL THEN 'PLAN' ELSE 'RECEIVED' END AS sourceStage," +
         "(SELECT GROUP_CONCAT(DISTINCT c.carton_mark ORDER BY c.carton_mark SEPARATOR ',') " +
-        "FROM ll_inbound_plan_carton c WHERE c.plan_pallet_id=p.id) AS cartonMarks " +
+        "FROM ll_inbound_plan_carton c WHERE c.plan_pallet_id=p.id AND NOT EXISTS (" +
+        "SELECT 1 FROM ll_relabel_item ri JOIN ll_inventory_position rp ON rp.id=ri.source_inventory_position_id " +
+        "JOIN ll_relabel_application ra ON ra.id=ri.application_id AND ra.customer_id=ri.customer_id " +
+        "WHERE ri.customer_id=ip.customer_id AND rp.pallet_id=p.warehouse_pallet_id " +
+        "AND ri.carton_mark=c.carton_mark AND ri.fba_carton_mark IS NOT NULL AND ri.fba_carton_mark != '' " +
+        "AND ra.status NOT IN ('REJECTED','CANCELLED'))) AS cartonMarks," +
+        "(SELECT GROUP_CONCAT(DISTINCT ri.fba_carton_mark ORDER BY ri.fba_carton_mark SEPARATOR ',') " +
+        "FROM ll_relabel_item ri JOIN ll_inventory_position rp ON rp.id=ri.source_inventory_position_id " +
+        "JOIN ll_relabel_application ra ON ra.id=ri.application_id AND ra.customer_id=ri.customer_id " +
+        "WHERE ri.customer_id=ip.customer_id AND rp.pallet_id=p.warehouse_pallet_id " +
+        "AND ri.fba_carton_mark IS NOT NULL AND ri.fba_carton_mark != '' " +
+        "AND ra.status NOT IN ('REJECTED','CANCELLED')) AS relabelCartonMarks " +
         "FROM ll_inbound_plan_pallet p JOIN ll_inbound_plan ip ON ip.id=p.plan_id " +
         "LEFT JOIN ll_inbound_plan_pallet_allocation a ON a.pallet_id=p.id " +
         "LEFT JOIN ll_inbound_plan_line l ON l.id=a.line_id " +
@@ -137,6 +162,11 @@ public interface DispatchCandidateMapper {
         "AND NOT EXISTS (SELECT 1 FROM ll_warehouse_transfer_inventory_allocation ta " +
         "JOIN ll_inventory_position tp ON tp.id=ta.inventory_position_id " +
         "WHERE ta.customer_id=#{customerId} AND ta.status='RESERVED' AND tp.pallet_id=p.warehouse_pallet_id) " +
+        "AND NOT EXISTS (SELECT 1 FROM ll_relabel_item rli JOIN ll_relabel_application rla ON rla.id=rli.application_id AND rla.customer_id=rli.customer_id " +
+        "JOIN ll_inbound_plan_line rpl ON rpl.order_id=rli.source_inbound_order_id " +
+        "WHERE rli.customer_id=#{customerId} AND rli.source_inbound_order_id IS NOT NULL AND rpl.id IN " +
+        "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id) " +
+        "AND rla.status NOT IN ('REJECTED','CANCELLED','COMPLETED')) " +
         "GROUP BY p.plan_id,p.id,p.warehouse_pallet_id,p.pallet_no,p.destination_warehouse_id," +
         "p.destination_warehouse_code,p.destination_warehouse_name,p.allocated_volume_cbm " +
         "ORDER BY p.id FOR UPDATE" +
@@ -148,20 +178,27 @@ public interface DispatchCandidateMapper {
         "SELECT NULL AS planId,NULL AS planPalletId,pos.pallet_id AS warehousePalletId,a.lastleg_order_id AS orderId," +
         "a.customer_id AS customerId,NULL AS customerName,NULL AS planNo,'RELABEL_APPLICATION' AS orderType,NULL AS volumeWeightKg,NULL AS containerNo," +
         "NULL AS appointmentAt,NULL AS expectedLoadingAt,a.overseas_warehouse_id AS overseasWarehouseId,MIN(ri.source_warehouse_name) AS overseasWarehouseName," +
-        "MIN(a.relabel_no) AS orderNo,a.relabel_no AS orderRefs,MIN(ri.source_inbound_code) AS inboundCode,pos.pallet_no AS palletNo,NULL AS destinationWarehouseId," +
+        "MIN(COALESCE(NULLIF(ri.source_inbound_order_no,''),NULLIF(a.customer_order_no,''),a.relabel_no)) AS orderNo,a.relabel_no AS orderRefs,MIN(ri.source_inbound_code) AS inboundCode,pos.pallet_no AS palletNo,NULL AS destinationWarehouseId," +
         "GROUP_CONCAT(DISTINCT ri.destination_fba_warehouse_code ORDER BY ri.destination_fba_warehouse_code SEPARATOR ',') AS destinationWarehouseCode," +
         "GROUP_CONCAT(DISTINCT ri.destination_fba_warehouse_code ORDER BY ri.destination_fba_warehouse_code SEPARATOR ',') AS destinationWarehouseName," +
         "GROUP_CONCAT(DISTINCT ri.destination_fba_warehouse_code ORDER BY ri.destination_fba_warehouse_code SEPARATOR ',') AS fbaWarehouseCode," +
-        "SUM(ri.notified_package_count) AS packageCount,NULL AS volumeCbm,'RELABEL' AS sourceStage," +
-        "GROUP_CONCAT(DISTINCT CONCAT(ri.carton_mark,'->',ri.fba_carton_mark) ORDER BY ri.carton_mark SEPARATOR ',') AS cartonMarks " +
+        "SUM(ri.notified_package_count) AS packageCount,MAX(wtp.volume_cbm) AS volumeCbm,'RELABEL' AS sourceStage," +
+        "NULL AS cartonMarks,GROUP_CONCAT(DISTINCT COALESCE(NULLIF(ri.fba_carton_mark,''),ri.carton_mark) " +
+        "ORDER BY COALESCE(NULLIF(ri.fba_carton_mark,''),ri.carton_mark) SEPARATOR ',') AS relabelCartonMarks " +
         "FROM ll_relabel_application a JOIN ll_relabel_item ri ON ri.application_id=a.id AND ri.customer_id=a.customer_id " +
         "JOIN ll_inventory_position pos ON pos.id=ri.source_inventory_position_id AND pos.customer_id=a.customer_id " +
+        "LEFT JOIN ll_warehouse_transfer_order wto ON wto.relabel_no=a.relabel_no AND wto.customer_id=a.customer_id " +
+        "LEFT JOIN ll_warehouse_transfer_pallet wtp ON wtp.transfer_order_id=wto.id AND wtp.customer_id=a.customer_id " +
+        "AND wtp.warehouse_pallet_id=pos.pallet_id " +
         "WHERE a.delivery_method='TRUCK' AND a.status='READY_FOR_OUTBOUND' AND a.fulfillment_status='WAIT_PRE_DISPATCH' " +
         "<if test='customerId != null and customerId != \"\"'>AND a.customer_id=#{customerId} </if>" +
         "<if test='relabelNo != null and relabelNo != \"\"'>AND a.relabel_no=#{relabelNo} </if>" +
         "<if test='orderNo != null and orderNo != \"\"'>AND a.relabel_no LIKE CONCAT('%',#{orderNo},'%') </if>" +
-        "AND pos.available_packages &gt; 0 " +
-        "AND NOT EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=a.customer_id AND di.source_stage='RELABEL' AND di.order_refs=a.relabel_no) " +
+        "AND pos.hold_packages &gt; 0 " +
+        "AND NOT EXISTS (SELECT 1 FROM ll_dispatch_item di JOIN ll_dispatch_order existing_dispatch " +
+        "ON existing_dispatch.id=di.dispatch_order_id AND existing_dispatch.customer_id=di.customer_id " +
+        "WHERE di.customer_id=a.customer_id AND di.source_stage='RELABEL' AND di.order_refs=a.relabel_no " +
+        "AND existing_dispatch.status!='CANCELLED') " +
         "GROUP BY a.id,a.lastleg_order_id,a.customer_id,a.overseas_warehouse_id,a.relabel_no,pos.pallet_id,pos.pallet_no" +
         "</script>")
     List<DispatchPalletCandidate> relabelAvailable(@Param("customerId") String customerId,
@@ -171,4 +208,8 @@ public interface DispatchCandidateMapper {
     @org.apache.ibatis.annotations.Update("UPDATE ll_relabel_application SET fulfillment_status='PRE_DISPATCH_CREATED',updated_at=CURRENT_TIMESTAMP(3) " +
         "WHERE customer_id=#{customerId} AND relabel_no=#{relabelNo} AND fulfillment_status='WAIT_PRE_DISPATCH'")
     int markRelabelPreDispatched(@Param("customerId") String customerId, @Param("relabelNo") String relabelNo);
+
+    @org.apache.ibatis.annotations.Update("UPDATE ll_relabel_application SET fulfillment_status='WAIT_PRE_DISPATCH',updated_at=CURRENT_TIMESTAMP(3) " +
+        "WHERE customer_id=#{customerId} AND relabel_no=#{relabelNo} AND fulfillment_status='PRE_DISPATCH_CREATED'")
+    int restoreRelabelPreDispatch(@Param("customerId") String customerId, @Param("relabelNo") String relabelNo);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchDraftMapper.java

@@ -10,7 +10,13 @@ import java.util.List;
 
 @Mapper
 public interface DispatchDraftMapper extends BaseMapper<DispatchDraft> {
-    @Select("SELECT * FROM ll_dispatch_draft WHERE operator_id=#{operatorId} AND status='ACTIVE' AND (expires_at IS NULL OR expires_at>CURRENT_TIMESTAMP(3)) ORDER BY updated_at DESC")
+    @Select("SELECT d.* FROM ll_dispatch_draft d WHERE d.operator_id=#{operatorId} AND d.status='ACTIVE' " +
+        "AND (d.expires_at IS NULL OR d.expires_at>CURRENT_TIMESTAMP(3)) AND NOT EXISTS (" +
+        "SELECT 1 FROM ll_dispatch_pallet_lock l JOIN ll_outbound_order o ON o.customer_id=l.customer_id " +
+        "AND o.dispatch_order_id=l.dispatch_order_id WHERE l.draft_token=d.draft_token) AND NOT EXISTS (" +
+        "SELECT 1 FROM ll_dispatch_pallet_lock l JOIN ll_dispatch_order x ON x.id=l.dispatch_order_id " +
+        "AND x.customer_id=l.customer_id WHERE l.draft_token=d.draft_token AND x.status!='PENDING_DEPARTURE') " +
+        "ORDER BY d.updated_at DESC")
     List<DispatchDraft> findActiveByOperator(@Param("operatorId") String operatorId);
 
     @Select("SELECT * FROM ll_dispatch_draft WHERE draft_token=#{draftToken} AND operator_id=#{operatorId} AND status='ACTIVE' LIMIT 1 FOR UPDATE")

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchItemMapper.java

@@ -15,6 +15,18 @@ public interface DispatchItemMapper extends BaseMapper<DispatchItem> {
     List<DispatchItem> findByDispatchOrder(@Param("customerId") String customerId,
                                            @Param("dispatchOrderId") Long dispatchOrderId);
 
+    @Select("SELECT * FROM ll_dispatch_item WHERE customer_id=#{customerId} AND dispatch_order_id=#{dispatchOrderId} " +
+        "AND id=#{itemId} LIMIT 1 FOR UPDATE")
+    DispatchItem lockById(@Param("customerId") String customerId,
+                          @Param("dispatchOrderId") Long dispatchOrderId,
+                          @Param("itemId") Long itemId);
+
+    @Select("SELECT * FROM ll_dispatch_item WHERE customer_id=#{customerId} AND dispatch_order_id=#{dispatchOrderId} " +
+        "AND plan_pallet_id=#{planPalletId} LIMIT 1 FOR UPDATE")
+    DispatchItem lockByPlanPallet(@Param("customerId") String customerId,
+                                  @Param("dispatchOrderId") Long dispatchOrderId,
+                                  @Param("planPalletId") Long planPalletId);
+
     @Update("UPDATE ll_dispatch_item i JOIN ll_inbound_plan_pallet p ON p.id=i.plan_pallet_id " +
         "JOIN ll_inbound_plan ip ON ip.id=p.plan_id AND ip.customer_id=i.customer_id " +
         "SET i.warehouse_pallet_id=p.warehouse_pallet_id,i.source_stage='RECEIVED' " +

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchPalletLockMapper.java

@@ -17,6 +17,11 @@ public interface DispatchPalletLockMapper extends BaseMapper<DispatchPalletLock>
     List<DispatchPalletLock> findActiveByDraftContainer(@Param("draftToken") String draftToken,
                                                         @Param("draftContainerId") Long draftContainerId);
 
+    @Select("SELECT l.dispatch_order_id FROM ll_dispatch_pallet_lock l JOIN ll_dispatch_order d " +
+        "ON d.id=l.dispatch_order_id AND d.customer_id=l.customer_id AND d.status='PENDING_DEPARTURE' " +
+        "WHERE l.draft_token=#{draftToken} ORDER BY l.updated_at DESC,l.id DESC LIMIT 1")
+    Long findDispatchOrderIdByDraft(@Param("draftToken") String draftToken);
+
     @Select("SELECT * FROM ll_dispatch_pallet_lock WHERE customer_id=#{customerId} AND source_pallet_key=#{sourcePalletKey} " +
         "AND status='ACTIVE' LIMIT 1 FOR UPDATE")
     DispatchPalletLock lockActive(@Param("customerId") String customerId,

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/model/DispatchPalletCandidate.java

@@ -29,7 +29,8 @@ public record DispatchPalletCandidate(
     Integer packageCount,
     BigDecimal volumeCbm,
     String sourceStage,
-    String cartonMarks
+    String cartonMarks,
+    String relabelCartonMarks
 ) {
     public DispatchPalletCandidate(Long planId, Long planPalletId, Long warehousePalletId, Long orderId,
                                    String overseasWarehouseId, String overseasWarehouseName, String orderNo,
@@ -40,7 +41,7 @@ public record DispatchPalletCandidate(
         this(planId, planPalletId, warehousePalletId, orderId, null, null, null, null, null, null, null, null, overseasWarehouseId,
             overseasWarehouseName, orderNo, orderRefs, inboundCode, palletNo, destinationWarehouseId,
             destinationWarehouseCode, destinationWarehouseName, fbaWarehouseCode, packageCount, volumeCbm,
-            sourceStage, null);
+            sourceStage, null, null);
     }
 
     public DispatchPalletCandidate(Long planId, Long planPalletId, Long warehousePalletId, Long orderId,
@@ -50,7 +51,7 @@ public record DispatchPalletCandidate(
                                    BigDecimal volumeCbm, String sourceStage) {
         this(planId, planPalletId, warehousePalletId, orderId, null, null, null, null, null, null, null, null, null, null, orderNo, orderRefs, inboundCode,
             palletNo, destinationWarehouseId, destinationWarehouseCode, destinationWarehouseName,
-            fbaWarehouseCode, packageCount, volumeCbm, sourceStage, null);
+            fbaWarehouseCode, packageCount, volumeCbm, sourceStage, null, null);
     }
     public String sourcePalletKey() {
         // A plan pallet keeps the same lock identity before and after the physical pallet is received.

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/pda/mapper/DispatchPdaPickOrderMapper.java

@@ -11,8 +11,10 @@ import java.util.List;
 
 @Mapper
 public interface DispatchPdaPickOrderMapper extends BaseMapper<DispatchPdaPickOrder> {
-    @Select("SELECT r.* FROM ll_inbound_stock_receipt r " +
-        "WHERE r.customer_id=#{customerId} AND r.inventory_position_id=#{positionId} " +
+    @Select("SELECT DISTINCT r.* FROM ll_inventory_position current_position " +
+        "JOIN ll_inventory_position receipt_position ON receipt_position.balance_id=current_position.balance_id " +
+        "JOIN ll_inbound_stock_receipt r ON r.inventory_position_id=receipt_position.id " +
+        "WHERE current_position.id=#{positionId} AND r.customer_id=#{customerId} " +
         "AND r.received_packages > (SELECT COALESCE(SUM(a.packages),0) FROM ll_dispatch_pda_pick_order a " +
         "WHERE a.customer_id=r.customer_id AND a.receipt_id=r.id) ORDER BY r.received_at,r.id")
     List<InboundStockReceipt> availableReceipts(@Param("customerId") String customerId,

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPdaWorkflowService.java

@@ -15,8 +15,11 @@ import com.baiyue.lastleg.dispatch.pda.entity.*;
 import com.baiyue.lastleg.dispatch.pda.mapper.*;
 import com.baiyue.lastleg.inventory.command.dto.InventoryCommandRequests;
 import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
+import com.baiyue.lastleg.transfer.mapper.WarehouseTransferOrderMapper;
 import com.baiyue.lastleg.inventory.entity.InventoryPosition;
 import com.baiyue.lastleg.inventory.mapper.InventoryPositionMapper;
+import com.baiyue.lastleg.relabel.dto.RelabelRequests;
+import com.baiyue.lastleg.relabel.service.RelabelApplicationService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
@@ -41,6 +44,8 @@ public class DispatchPdaWorkflowService {
     @Resource private DispatchPalletLockMapper palletLocks;
     @Resource private InventoryPositionMapper positions;
     @Resource private InventoryCommandService inventory;
+    @Resource private RelabelApplicationService relabelApplications;
+    @Resource private WarehouseTransferOrderMapper warehouseTransfers;
     @Resource private DispatchPickOrderAttributionService pickAttribution;
     @Resource private ObjectMapper objectMapper;
 
@@ -111,6 +116,11 @@ public class DispatchPdaWorkflowService {
         InventoryCommandRequests.Move move = new InventoryCommandRequests.Move(request.positionId(),
             request.packages(), order.getDispatchNo(), order.getDispatchNo(), null,
             keyBase + ":ALLOCATE", request.remark());
+        if ("RELABEL_ORDER".equals(item.getSourceBusinessType())) {
+            inventory.release(customerId, operatorId, new InventoryCommandRequests.Move(request.positionId(),
+                request.packages(), item.getSourceBusinessNo(), order.getDispatchNo(), null,
+                keyBase + ":RELABEL_RELEASE", "换标排车拣货前释放冻结库存"));
+        }
         inventory.allocate(customerId, operatorId, move);
         inventory.pick(customerId, operatorId, new InventoryCommandRequests.Move(request.positionId(),
             request.packages(), order.getDispatchNo(), order.getDispatchNo(), null,
@@ -125,7 +135,8 @@ public class DispatchPdaWorkflowService {
         pick.setDispatchItemId(itemId); pick.setInventoryPositionId(request.positionId()); pick.setPackages(request.packages());
         pick.setProductQuantity(request.productQuantity()); pick.setIdempotencyKey(request.idempotencyKey());
         pick.setPickedAt(LocalDateTime.now()); pick.setCreatedAt(pick.getPickedAt()); picks.insert(pick);
-        pickAttribution.attribute(customerId, pick);
+        pickAttribution.attribute(customerId, pick,
+            "RELABEL_ORDER".equals(item.getSourceBusinessType()) ? item.getOrderId() : null);
         long total = picked + request.packages();
         order.setPickedPackageCount((int) (n(order.getPickedPackageCount()) + request.packages()));
         task.setStatus("PICKING"); task.setUpdatedAt(LocalDateTime.now());
@@ -216,11 +227,22 @@ public class DispatchPdaWorkflowService {
         long shipped = dispatchPicks.stream().mapToLong(p -> n(p.getPackages())).sum();
         LocalDateTime now = LocalDateTime.now();
         pickAttribution.depart(customerId, outbound.getOutboundNo(), order.getDispatchNo(), dispatchPicks, now);
+        for (DispatchItem item : dispatchItems) {
+            if (item.getOrderId() != null) warehouseTransfers.markOutboundByOrder(customerId, item.getOrderId(), now);
+            if ("RELABEL_ORDER".equals(item.getSourceBusinessType()) && item.getSourceBusinessNo() != null) {
+                warehouseTransfers.markOutboundByRelabel(customerId, item.getSourceBusinessNo(), now);
+            }
+        }
+        dispatchItems.stream().filter(item -> "RELABEL_ORDER".equals(item.getSourceBusinessType()))
+            .map(DispatchItem::getSourceBusinessNo).filter(Objects::nonNull).distinct().forEach(relabelNo ->
+                relabelApplications.changeStatus(customerId, relabelNo, operatorId,
+                    new RelabelRequests.ChangeStatus("COMPLETED", "换标排车PDA发车完成")));
         outbound.setStatus("OUTBOUNDED");
         outbound.setUpdatedAt(now);
         outboundOrders.updateById(outbound);
         order.setShippedPackageCount((int) shipped);
         order.setStatus("DEPARTED");
+        order.setDepartAt(now);
         order.setUpdatedAt(now);
         orders.updateById(order);
         releasePalletLocks(customerId, order.getId(), now);
@@ -235,11 +257,13 @@ public class DispatchPdaWorkflowService {
         for (DispatchItem item : source) {
             List<InventoryPosition> palletPositions = item.getWarehousePalletId() == null ? List.of()
                 : positions.listPallet(customerId, item.getWarehousePalletId());
+            boolean relabel = "RELABEL_ORDER".equals(item.getSourceBusinessType());
             values.add(new DispatchPdaResponses.Item(item.getId(), item.getPalletNo(), item.getDestinationWarehouseCode(),
                 item.getDestinationWarehouseName(), item.getFbaWarehouseCode(),
                 warehouseRouteLabel(item.getFbaWarehouseCode(), item.getDestinationWarehouseCode()), item.getPackageCount(),
                 picks.totalItem(customerId, task.getId(), item.getId()), palletPositions.stream().map(p ->
-                new DispatchPdaResponses.Position(p.getId(), p.getBalanceId(), n(p.getAvailablePackages()),
+                new DispatchPdaResponses.Position(p.getId(), p.getBalanceId(), n(p.getAvailablePackages())
+                    + (relabel ? n(p.getHoldPackages()) : 0),
                     n(p.getAllocatedPackages()), n(p.getPickedPackages()))).toList()));
         }
         OutboundOrder outbound = outboundOrders.findByDispatch(customerId, order.getId());

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPickOrderAttributionService.java

@@ -27,6 +27,15 @@ public class DispatchPickOrderAttributionService {
 
     /** Call after the inventory position has been locked/moved and the PDA pick row has been inserted. */
     public List<OrderPackages> attribute(String customerId, DispatchPdaPick pick) {
+        return attribute(customerId, pick, null);
+    }
+
+    /**
+     * Relabel inventory created before receipt-detail backfill may have no
+     * ll_inbound_stock_receipt row. Its dispatch item still carries the
+     * authoritative tail-leg order, so use that order only for relabel picks.
+     */
+    public List<OrderPackages> attribute(String customerId, DispatchPdaPick pick, Long fallbackOrderId) {
         long remainingPackages = value(pick.getPackages());
         long totalPackages = remainingPackages;
         long totalQuantity = value(pick.getProductQuantity());
@@ -58,6 +67,10 @@ public class DispatchPickOrderAttributionService {
             allocatedPackages = nextPackages;
             allocatedQuantity = nextQuantity;
         }
+        if (remainingPackages != 0 && fallbackOrderId != null && fallbackOrderId > 0) {
+            pickedByOrder.merge(fallbackOrderId, remainingPackages, Long::sum);
+            remainingPackages = 0;
+        }
         if (remainingPackages != 0) throw conflict("PDA pick cannot be attributed to inbound receipt orders");
         for (Map.Entry<Long, Long> entry : pickedByOrder.entrySet()) {
             if (orders.increasePicked(customerId, entry.getKey(), entry.getValue()) != 1) {

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

@@ -24,6 +24,7 @@ import com.baiyue.lastleg.dispatch.pda.entity.DispatchPdaTask;
 import com.baiyue.lastleg.dispatch.pda.mapper.DispatchPdaTaskMapper;
 import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
+import com.baiyue.lastleg.delivery.mapper.OutboundOrderMapper;
 import jakarta.annotation.Resource;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpStatus;
@@ -36,7 +37,9 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -56,6 +59,7 @@ public class DispatchService {
     @Resource private DispatchPdaTaskMapper pdaTasks;
     @Resource private LastlegOrderNoGenerator orderNoGenerator;
     @Resource private LastlegOrderMapper tailOrders;
+    @Resource private OutboundOrderMapper outboundOrders;
 
     public String resolveCustomerScopeForPlans(List<Long> planIds) {
         return requireSingleCustomerScope(candidates.findCustomerScopesByPlanIds(normalizeIds(planIds, "Plan IDs")),
@@ -68,6 +72,12 @@ public class DispatchService {
             "Selected pallets");
     }
 
+    public String resolveCustomerScopeForRelabel(String relabelNo) {
+        List<DispatchPalletCandidate> values = candidates.relabelAvailable(null, null, trimToNull(relabelNo));
+        return requireSingleCustomerScope(values.stream().map(DispatchPalletCandidate::customerId)
+            .filter(StringUtils::hasText).distinct().toList(), "Selected relabel order");
+    }
+
     public List<DispatchPalletCandidate> candidates(String customerId, List<Long> planIds, String orderNo,
                                                      String fbaWarehouseCode, String sourceStage, String draftToken) {
         validateSourceStage(sourceStage);
@@ -191,6 +201,15 @@ public class DispatchService {
         DispatchPalletLock active = activeLock(customerId, candidate);
         if (active == null) return;
         requireDraftOwner(active, operatorId, request.draftToken());
+        if (active.getDispatchOrderId() != null) {
+            DispatchOrder dispatch = orders.lockById(customerId, active.getDispatchOrderId());
+            if (dispatch == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Dispatch order not found");
+            requirePalletEditingAllowed(dispatch);
+            DispatchItem item = items.lockByPlanPallet(customerId, dispatch.getId(), request.planPalletId());
+            if (item != null) removeLockedItem(dispatch, item, List.of(active));
+            else releaseLock(active, LocalDateTime.now());
+            return;
+        }
         releaseLock(active, LocalDateTime.now());
     }
 
@@ -199,7 +218,8 @@ public class DispatchService {
         List<DispatchPalletLock> activeLocks = locks.selectList(new LambdaQueryWrapper<DispatchPalletLock>()
             .eq(DispatchPalletLock::getDraftToken, draftToken)
             .eq(DispatchPalletLock::getOperatorId, trimToNull(operatorId))
-            .eq(DispatchPalletLock::getStatus, "ACTIVE"));
+            .eq(DispatchPalletLock::getStatus, "ACTIVE")
+            .isNull(DispatchPalletLock::getDispatchOrderId));
         LocalDateTime now = LocalDateTime.now();
         activeLocks.forEach(lock -> releaseLock(lock, now));
         draftContainers.delete(new LambdaQueryWrapper<DispatchDraftContainer>().eq(DispatchDraftContainer::getDraftToken, draftToken));
@@ -262,35 +282,60 @@ public class DispatchService {
         }
 
         LocalDateTime now = LocalDateTime.now();
-        DispatchOrder dispatch = new DispatchOrder();
-        dispatch.setId(IdWorker.getId());
-        dispatch.setCustomerId(customerId);
-        dispatch.setDispatchNo(orderNoGenerator.next("DISPATCH", selected.get(0).overseasWarehouseId(), dispatch.getId()));
-        dispatch.setOverseasWarehouseId(selected.get(0).overseasWarehouseId());
-        dispatch.setOverseasWarehouseName(selected.get(0).overseasWarehouseName());
+        Long existingDispatchId = draftToken == null ? null : locks.findDispatchOrderIdByDraft(draftToken);
+        DispatchOrder dispatch = existingDispatchId == null ? null : orders.lockById(customerId, existingDispatchId);
+        boolean refreshing = dispatch != null;
+        if (refreshing) {
+            requirePalletEditingAllowed(dispatch);
+        } else {
+            dispatch = new DispatchOrder();
+            dispatch.setId(IdWorker.getId());
+            dispatch.setCustomerId(customerId);
+            dispatch.setDispatchNo(orderNoGenerator.next("DISPATCH", selected.get(0).overseasWarehouseId(), dispatch.getId()));
+            dispatch.setOverseasWarehouseId(selected.get(0).overseasWarehouseId());
+            dispatch.setOverseasWarehouseName(selected.get(0).overseasWarehouseName());
+            dispatch.setStatus(PENDING_DEPARTURE);
+            dispatch.setPickedPackageCount(0);
+            dispatch.setShippedPackageCount(0);
+            dispatch.setCreatedBy(trimToNull(operatorId));
+            dispatch.setCreatedAt(now);
+        }
         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);
+        if (refreshing) orders.updateById(dispatch); else orders.insert(dispatch);
+
+        List<DispatchItem> previousItems = items.findByDispatchOrder(customerId, dispatch.getId());
+        Set<Long> selectedPalletIds = selected.stream().map(DispatchPalletCandidate::planPalletId)
+            .collect(Collectors.toSet());
+        if (refreshing) {
+            List<DispatchPalletLock> previousLocks = locks.selectList(new LambdaQueryWrapper<DispatchPalletLock>()
+                .eq(DispatchPalletLock::getCustomerId, customerId)
+                .eq(DispatchPalletLock::getDispatchOrderId, dispatch.getId())
+                .eq(DispatchPalletLock::getStatus, "ACTIVE"));
+            previousItems.stream().filter(item -> item.getPlanPalletId() != null
+                    && !selectedPalletIds.contains(item.getPlanPalletId()))
+                .forEach(item -> {
+                    previousLocks.stream().filter(lock -> Objects.equals(lock.getPlanPalletId(), item.getPlanPalletId()))
+                        .forEach(lock -> releaseLock(lock, now));
+                    items.deleteById(item.getId());
+                });
+        }
+        Set<Long> existingPalletIds = previousItems.stream()
+            .filter(item -> item.getPlanPalletId() == null || selectedPalletIds.contains(item.getPlanPalletId()))
+            .map(DispatchItem::getPlanPalletId).filter(Objects::nonNull).collect(Collectors.toSet());
 
         for (DispatchPalletCandidate candidate : selected) {
             DispatchPalletLock lock = activeLock(customerId, candidate);
             if (draftToken != null) {
                 requireDraftOwner(lock, operatorId, draftToken);
                 lock.setDispatchOrderId(dispatch.getId());
-                lock.setDraftContainerId(null);
-                lock.setDraftToken(null);
                 lock.setExpiresAt(null);
                 lock.setUpdatedAt(now);
                 locks.updateById(lock);
@@ -316,6 +361,7 @@ public class DispatchService {
                         "Pallet is already locked by another active dispatch: " + candidate.palletNo(), exception);
                 }
             }
+            if (existingPalletIds.contains(candidate.planPalletId())) continue;
             DispatchItem item = new DispatchItem();
             item.setId(IdWorker.getId());
             item.setDispatchOrderId(dispatch.getId());
@@ -337,27 +383,27 @@ public class DispatchService {
             item.setPackageCount(Objects.requireNonNullElse(candidate.packageCount(), 0));
             item.setVolumeCbm(Objects.requireNonNullElse(candidate.volumeCbm(), BigDecimal.ZERO));
             item.setSourceStage(candidate.sourceStage());
+            item.setCartonMarks(mergeCartonMarks(candidate.cartonMarks(), candidate.relabelCartonMarks()));
             item.setCreatedAt(now);
             items.insert(item);
         }
-        DispatchPdaTask pdaTask = new DispatchPdaTask();
-        pdaTask.setId(IdWorker.getId());
-        pdaTask.setCustomerId(customerId);
-        pdaTask.setDispatchOrderId(dispatch.getId());
-        pdaTask.setTaskNo("DPDA" + pdaTask.getId());
-        pdaTask.setStatus("PDA_PENDING");
-        pdaTask.setWarehouseId(dispatch.getOverseasWarehouseId());
-        pdaTask.setPushedAt(now);
-        pdaTask.setCreatedAt(now);
-        pdaTask.setUpdatedAt(now);
-        pdaTasks.insert(pdaTask);
+        if (!refreshing) {
+            DispatchPdaTask pdaTask = new DispatchPdaTask();
+            pdaTask.setId(IdWorker.getId());
+            pdaTask.setCustomerId(customerId);
+            pdaTask.setDispatchOrderId(dispatch.getId());
+            pdaTask.setTaskNo("DPDA" + pdaTask.getId());
+            pdaTask.setStatus("PDA_PENDING");
+            pdaTask.setWarehouseId(dispatch.getOverseasWarehouseId());
+            pdaTask.setPushedAt(now);
+            pdaTask.setCreatedAt(now);
+            pdaTask.setUpdatedAt(now);
+            pdaTasks.insert(pdaTask);
+        }
         if (draftToken != null) {
-            draftContainers.delete(new LambdaQueryWrapper<DispatchDraftContainer>()
-                .eq(DispatchDraftContainer::getDraftToken, draftToken));
             DispatchDraft draft = drafts.lockActive(draftToken, trimToNull(operatorId));
             if (draft != null) {
-                draft.setStatus("RELEASED");
-                draft.setReleasedAt(now);
+                draft.setExpiresAt(null);
                 draft.setUpdatedAt(now);
                 drafts.updateById(draft);
             }
@@ -377,7 +423,7 @@ public class DispatchService {
         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);
-        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(BigDecimal.ZERO); item.setSourceStage("RELABEL"); item.setCartonMarks(candidate.cartonMarks()); item.setSourceBusinessType("RELABEL_ORDER"); item.setSourceBusinessNo(request.relabelNo()); item.setCreatedAt(now); items.insert(item); }
+        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, "换标订单已被其他排车占用");
         return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
@@ -463,6 +509,50 @@ public class DispatchService {
         return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
     }
 
+    @Transactional
+    public DispatchResponse removeItem(String dispatchNo, Long itemId) {
+        DispatchOrder dispatch = orders.lockGlobalByDispatchNo(trimToNull(dispatchNo));
+        if (dispatch == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Dispatch order not found");
+        requirePalletEditingAllowed(dispatch);
+        DispatchItem item = items.lockById(dispatch.getCustomerId(), dispatch.getId(), itemId);
+        if (item == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Dispatch pallet not found");
+
+        List<DispatchPalletLock> activeLocks = locks.selectList(new LambdaQueryWrapper<DispatchPalletLock>()
+            .eq(DispatchPalletLock::getCustomerId, dispatch.getCustomerId())
+            .eq(DispatchPalletLock::getDispatchOrderId, dispatch.getId())
+            .eq(DispatchPalletLock::getStatus, "ACTIVE"));
+        List<DispatchPalletLock> matchingLocks = activeLocks.stream().filter(lock -> Objects.equals(lock.getPlanPalletId(), item.getPlanPalletId())
+                || (item.getWarehousePalletId() != null && Objects.equals(lock.getWarehousePalletId(), item.getWarehousePalletId())))
+            .toList();
+        return removeLockedItem(dispatch, item, matchingLocks);
+    }
+
+    private DispatchResponse removeLockedItem(DispatchOrder dispatch, DispatchItem item,
+                                               List<DispatchPalletLock> matchingLocks) {
+        LocalDateTime now = LocalDateTime.now();
+        matchingLocks.forEach(lock -> releaseLock(lock, now));
+        items.deleteById(item.getId());
+
+        List<DispatchItem> remaining = items.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId());
+        dispatch.setItemCount(remaining.size());
+        dispatch.setPalletCount(remaining.size());
+        dispatch.setPackageCount(remaining.stream().map(DispatchItem::getPackageCount).filter(Objects::nonNull)
+            .mapToInt(Integer::intValue).sum());
+        dispatch.setUpdatedAt(now);
+        orders.updateById(dispatch);
+        return response(dispatch, remaining);
+    }
+
+    private void requirePalletEditingAllowed(DispatchOrder dispatch) {
+        if (!PENDING_DEPARTURE.equals(dispatch.getStatus())
+            || Objects.requireNonNullElse(dispatch.getPickedPackageCount(), 0) > 0) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "Only an unpicked pending dispatch can edit pallets");
+        }
+        if (outboundOrders.findByDispatch(dispatch.getCustomerId(), dispatch.getId()) != null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "已生成出库单，不能再修改排车托盘");
+        }
+    }
+
     @Transactional
     public void cancel(String dispatchNo) {
         DispatchOrder dispatch = orders.lockGlobalByDispatchNo(trimToNull(dispatchNo));
@@ -476,6 +566,10 @@ public class DispatchService {
         dispatch.setStatus(CANCELLED);
         dispatch.setUpdatedAt(now);
         orders.updateById(dispatch);
+        items.findByDispatchOrder(customerId, dispatch.getId()).stream()
+            .filter(item -> "RELABEL_ORDER".equals(item.getSourceBusinessType()))
+            .map(DispatchItem::getSourceBusinessNo).filter(StringUtils::hasText).distinct()
+            .forEach(relabelNo -> candidates.restoreRelabelPreDispatch(customerId, relabelNo));
         List<DispatchPalletLock> activeLocks = locks.selectList(new LambdaQueryWrapper<DispatchPalletLock>()
             .eq(DispatchPalletLock::getCustomerId, customerId)
             .eq(DispatchPalletLock::getDispatchOrderId, dispatch.getId())
@@ -567,6 +661,14 @@ public class DispatchService {
         return StringUtils.hasText(value) ? value.trim() : null;
     }
 
+    private static String mergeCartonMarks(String regularMarks, String relabelMarks) {
+        LinkedHashSet<String> values = new LinkedHashSet<>();
+        for (String source : List.of(Objects.toString(regularMarks, ""), Objects.toString(relabelMarks, ""))) {
+            Arrays.stream(source.split(",")).map(String::trim).filter(StringUtils::hasText).forEach(values::add);
+        }
+        return values.isEmpty() ? null : String.join(",", values);
+    }
+
     private static void validateSourceStage(String sourceStage) {
         if (StringUtils.hasText(sourceStage) && !Set.of("PLAN", "RECEIVED").contains(sourceStage)) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "sourceStage must be PLAN or RECEIVED");