优化

2026-08-27 16:34:30 +08:00
parent 1db3e48506
commit ecf48886d5
10 changed files with 423 additions and 5 deletions
@@ -121,6 +121,30 @@ public class InboundPlanService {
        return detail(customerId, plan);
    }

+    /** 同一来源柜的每个尾程订单独立建计划；整个柜级批次共用一个事务。 */
+    @Transactional
+    public List<InboundPlanResponse> convertContainer(String sourceContainerBookingId) {
+        String bookingId = trimToNull(sourceContainerBookingId);
+        if (bookingId == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "来源柜预订 ID 不能为空");
+        List<InboundPlanOrderMapper.ContainerOrderRef> refs = orderMapper.lockContainerOrders(bookingId);
+        if (refs.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜没有尾程订单");
+        boolean hasEligible = refs.stream().anyMatch(ref -> "PENDING_ASSIGNMENT".equals(ref.currentStatus())
+            || "DESTINATION_ASSIGNED".equals(ref.currentStatus()));
+        if (!hasEligible) {
+            List<InboundPlanResponse> replay = refs.stream().map(ref -> {
+                InboundPlan existing = planMapper.findBySourceOrder(ref.customerId(), ref.orderId());
+                if (existing == null) throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜转换状态不一致");
+                return detail(ref.customerId(), existing);
+            }).toList();
+            return replay;
+        }
+        if (refs.stream().anyMatch(ref -> !("PENDING_ASSIGNMENT".equals(ref.currentStatus())
+            || "DESTINATION_ASSIGNED".equals(ref.currentStatus())))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜存在不能转换的尾程订单");
+        }
+        return refs.stream().map(ref -> convert(ref.customerId(), ref.orderId())).toList();
+    }
+

    @Transactional(readOnly = true)
    public InboundPlanResponse detailByPlanNo(String customerId, String planNo) {