修复确认预装后重新分配失败

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

@@ -136,8 +136,14 @@ public class SmartLoadingService {
         if (candidate == null) throw conflict("入库货物不存在或尚未完成入库");
         requireSameChannel(booking, candidate);
         requireSameCustomerScope(booking, candidate);
-        splitPreloadService.ensurePendingForLoadingAllocation(candidate.accountId(), candidate.inboundId(),
-            operatorId, operatorName);
+        var task = loadingPickService.mutationSnapshot(planId);
+        if (task.taskId() != null && "LOADING".equals(task.taskStatus())) {
+            splitPreloadService.ensureForRunningLoadingAllocation(candidate.accountId(), candidate.inboundId(),
+                operatorId, operatorName);
+        } else {
+            splitPreloadService.ensurePendingForLoadingAllocation(candidate.accountId(), candidate.inboundId(),
+                operatorId, operatorName);
+        }
         OrderCargoClient.CargoBinding cargo = loadCargo(candidate);
         LoadingPlanItemEntity existing = repository.activeItem(planId, candidate.accountId(), request.inboundDetailId());
         int total = request.packageCount() + (existing == null ? 0 : existing.getPackageCount());

firstleg/src/main/java/com/baiyue/firstleg/split/service/SplitPreloadService.java

@@ -68,11 +68,28 @@ public class SplitPreloadService {
     @Transactional
     public void ensurePendingForLoadingAllocation(long tenantId, long inboundId, long operatorId,
                                                    String operatorName) {
+        ensureLoadingAllocationLifecycle(tenantId, inboundId, operatorId, operatorName, false);
+    }
+
+    /**
+     * A running PDA task may restore or add an unpicked allocation after the plan-level preload
+     * confirmation. CONFIRMING remains immutable; CONFIRMED is accepted because the caller owns
+     * the active PDA task lock and will synchronise the restored loading item immediately.
+     */
+    @Transactional
+    public void ensureForRunningLoadingAllocation(long tenantId, long inboundId, long operatorId,
+                                                   String operatorName) {
+        ensureLoadingAllocationLifecycle(tenantId, inboundId, operatorId, operatorName, true);
+    }
+
+    private void ensureLoadingAllocationLifecycle(long tenantId, long inboundId, long operatorId,
+                                                   String operatorName, boolean allowConfirmed) {
         InboundSnapshot inbound = requireInbound(tenantId, inboundId);
         requireWaitingSplit(inbound, "仅待分柜订单可以建立智能装柜预装计划");
         PreloadPlanEntity plan = repository.findPlan(tenantId, inboundId);
         if (plan != null) {
-            if (!PreloadStatus.PENDING.equals(plan.getStatus())) {
+            if (!PreloadStatus.PENDING.equals(plan.getStatus())
+                && !(allowConfirmed && PreloadStatus.CONFIRMED.equals(plan.getStatus()))) {
                 throw new BizException(ResultCode.CONFLICT, "预装计划已进入确认流程，不能修改智能装柜分配");
             }
             return;