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

# Conflicts:
#	scripts/db/incremental.sql

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -445,6 +445,16 @@ paths:
               properties:
                 sourceContainerBookingId: { type: string, minLength: 1, maxLength: 128 }
       responses: { '200': { description: 统一 ApiResponse 包装的入库计划数组 } }
+  /api/platform/v1/last-leg/inbound-plans/container-preview:
+    get:
+      summary: 预览按柜生成入库计划
+      description: 权限 platform:overseas-warehouse:inbound-order:list；按稳定 sourceContainerBookingId 返回不受订单分页影响的全柜事实。分组固定为 FBA、一件代发、私人地址，FBA 按目的仓编码/名称/ID 稳定排序；托数及 readiness/blockers 只由服务端计算。确认时必须原样回传 snapshotVersion 与 snapshotHash，服务端仍会锁柜重算。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: sourceContainerBookingId, in: query, required: true, schema: { type: string, minLength: 1, maxLength: 128 } }
+      responses:
+        '200': { description: 柜级入库计划转换预览, content: { application/json: { schema: { $ref: '#/components/schemas/ContainerInboundPlanPreviewApiResponse' } } } }
+        '404': { description: 来源柜没有尾程订单 }
   /api/platform/v1/last-leg/dispatches:
     get:
       summary: 分页查询排车单
@@ -2179,6 +2189,11 @@ components:
         - { $ref: '#/components/schemas/MerchantApiResponse' }
         - type: object
           properties: { data: { $ref: '#/components/schemas/InboundPlanDetail' } }
+    ContainerInboundPlanPreviewApiResponse:
+      allOf:
+        - { $ref: '#/components/schemas/MerchantApiResponse' }
+        - type: object
+          properties: { data: { $ref: '#/components/schemas/ContainerInboundPlanPreview' } }
     LastlegOrderHoldRequest:
       type: object
       required: [held, chargeable, reason, expectedVersion]
@@ -2468,6 +2483,65 @@ components:
         pallets: { type: array, items: { $ref: '#/components/schemas/InboundPlanPallet' } }
         allocations: { type: array, items: { $ref: '#/components/schemas/InboundPlanAllocation' } }
         version: { type: integer }
+    ContainerInboundPlanPreview:
+      type: object
+      required: [sourceContainerBookingId, snapshotVersion, snapshotHash, totalOrderCount, readyOrderCount, blockedOrderCount, pendingOrderCount, pendingPalletCount, existingPlannedPalletCount, totalSuggestedPalletCount, totalPlannedPalletCount, ready, groups]
+      properties:
+        sourceContainerBookingId: { type: string }
+        containerNo: { type: string, nullable: true }
+        overseasWarehouseId: { type: string, nullable: true }
+        overseasWarehouseCode: { type: string, nullable: true }
+        overseasWarehouseName: { type: string, nullable: true }
+        snapshotVersion: { type: integer, format: int64, minimum: 0 }
+        snapshotHash: { type: string, pattern: '^[0-9a-f]{64}$' }
+        totalOrderCount: { type: integer }
+        readyOrderCount: { type: integer }
+        blockedOrderCount: { type: integer }
+        pendingOrderCount: { type: integer, description: 本次确认将新建计划的 READY 订单数 }
+        pendingPalletCount: { type: integer, description: 本次确认将向资源服务批量预留的新托盘数 }
+        existingPlannedPalletCount: { type: integer, description: 已有有效计划的托盘总数，不计入本次新增 }
+        totalSuggestedPalletCount: { type: integer }
+        totalPlannedPalletCount: { type: integer }
+        ready: { type: boolean }
+        groups: { type: array, items: { $ref: '#/components/schemas/ContainerInboundPlanPreviewGroup' } }
+    ContainerInboundPlanPreviewGroup:
+      type: object
+      required: [destinationType, orderCount, pendingOrderCount, pendingPalletCount, existingPlannedPalletCount, suggestedPalletCount, plannedPalletCount, orders]
+      properties:
+        destinationType: { type: string, enum: [FBA, ONE_CLICK_DROPSHIP, PRIVATE_ADDRESS] }
+        destinationWarehouseId: { type: string, nullable: true }
+        destinationWarehouseCode: { type: string, nullable: true }
+        destinationWarehouseName: { type: string, nullable: true }
+        orderCount: { type: integer }
+        pendingOrderCount: { type: integer }
+        pendingPalletCount: { type: integer }
+        existingPlannedPalletCount: { type: integer }
+        suggestedPalletCount: { type: integer }
+        plannedPalletCount: { type: integer }
+        orders: { type: array, items: { $ref: '#/components/schemas/ContainerInboundPlanPreviewOrder' } }
+    ContainerInboundPlanPreviewOrder:
+      type: object
+      required: [customerId, orderId, businessOrderNo, orderType, destinationType, packageCount, volumeCbm, orderVersion, readiness, blockers]
+      properties:
+        customerId: { type: string }
+        customerName: { type: string, nullable: true }
+        orderId: { type: string, pattern: '^[0-9]+$' }
+        businessOrderNo: { type: string }
+        inboundCode: { type: string, nullable: true }
+        orderType: { type: string }
+        destinationType: { type: string, enum: [FBA, ONE_CLICK_DROPSHIP, PRIVATE_ADDRESS] }
+        destinationWarehouseId: { type: string, nullable: true }
+        destinationWarehouseCode: { type: string, nullable: true }
+        destinationWarehouseName: { type: string, nullable: true }
+        packageCount: { type: integer }
+        volumeCbm: { type: number }
+        suggestedPalletCount: { type: integer, nullable: true }
+        plannedPalletCount: { type: integer, nullable: true }
+        existingPlanNo: { type: string, nullable: true }
+        planStatus: { type: string, nullable: true }
+        orderVersion: { type: integer, minimum: 0 }
+        readiness: { type: string, enum: [READY, PLANNED, BLOCKED] }
+        blockers: { type: array, items: { type: string } }
     InboundPlanLine:
       type: object
       properties: