优化

firstleg/src/main/resources/db/phase2-inbound-schema.sql

@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_order (
   order_id BIGINT UNSIGNED NOT NULL COMMENT '订单服务订单ID，不建立跨库外键',
   order_no VARCHAR(32) NOT NULL COMMENT '订单号快照',
   inbound_code VARCHAR(40) NOT NULL COMMENT '客户内唯一入仓码',
-  process_status VARCHAR(24) NOT NULL DEFAULT 'WAIT_MEASURE' COMMENT '入库流程状态：WAIT_MEASURE待测量、MEASURING测量中、MEASURE_PENDING待审核、MEASURE_REJECTED测量驳回、WAIT_PRICING待计费、FEE_CONFIRMING费用确认中、INBOUNDING入库收口中、INBOUNDED已入库、WAIT_SPLIT历史待分柜',
+  process_status VARCHAR(24) NOT NULL DEFAULT 'WAIT_MEASURE' COMMENT '入库流程状态：WAIT_MEASURE待测量、MEASURING测量中、MEASURE_PENDING待审核、MEASURE_REJECTED测量驳回、WAIT_PRICING待计费、FEE_CONFIRMING费用确认中、INBOUNDING入库收口中、WAIT_SPLIT待分柜',
   order_status_snapshot VARCHAR(24) NOT NULL COMMENT '订单状态快照',
   measure_review_status VARCHAR(24) NOT NULL DEFAULT 'NOT_SUBMITTED' COMMENT '测量审核状态：NOT_SUBMITTED未提交、PENDING待审核、APPROVED已通过、REJECTED已驳回',
   fee_status VARCHAR(24) NOT NULL DEFAULT 'UNPRICED' COMMENT '费用状态：UNPRICED未计费、CALCULATED已计算、CONFIRMED已确认、SENT已发送、VOIDED已作废',

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

@@ -1,10 +1,9 @@
--- 新完成入库记录使用 WAIT_SPLIT，存量 INBOUNDED 继续作为可分柜兼容状态。
--- 本脚本不改写业务主表或历史状态，避免影响既有审计记录。
+-- 入库完成后的唯一状态为 WAIT_SPLIT。
 USE baiyue_firstleg;
 
-DROP PROCEDURE IF EXISTS assert_inbounded_compatibility;
+DROP PROCEDURE IF EXISTS assert_wait_split_status;
 DELIMITER $$
-CREATE PROCEDURE assert_inbounded_compatibility()
+CREATE PROCEDURE assert_wait_split_status()
 BEGIN
   IF (SELECT COUNT(*) FROM information_schema.columns
        WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_inbound_order'
@@ -13,9 +12,9 @@ BEGIN
           WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_inbound_status_history'
             AND column_name IN ('from_status', 'to_status')) <> 2 THEN
     SIGNAL SQLSTATE '45000'
-      SET MESSAGE_TEXT = 'WAIT_SPLIT/INBOUNDED 兼容校验失败：入库状态字段不完整';
+      SET MESSAGE_TEXT = 'WAIT_SPLIT 状态校验失败：入库状态字段不完整';
   END IF;
 END$$
 DELIMITER ;
-CALL assert_inbounded_compatibility();
-DROP PROCEDURE assert_inbounded_compatibility;
+CALL assert_wait_split_status();
+DROP PROCEDURE assert_wait_split_status;

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

@@ -130,14 +130,14 @@ paths:
   /api/platform/v1/inbounds/{inboundId}/fees/calculate:
     post:
       summary: 按审核通过测量快照试算 FBA 费用
-      description: 仅匹配当前唯一 ACTIVE 船期价格表中的 ACTIVE 价格行，按起运仓、渠道、目的仓、pricingTaxMode 和计费单位估价；不再以 carrierId 或客户计费规则作为前置。海派还需按FBA区域和重量阶梯匹配；测量审核后即使主流程已到 INBOUNDED，也可独立试算且不回退主流程状态；需要 firstleg:fba-pricing:calculate 权限。
+      description: 仅匹配当前唯一 ACTIVE 船期价格表中的 ACTIVE 价格行，按起运仓、渠道、目的仓、pricingTaxMode 和计费单位估价；不再以 carrierId 或客户计费规则作为前置。海派还需按FBA区域和重量阶梯匹配；测量审核后即使主流程已到 WAIT_SPLIT，也可独立试算且不回退主流程状态；需要 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: 确认费用只更新费用状态；主流程已到 INBOUNDED 时保持不变。
+      description: 确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
       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:
@@ -154,7 +154,7 @@ paths:
   /api/platform/v1/inbounds/{inboundId}/fees/published:
     put:
       summary: 调整已发布费用
-      description: 需要 firstleg:fba-pricing:adjust 权限；生成新 SENT 版本并将旧版本标记 SUPERSEDED，不回退 INBOUNDED 状态。
+      description: 需要 firstleg:fba-pricing:adjust 权限；生成新 SENT 版本并将旧版本标记 SUPERSEDED，不回退 WAIT_SPLIT 状态。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody:
         required: true

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

@@ -68,7 +68,7 @@ paths:
     post:
       summary: 按统一订单条件分页查询履约摘要（Order 内部）
       description: >-
-        mainStatus 接受七态产品状态；WAIT_SPLIT 为正式待分柜状态，INBOUNDED 仅兼容存量已入库记录。
+        mainStatus 接受六态产品状态；WAIT_SPLIT 为入库完成后的唯一待分柜状态。
         计费与入库处理中状态在完成前仍归并为 WAIT_MEASURE，不提前开放分柜。
       security:
         - internalServiceToken: []
@@ -102,7 +102,7 @@ paths:
   /internal/firstleg/v1/inbounds/unified-orders/detail:
     post:
       summary: 按订单 ID 查询统一履约详情（Order 内部）
-      description: 时间线保留 Firstleg 内部 fromStatus/toStatus；summary.mainStatus 使用七态产品状态。
+      description: 时间线保留 Firstleg 内部 fromStatus/toStatus；summary.mainStatus 使用六态产品状态。
       security:
         - internalServiceToken: []
       requestBody:
@@ -390,7 +390,7 @@ paths:
       description: 需要 platform:firstleg:inbound:list 权限；默认查询全部企业，可选 tenantId 筛选；仅使用 V2 四个页签
       parameters:
         - {name: tenantId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
-        - {name: tab, in: query, schema: {type: string, enum: [WAIT_MEASURE, WAIT_REVIEW, WAIT_FEE_SEND, INBOUNDED]}}
+        - {name: tab, in: query, schema: {type: string, enum: [WAIT_MEASURE, WAIT_REVIEW, WAIT_FEE_SEND, WAIT_SPLIT]}}
       responses:
         '200':
           description: 成功或业务失败，按响应体 code 判断；每条记录携带后续客户隔离操作所需的 tenantId，该字段当前表示客户 ID
@@ -565,7 +565,7 @@ paths:
   /api/merchant/v1/first-leg/orders/{orderId}/inbound-billing:
     get:
       summary: 客户查询已完成入库结果和最新已发布费用
-      description: 需要 merchant:order:view 权限；客户只读查看，不需要确认费用，仅 INBOUNDED + APPROVED + CONFIRMED 的二期终态可见。
+      description: 需要 merchant:order:view 权限；客户只读查看，不需要确认费用，仅 WAIT_SPLIT + APPROVED + CONFIRMED 的二期终态可见。
       parameters:
         - {name: orderId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
       responses:
@@ -656,8 +656,8 @@ components:
   schemas:
     UnifiedMainStatus:
       type: string
-      enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, WAIT_SPLIT, LOADING, LOADED, DELIVERED]
-      description: 七态产品主状态；WAIT_SPLIT 为正式待分柜状态，INBOUNDED 仅兼容存量已入库记录
+      enum: [PENDING_REVIEW, WAIT_MEASURE, WAIT_SPLIT, LOADING, LOADED, DELIVERED]
+      description: 六态产品主状态；WAIT_SPLIT 为入库完成后的唯一待分柜状态
     UnifiedInboundQuery:
       type: object
       properties:
@@ -666,9 +666,9 @@ components:
         orderNo: {type: string, maxLength: 64, nullable: true}
         mainStatus:
           type: string
-          enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, LOADING, LOADED, DELIVERED, WAIT_SPLIT]
+          enum: [PENDING_REVIEW, WAIT_MEASURE, WAIT_SPLIT, LOADING, LOADED, DELIVERED]
           nullable: true
-          description: WAIT_SPLIT 与 INBOUNDED 为独立筛选值
+          description: WAIT_SPLIT 为唯一待分柜筛选值
         customerId: {type: integer, format: int64, nullable: true}
         receivingWarehouseId: {type: integer, format: int64, nullable: true}
         destinationWarehouseId: {type: integer, format: int64, nullable: true}
@@ -767,7 +767,7 @@ components:
         orderId: {type: integer, format: int64, nullable: true}
         orderNo: {type: string, nullable: true}
         inboundCode: {type: string, nullable: true}
-        processStatus: {type: string, nullable: true, description: Firstleg 内部状态；新入库完成记录进入 WAIT_SPLIT，历史记录可能为 INBOUNDED}
+        processStatus: {type: string, nullable: true, description: Firstleg 内部状态；入库完成记录进入 WAIT_SPLIT}
         orderStatusSnapshot: {type: string, nullable: true}
         measureReviewStatus: {type: string, nullable: true}
         feeStatus: {type: string, nullable: true}