修改提交

2026-08-21 17:21:26 +08:00
parent af97217184
commit bbd303cd65
36 changed files with 1045 additions and 100 deletions
@@ -828,9 +828,12 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_pallet_lock (
  plan_id BIGINT NULL COMMENT '入仓计划ID',
  plan_pallet_id BIGINT NULL COMMENT '计划托盘ID',
  warehouse_pallet_id BIGINT NULL COMMENT '仓库实物托盘ID',
-  dispatch_order_id BIGINT NOT NULL COMMENT '派车单ID',
+  dispatch_order_id BIGINT NULL COMMENT '正式派车单ID，草稿锁阶段为空',
+  draft_token VARCHAR(64) NULL COMMENT '智能排车草稿随机标识',
+  operator_id VARCHAR(128) NULL COMMENT '草稿锁操作人ID',
  status VARCHAR(32) NOT NULL DEFAULT 'ACTIVE' COMMENT '业务状态',
  locked_at DATETIME(3) NOT NULL COMMENT '锁定时间',
+  expires_at DATETIME(3) NULL COMMENT '草稿锁失效时间，正式派车锁为空',
  released_at DATETIME(3) NULL COMMENT '释放时间',
  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
@@ -840,6 +843,15 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_pallet_lock (
  KEY idx_ll_dispatch_pallet_lock_source (customer_id,source_pallet_key,status)
 ) ENGINE=InnoDB COMMENT='派车托盘排他锁';

+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_pallet_lock' AND column_name='draft_token'), 'SELECT 1', 'ALTER TABLE ll_dispatch_pallet_lock ADD COLUMN draft_token VARCHAR(64) NULL COMMENT ''智能排车草稿随机标识'' AFTER dispatch_order_id'));
+PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_pallet_lock' AND column_name='operator_id'), 'SELECT 1', 'ALTER TABLE ll_dispatch_pallet_lock ADD COLUMN operator_id VARCHAR(128) NULL COMMENT ''草稿锁操作人ID'' AFTER draft_token'));
+PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_pallet_lock' AND column_name='expires_at'), 'SELECT 1', 'ALTER TABLE ll_dispatch_pallet_lock ADD COLUMN expires_at DATETIME(3) NULL COMMENT ''草稿锁失效时间，正式派车锁为空'' AFTER locked_at'));
+PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_pallet_lock' AND column_name='dispatch_order_id' AND is_nullable='YES'), 'SELECT 1', 'ALTER TABLE ll_dispatch_pallet_lock MODIFY COLUMN dispatch_order_id BIGINT NULL COMMENT ''正式派车单ID，草稿锁阶段为空'''));
+PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;
+
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_item' AND column_name='order_refs'), 'SELECT 1', 'ALTER TABLE ll_dispatch_item ADD COLUMN order_refs VARCHAR(2000) NULL AFTER order_no'));
 PREPARE dispatch_schema_stmt FROM @ddl; EXECUTE dispatch_schema_stmt; DEALLOCATE PREPARE dispatch_schema_stmt;

@@ -27,7 +27,7 @@ paths:
  /api/platform/v1/last-leg/dispatches:
    get:
      summary: 分页查询排车单
-      description: 权限 platform:overseas-warehouse:inbound-order:list；服务端仅在当前部署恰好存在一个客户范围时查询，前端不传 customerId。
+      description: 权限 platform:overseas-warehouse:inbound-order:list；平台跨客户分页查询，前端不传 customerId。
      security: [{ bearerAuth: [] }]
      parameters:
        - { name: page, in: query, schema: { type: integer, minimum: 1, default: 1 } }
@@ -38,28 +38,27 @@ paths:
        - { name: fbaAppointmentNo, in: query, schema: { type: string } }
      responses:
        '200': { description: 统一 ApiResponse 包装的排车单分页，records 元素为 DispatchResponse }
-        '409': { description: 当前部署检测到多个客户范围，拒绝跨客户查询 }
  /api/platform/v1/last-leg/dispatches/{dispatchNo}:
    get:
      summary: 查询排车单详情
-      description: 权限 platform:overseas-warehouse:inbound-order:list；服务端解析唯一客户范围，前端不传 customerId。
+      description: 权限 platform:overseas-warehouse:inbound-order:list；平台按全局排车单号定位记录，并使用记录自身客户范围查询明细，前端不传 customerId。
      security: [{ bearerAuth: [] }]
      parameters:
        - { name: dispatchNo, in: path, required: true, schema: { type: string } }
      responses:
        '200': { description: 统一 ApiResponse 包装的 DispatchResponse }
        '404': { description: 排车单不存在 }
-        '409': { description: 当前部署检测到多个客户范围 }
+        '409': { description: 排车单号在不同客户下重复，无法唯一定位 }
  /api/platform/v1/last-leg/dispatches/candidates:
    get:
      summary: 查询智能排车候选托盘
-      description: 权限 platform:overseas-warehouse:inbound-order:list；服务端解析唯一客户范围，仅返回尚未被有效排车锁定的计划或已实收托盘，前端不传 customerId。
+      description: 权限 platform:overseas-warehouse:inbound-order:list；planIds 为空时平台跨客户查询全部可排托盘，传入时按所选入库计划解析客户范围；仅返回尚未被有效排车锁定的计划或已实收托盘，前端不传 customerId。
      security: [{ bearerAuth: [] }]
      parameters:
        - name: planIds
          in: query
-          required: true
-          description: 已选入库计划 ID，逗号分隔；服务端据此解析并校验唯一客户范围。
+          required: false
+          description: 可选的入库计划 ID，逗号分隔；省略时平台查询全部客户候选。
          schema: { type: array, minItems: 1, maxItems: 500, items: { type: integer, format: int64 } }
          style: form
          explode: false
@@ -80,6 +79,25 @@ paths:
        content: { application/json: { schema: { $ref: '#/components/schemas/SmartDispatchPreArrange' } } }
      responses:
        '200': { description: 统一 ApiResponse 包装的预排车详情, content: { application/json: { schema: { $ref: '#/components/schemas/DispatchResponse' } } } }
+  /api/platform/v1/last-leg/dispatches/draft-locks/lock:
+    post:
+      summary: 将托盘移入智能排车草稿并立即锁定
+      description: 权限 platform:overseas-warehouse:inbound-order:smart-dispatch；草稿锁 30 分钟失效，与正式排车锁共享托盘排他约束。
+      security: [{ bearerAuth: [] }]
+      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/SmartDispatchDraftPallet' } } } }
+      responses: { '200': { description: 锁定成功 }, '409': { description: 托盘已被其他草稿或正式排车锁定 } }
+  /api/platform/v1/last-leg/dispatches/draft-locks/unlock:
+    post:
+      summary: 从智能排车草稿移除托盘并立即解锁
+      security: [{ bearerAuth: [] }]
+      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/SmartDispatchDraftPallet' } } } }
+      responses: { '200': { description: 解锁成功 }, '409': { description: 草稿锁不属于当前操作人 } }
+  /api/platform/v1/last-leg/dispatches/draft-locks/release:
+    post:
+      summary: 关闭智能排车草稿并释放草稿内全部托盘
+      security: [{ bearerAuth: [] }]
+      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/SmartDispatchDraftRelease' } } } }
+      responses: { '200': { description: 草稿锁已全部释放 } }
  /api/platform/v1/last-leg/overseas-procurements:
    get:
      summary: 分页查询海外采购订单
@@ -296,6 +314,14 @@ components:
        planPalletId: { type: string }
        warehousePalletId: { type: string, nullable: true }
        orderId: { type: string }
+        customerId: { type: string }
+        customerName: { type: string, nullable: true }
+        planNo: { type: string, nullable: true }
+        orderType: { type: string, nullable: true }
+        volumeWeightKg: { type: number, nullable: true }
+        containerNo: { type: string, nullable: true }
+        appointmentAt: { type: string, format: date-time, nullable: true }
+        expectedLoadingAt: { type: string, format: date-time, nullable: true }
        overseasWarehouseId: { type: string }
        overseasWarehouseName: { type: string }
        orderNo: { type: string }
@@ -309,6 +335,7 @@ components:
        packageCount: { type: integer }
        volumeCbm: { type: number }
        sourceStage: { type: string, enum: [PLAN, RECEIVED] }
+        cartonMarks: { type: string, nullable: true, description: 该托盘箱号，逗号分隔 }
    SmartDispatchPreArrange:
      type: object
      required: [planPalletIds]
@@ -318,6 +345,18 @@ components:
        fbaAppointmentNo: { type: string, nullable: true, maxLength: 64 }
        fbaAppointmentStatus: { type: string, nullable: true, maxLength: 32, default: PENDING }
        vehicleAppointmentStatus: { type: string, nullable: true, maxLength: 32, default: PENDING }
+        draftToken: { type: string, nullable: true, maxLength: 64, description: 拖入托盘时使用的智能排车草稿标识 }
+    SmartDispatchDraftPallet:
+      type: object
+      required: [planPalletId, draftToken]
+      properties:
+        planPalletId: { type: string }
+        draftToken: { type: string, minLength: 1, maxLength: 64 }
+    SmartDispatchDraftRelease:
+      type: object
+      required: [draftToken]
+      properties:
+        draftToken: { type: string, minLength: 1, maxLength: 64 }
    DispatchResponse:
      type: object
      properties: