Merge remote-tracking branch 'origin/test' into dev

2026-09-09 19:40:30 +08:00
parent 5ccce6af71 4cc3e5372b
commit f3bbe0e15f
2 changed files with 38 additions and 1 deletions
@@ -533,7 +533,9 @@ public class InboundPlanService {
            wholePallets.add(sourcePallets);
            List<String> standardNos = "ONE_CLICK_DROPSHIP".equals(ref.orderType()) ? List.of()
                : sourcePalletMapper.palletNos(ref.customerId(), ref.orderId());
-            if (sourcePallets == null && standardNos.isEmpty()) throw new ResponseStatusException(
+            boolean standardFba = sourcePallets == null && orders.stream()
+                .anyMatch(order -> trimToNull(order.fbaWarehouseCode()) != null);
+            if (standardFba && standardNos.isEmpty()) throw new ResponseStatusException(
                HttpStatus.CONFLICT, "散货订单缺少头程托盘码快照");
            standardPalletNos.add(standardNos);
        }