fix: complete pallet code cross-region flow

2026-09-09 19:14:47 +08:00
parent 7678fd85ff
commit e30255ff58
9 changed files with 175 additions and 9 deletions
@@ -209,13 +209,16 @@ public class ContainerInboundPlanConversionCoordinator {
            String planNo = numbers.next("INBOUND_PLAN", order.destinationWarehouseCode(), planId);
            List<String> sourcePalletNos = plans.sourcePalletNos(
                order.customerId(), Long.parseLong(order.orderId()), order.orderType());
-            if (sourcePalletNos.size() != order.suggestedPalletCount()) {
+            boolean warehouseGeneratedPallets = trimToNull(order.fbaWarehouseCode()) == null
+                && !"ONE_CLICK_DROPSHIP".equals(order.orderType());
+            if (!warehouseGeneratedPallets && sourcePalletNos.size() != order.suggestedPalletCount()) {
                throw new ResponseStatusException(HttpStatus.CONFLICT, "头程托盘码数量与柜级预览不一致");
            }
            for (int localSequence = 1; localSequence <= order.suggestedPalletCount(); localSequence++) {
                items.add(new PreparedItem(order.customerId(), Long.parseLong(order.orderId()), planId, planNo,
                    localSequence, ++globalSequence, "CIP:" + generationId + ":" + globalSequence,
-                    trimToNull(order.fbaWarehouseCode()), sourcePalletNos.get(localSequence - 1)));
+                    trimToNull(order.fbaWarehouseCode()), warehouseGeneratedPallets
+                        ? null : sourcePalletNos.get(localSequence - 1)));
            }
        }
        Preparation preparation = new Preparation(warehouseId, List.copyOf(items));