暂存提交

firstleg/src/main/resources/db/phase3-inbounded-status-unification.sql

@@ -0,0 +1,17 @@
+-- 将已废弃的 WAIT_SPLIT 统一为 INBOUNDED。
+-- 执行前请确认所有服务已升级至本次状态契约；脚本可重复执行。
+USE baiyue_firstleg;
+
+UPDATE fl_inbound_order
+SET process_status = 'INBOUNDED',
+    updated_at = CURRENT_TIMESTAMP(3),
+    version = version + 1
+WHERE process_status = 'WAIT_SPLIT';
+
+UPDATE fl_inbound_status_history
+SET from_status = 'INBOUNDED'
+WHERE from_status = 'WAIT_SPLIT';
+
+UPDATE fl_inbound_status_history
+SET to_status = 'INBOUNDED'
+WHERE to_status = 'WAIT_SPLIT';

firstleg/src/main/resources/db/phase3-smart-loading-schema.sql

@@ -4,6 +4,28 @@ CREATE DATABASE IF NOT EXISTS baiyue_firstleg
   DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
 USE baiyue_firstleg;
 
+-- 兼容已执行二期初始化的存量库：PDA 拣货需要累计每个托盘分配已拣箱数。
+DROP PROCEDURE IF EXISTS phase3_add_allocation_picked_count;
+DELIMITER $$
+CREATE PROCEDURE phase3_add_allocation_picked_count()
+BEGIN
+  IF EXISTS (
+      SELECT 1 FROM information_schema.tables
+       WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_inbound_pallet_allocation'
+  ) AND NOT EXISTS (
+      SELECT 1 FROM information_schema.columns
+       WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_inbound_pallet_allocation'
+         AND column_name = 'picked_package_count'
+  ) THEN
+    ALTER TABLE fl_inbound_pallet_allocation
+      ADD COLUMN picked_package_count INT UNSIGNED NOT NULL DEFAULT 0
+      COMMENT '已拣货箱数' AFTER allocated_package_count;
+  END IF;
+END$$
+DELIMITER ;
+CALL phase3_add_allocation_picked_count();
+DROP PROCEDURE phase3_add_allocation_picked_count;
+
 CREATE TABLE IF NOT EXISTS fl_container_booking (
   id BIGINT UNSIGNED NOT NULL COMMENT '货柜预订ID（雪花ID）',
   booking_no VARCHAR(40) NOT NULL COMMENT '平台唯一货柜预订单号',

firstleg/src/main/resources/openapi/fba-pricing-v1.yaml

@@ -54,14 +54,14 @@ paths:
   /api/platform/v1/inbounds/{inboundId}/fees/calculate:
     post:
       summary: 按审核通过测量快照试算 FBA 费用
-      description: 精确匹配唯一客户规则和唯一船司价格；测量审核后即使主流程已到 WAIT_SPLIT，也可独立试算且不回退主流程状态；需要 firstleg:fba-pricing:calculate 权限。
+      description: 精确匹配唯一客户规则和唯一船司价格；测量审核后即使主流程已到 INBOUNDED，也可独立试算且不回退主流程状态；需要 firstleg:fba-pricing:calculate 权限。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody: {content: {application/json: {schema: {$ref: '#/components/schemas/CalculateRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/confirm:
     post:
       summary: 确认最新费用快照
-      description: 确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
+      description: 确认费用只更新费用状态；主流程已到 INBOUNDED 时保持不变。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/send: