fix(firstleg): require real container before pda push

2026-08-14 22:03:21 +08:00
parent fdd011bc57
commit 010098c4af
7 changed files with 71 additions and 13 deletions
@@ -228,13 +228,16 @@ public class SmartLoadingService {
        String key = trim(idempotencyKey);
        if (!StringUtils.hasText(key) || key.length() > 128) throw new BizException(ResultCode.BAD_REQUEST, "必须提供有效 Idempotency-Key");
        LoadingPlanEntity plan = repository.plan(planId); if (plan == null) throw new BizException(ResultCode.NOT_FOUND, "装柜计划不存在");
+        ContainerBookingEntity booking = requireBooking(plan.getContainerBookingId());
+        if (!StringUtils.hasText(booking.getContainerNo())) {
+            throw validation("录入真实柜号后才能推送预装清单并开启PDA作业");
+        }
        if (key.equals(plan.getPushIdempotencyKey())) {
            loadingPickService.beginIfReady(plan.getContainerBookingId(), operatorId, operatorName);
-            return view(plan, requireBooking(plan.getContainerBookingId()));
+            return view(plan, booking);
        }
        if (StringUtils.hasText(plan.getPushIdempotencyKey())) throw conflict("预装清单已推送，不能使用新的幂等键重复推送");
        if (!"EDITING".equals(plan.getPlanStatus()) || !Objects.equals(plan.getVersion(), request.expectedVersion())) throw conflict("仅编辑中的计划可开始装柜且版本必须匹配");
-        ContainerBookingEntity booking = requireBooking(plan.getContainerBookingId());
        List<LoadingPlanItemEntity> items = repository.items(planId);
        if (items.isEmpty()) throw validation("装柜明细不能为空");
        checkPlanCapacity(booking, items);