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

lastleg-service/src/main/resources/db/lastleg.sql

@@ -580,6 +580,27 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan (
   KEY idx_ll_inbound_plan_container (customer_id, container_no)
 ) ENGINE=InnoDB COMMENT='尾程入库计划表：每张来源入仓单生成一张入库计划，同柜计划共享集装箱号';
 
+CREATE TABLE IF NOT EXISTS ll_container_plan_conversion_command (
+  id BIGINT NOT NULL COMMENT '柜级转换命令ID',
+  source_container_booking_id VARCHAR(128) NOT NULL COMMENT '稳定来源柜预订ID',
+  idempotency_key VARCHAR(128) NOT NULL COMMENT '调用方幂等键',
+  request_hash CHAR(64) NOT NULL COMMENT '确认请求SHA-256摘要',
+  snapshot_version BIGINT NOT NULL COMMENT '确认的柜级快照版本',
+  snapshot_hash CHAR(64) NOT NULL COMMENT '确认的柜级快照SHA-256',
+  warehouse_id BIGINT NOT NULL COMMENT '海外接柜仓ID',
+  batch_key VARCHAR(160) NOT NULL COMMENT '海外仓托盘批次幂等键',
+  status VARCHAR(32) NOT NULL COMMENT 'PREPARED/APPLYING/LOCAL_COMMITTED/COMPLETED',
+  preparation_json JSON NOT NULL COMMENT '稳定计划号与托盘业务键快照',
+  result_json JSON NULL COMMENT '本地计划提交结果',
+  last_error VARCHAR(1000) NULL COMMENT '最近一次跨服务错误',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+  PRIMARY KEY(id),
+  UNIQUE KEY uk_ll_container_conversion_command(source_container_booking_id),
+  UNIQUE KEY uk_ll_container_conversion_batch(warehouse_id,batch_key),
+  KEY idx_ll_container_conversion_status(status,updated_at)
+) ENGINE=InnoDB COMMENT='柜级入库计划转换Saga与幂等命令';
+
 CREATE TABLE IF NOT EXISTS ll_inbound_plan_line (
   id BIGINT NOT NULL COMMENT '入库计划明细ID（雪花ID）',
   customer_id VARCHAR(128) NOT NULL COMMENT '客户账号标识',
@@ -618,7 +639,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan_pallet (
   id BIGINT NOT NULL COMMENT '计划托盘ID（雪花ID）',
   customer_id VARCHAR(128) NOT NULL COMMENT '客户账号标识',
   plan_id BIGINT NOT NULL COMMENT '入库计划ID',
-  pallet_no VARCHAR(64) NOT NULL COMMENT '当前托盘编号：分配前为计划占位码，分配后为海外仓实物托盘码',
+  pallet_no VARCHAR(128) NOT NULL COMMENT '海外仓资源服务返回的真实托盘码',
   source_pallet_no VARCHAR(128) NULL COMMENT '一件代发不可变来源托盘号快照',
   pallet_type VARCHAR(32) NULL COMMENT '人工计划托盘类型',
   destination_warehouse_id VARCHAR(128) NULL COMMENT '目的仓ID快照',
@@ -696,7 +717,7 @@ ALTER TABLE ll_inbound_plan_pallet COMMENT='尾程入库计划托盘表：按目
 ALTER TABLE ll_inbound_plan_pallet
   MODIFY COLUMN id BIGINT NOT NULL COMMENT '计划托盘ID（雪花ID）',
   MODIFY COLUMN plan_id BIGINT NOT NULL COMMENT '入库计划ID',
-  MODIFY COLUMN pallet_no VARCHAR(64) NOT NULL COMMENT '当前托盘编号：分配前为计划占位码，分配后为海外仓实物托盘码',
+  MODIFY COLUMN pallet_no VARCHAR(128) NOT NULL COMMENT '海外仓资源服务返回的真实托盘码',
   MODIFY COLUMN destination_warehouse_id VARCHAR(128) NULL COMMENT '目的仓ID快照',
   MODIFY COLUMN destination_warehouse_code VARCHAR(128) NULL COMMENT '目的仓编码快照',
   MODIFY COLUMN destination_warehouse_name VARCHAR(255) NULL COMMENT '目的仓名称快照',

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: