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

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

@@ -433,17 +433,21 @@ paths:
   /api/platform/v1/last-leg/inbound-plans/convert-container:
     post:
       summary: 按整柜批量生成剩余入库计划
-      description: 权限 platform:overseas-warehouse:inbound-order:create；使用稳定 sourceContainerBookingId 锁定整柜订单，并要求全柜尾程订单及既有有效计划的真实 containerNo 与接柜仓快照一致。已有有效计划保持不变，只为剩余尾程订单/入仓码分别生成独立计划；响应按柜内订单稳定顺序返回全部已有及新增计划。整批原子且幂等，剩余为0时直接返回已有结果；任何快照漂移均冲突且不部分写入。
+      description: 权限 platform:overseas-warehouse:inbound-order:create；调用方必须先取柜级预览并原样回传 snapshotVersion/snapshotHash。服务端以 sourceContainerBookingId 建立唯一 Saga 命令，先向海外仓资源服务按票、按托盘批量预留真实 palletId/palletCode/locationId/resourceLockId，再在一个本地事务中锁整柜并为每票生成独立计划，最后确认资源批次。本地任一票失败时整柜回滚并补偿资源；本地已提交但远端确认失败时重放只重试确认。同柜不同 Idempotency-Key 也不会产生第二批资源。
       security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: Idempotency-Key, in: header, required: true, schema: { type: string, minLength: 1, maxLength: 128 } }
       requestBody:
         required: true
         content:
           application/json:
             schema:
               type: object
-              required: [sourceContainerBookingId]
+              required: [sourceContainerBookingId, snapshotVersion, snapshotHash]
               properties:
                 sourceContainerBookingId: { type: string, minLength: 1, maxLength: 128 }
+                snapshotVersion: { type: integer, format: int64, minimum: 0 }
+                snapshotHash: { type: string, pattern: '^[0-9a-f]{64}$' }
       responses: { '200': { description: 统一 ApiResponse 包装的入库计划数组 } }
   /api/platform/v1/last-leg/inbound-plans/container-preview:
     get: