Merge branch 'test' into test-02huogui

# Conflicts: # deploy/sql/头程数据库统一增量-MySQL8.sql # firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java # firstleg/src/main/resources/application.yml # firstleg/src/main/resources/openapi/fba-pricing-v1.yaml # firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java # order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java # order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
2026-08-07 19:49:09 +08:00
parent 3f15f3ad2b c698290106
commit 2b81fd40e7
192 changed files with 10729 additions and 391 deletions
@@ -0,0 +1,21 @@
+SET NAMES utf8mb4;
+USE baiyue_firstleg;
+
+-- 每个客户唯一的尺寸计算配置；当前只保存每侧加宽值，不接入订单或计费。
+CREATE TABLE IF NOT EXISTS fl_customer_dimension_config (
+  id BIGINT UNSIGNED NOT NULL COMMENT '配置ID',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户隔离ID',
+  edge_addition_cm DECIMAL(6,3) NOT NULL DEFAULT 2.000 COMMENT '每个尺寸方向的单侧加宽厘米数',
+  remark VARCHAR(500) NULL COMMENT '备注',
+  initialization_key VARCHAR(128) NOT NULL COMMENT '创建流程幂等键及补偿归属',
+  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除',
+  version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_customer_dimension_config_tenant (tenant_id),
+  CONSTRAINT chk_customer_dimension_edge_addition
+    CHECK (edge_addition_cm >= 0.001 AND edge_addition_cm <= 100.000)
+) ENGINE=InnoDB COMMENT='客户尺寸计算配置';
@@ -0,0 +1,53 @@
+-- 单箱当前测量记录增量；可重复执行。
+USE baiyue_firstleg;
+
+DROP PROCEDURE IF EXISTS phase2_add_carton_measurement_column;
+DELIMITER $$
+CREATE PROCEDURE phase2_add_carton_measurement_column(
+  IN p_column VARCHAR(64), IN p_definition TEXT)
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'fl_inbound_measurement_item'
+      AND COLUMN_NAME = p_column
+  ) THEN
+    SET @ddl = CONCAT(
+      'ALTER TABLE fl_inbound_measurement_item ADD COLUMN `',
+      p_column, '` ', p_definition);
+    PREPARE statement FROM @ddl;
+    EXECUTE statement;
+    DEALLOCATE PREPARE statement;
+  END IF;
+END$$
+DELIMITER ;
+
+CALL phase2_add_carton_measurement_column(
+  'box_code',
+  'VARCHAR(128) NULL COMMENT ''柏悦唛头箱号；设备单箱测量时同一客户内唯一'' AFTER external_detail_no');
+CALL phase2_add_carton_measurement_column(
+  'machine_no',
+  'VARCHAR(64) NULL COMMENT ''本次测量设备编号'' AFTER source_image_file_id');
+CALL phase2_add_carton_measurement_column(
+  'device_measured_at',
+  'DATETIME(3) NULL COMMENT ''本次设备测量时间'' AFTER machine_no');
+CALL phase2_add_carton_measurement_column(
+  'updated_at',
+  'DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT ''最后更新时间'' AFTER created_at');
+
+DROP PROCEDURE IF EXISTS phase2_add_carton_measurement_column;
+
+SET @has_box_code_index = (
+  SELECT COUNT(*) FROM information_schema.STATISTICS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'fl_inbound_measurement_item'
+    AND INDEX_NAME = 'uk_measure_box_code'
+);
+SET @ddl = IF(
+  @has_box_code_index = 0,
+  'ALTER TABLE fl_inbound_measurement_item ADD UNIQUE KEY uk_measure_box_code (tenant_id, box_code)',
+  'SELECT 1'
+);
+PREPARE statement FROM @ddl;
+EXECUTE statement;
+DEALLOCATE PREPARE statement;
@@ -0,0 +1,28 @@
+SET NAMES utf8mb4;
+USE baiyue_firstleg;
+
+-- 存量环境可重复执行：首次打印前冻结整单箱号；Print 服务继续保持无状态。
+CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
+  id BIGINT UNSIGNED NOT NULL COMMENT '实际箱唛头映射ID（雪花ID）',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '当前客户隔离ID',
+  inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
+  order_id BIGINT UNSIGNED NOT NULL COMMENT '订单服务订单ID快照',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '订单货物明细ID，不建立跨库外键',
+  cargo_item_no INT UNSIGNED NOT NULL COMMENT '订单货物明细序号快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  detail_package_count INT UNSIGNED NOT NULL COMMENT '该订单货物明细箱数快照',
+  inbound_code VARCHAR(40) NOT NULL COMMENT '入仓码快照',
+  box_code VARCHAR(80) NOT NULL COMMENT '固定二维码内容：入仓码#总箱数-箱下标',
+  total_carton_count INT UNSIGNED NOT NULL COMMENT '首次分配时整单总箱数',
+  carton_index INT UNSIGNED NOT NULL COMMENT '整单从1开始的稳定箱下标',
+  box_specification VARCHAR(255) NOT NULL COMMENT '订单箱规或货物明细描述快照',
+  length_cm DECIMAL(12,3) NULL COMMENT '下单箱规长度cm快照',
+  width_cm DECIMAL(12,3) NULL COMMENT '下单箱规宽度cm快照',
+  height_cm DECIMAL(12,3) NULL COMMENT '下单箱规高度cm快照',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '首次分配时间',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_carton_label_box_code (tenant_id, box_code),
+  UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, carton_index),
+  KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
+  CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
+) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
@@ -32,6 +32,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_order (
  carrier_id BIGINT UNSIGNED NULL COMMENT '计费船司逻辑ID',
  carrier_name VARCHAR(128) NULL COMMENT '计费船司名称快照',
  tax_mode VARCHAR(24) NULL COMMENT '买单或退税模式',
+  pricing_tax_mode VARCHAR(16) NULL COMMENT '报价包税维度：TAX_INCLUDED/TAX_EXCLUDED',
  container_mode VARCHAR(24) NULL COMMENT '整柜或散货模式',
  customs_inspection TINYINT(1) NULL COMMENT '是否商检',
  destination_type VARCHAR(24) NULL COMMENT '目的仓类型',
@@ -139,6 +140,31 @@ CREATE TABLE IF NOT EXISTS fl_inbound_transport_snapshot (
  CONSTRAINT fk_transport_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='入库单关联运输信息只读快照';

+CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
+  id BIGINT UNSIGNED NOT NULL COMMENT '实际箱唛头映射ID（雪花ID）',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '当前客户隔离ID',
+  inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
+  order_id BIGINT UNSIGNED NOT NULL COMMENT '订单服务订单ID快照',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '订单货物明细ID，不建立跨库外键',
+  cargo_item_no INT UNSIGNED NOT NULL COMMENT '订单货物明细序号快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  detail_package_count INT UNSIGNED NOT NULL COMMENT '该订单货物明细箱数快照',
+  inbound_code VARCHAR(40) NOT NULL COMMENT '入仓码快照',
+  box_code VARCHAR(80) NOT NULL COMMENT '固定二维码内容：入仓码#总箱数-箱下标',
+  total_carton_count INT UNSIGNED NOT NULL COMMENT '首次分配时整单总箱数',
+  carton_index INT UNSIGNED NOT NULL COMMENT '整单从1开始的稳定箱下标',
+  box_specification VARCHAR(255) NOT NULL COMMENT '订单箱规或货物明细描述快照',
+  length_cm DECIMAL(12,3) NULL COMMENT '下单箱规长度cm快照',
+  width_cm DECIMAL(12,3) NULL COMMENT '下单箱规宽度cm快照',
+  height_cm DECIMAL(12,3) NULL COMMENT '下单箱规高度cm快照',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '首次分配时间',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_carton_label_box_code (tenant_id, box_code),
+  UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, carton_index),
+  KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
+  CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
+) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
+
 CREATE TABLE IF NOT EXISTS fl_inbound_measurement (
  id BIGINT UNSIGNED NOT NULL COMMENT '测量批次ID',
  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '数据所属租户ID',
@@ -176,6 +202,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_measurement_item (
  measurement_id BIGINT UNSIGNED NOT NULL COMMENT '测量批次ID',
  inbound_detail_id BIGINT UNSIGNED NULL COMMENT '绑定的订单货物明细ID，平台手工明细可为空',
  external_detail_no VARCHAR(128) NULL COMMENT '第三方测量明细唯一号，平台手工明细可为空',
+  box_code VARCHAR(128) NULL COMMENT '柏悦唛头箱号；设备单箱测量时同一客户内唯一',
  item_no VARCHAR(32) NOT NULL COMMENT '批次内明细号',
  box_specification VARCHAR(64) NOT NULL COMMENT '箱规标识',
  package_count INT UNSIGNED NOT NULL COMMENT '相同箱规箱数',
@@ -192,15 +219,19 @@ CREATE TABLE IF NOT EXISTS fl_inbound_measurement_item (
  volume_weight_kg DECIMAL(18,3) NOT NULL COMMENT '本箱规材积重kg',
  calculation_rule_version VARCHAR(32) NOT NULL COMMENT '体积计算和舍入规则版本',
  source_image_file_id BIGINT UNSIGNED NULL COMMENT '测量设备图片文件ID',
+  machine_no VARCHAR(64) NULL COMMENT '本次测量设备编号',
+  device_measured_at DATETIME(3) NULL COMMENT '本次设备测量时间',
  over_limit_warning VARCHAR(500) NULL COMMENT '超线提醒快照',
  outer_length_cm DECIMAL(12,3) NULL COMMENT '外箱规长度cm',
  outer_width_cm DECIMAL(12,3) NULL COMMENT '外箱规宽度cm',
  outer_height_cm DECIMAL(12,3) NULL COMMENT '外箱规高度cm',
  remark VARCHAR(500) 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 '最后更新时间',
  PRIMARY KEY (id),
  UNIQUE KEY uk_measure_item_no (tenant_id, measurement_id, item_no),
  UNIQUE KEY uk_measure_external_detail (tenant_id, inbound_detail_id, external_detail_no),
+  UNIQUE KEY uk_measure_box_code (tenant_id, box_code),
  CONSTRAINT fk_measure_item_batch FOREIGN KEY (measurement_id) REFERENCES fl_inbound_measurement (id)
 ) ENGINE=InnoDB COMMENT='入库长宽高和箱数测量明细';

@@ -310,22 +341,34 @@ CREATE TABLE IF NOT EXISTS fl_customer_charge_rule (
 CREATE TABLE IF NOT EXISTS fl_carrier_fba_rate (
  id BIGINT UNSIGNED NOT NULL COMMENT '船司FBA价格ID',
  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '平台价格作用域ID，船司价格固定为0',
+  price_book_version_id BIGINT UNSIGNED NULL COMMENT '整表价格版本ID；历史兼容价格可为空',
  rate_code VARCHAR(50) NOT NULL COMMENT '平台公共价格编码',
  rate_version INT UNSIGNED NOT NULL COMMENT '价格版本号',
-  origin_warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '起运仓逻辑ID',
+  origin_warehouse_id BIGINT UNSIGNED NULL COMMENT '确认前可为空；确认后绑定平台公共起运仓逻辑ID',
+  origin_warehouse_code VARCHAR(64) NULL COMMENT '起运仓稳定编码',
  origin_warehouse_name VARCHAR(128) NOT NULL COMMENT '起运仓名称快照',
  business_type VARCHAR(32) NOT NULL COMMENT '业务或计费类型',
  channel_code VARCHAR(64) NULL COMMENT '渠道编码',
+  price_model VARCHAR(32) NOT NULL DEFAULT 'FBA_WAREHOUSE_RATE' COMMENT '价格模型',
  carrier_id BIGINT UNSIGNED NULL COMMENT '船司逻辑ID',
-  carrier_name VARCHAR(128) NOT NULL COMMENT '船司名称快照',
-  destination_code VARCHAR(32) NOT NULL COMMENT 'FBA目的仓编码',
+  carrier_name VARCHAR(128) NULL COMMENT '历史承运商名称；渠道价格可为空',
+  destination_type VARCHAR(16) NULL COMMENT '目的地类型：FBA或OVERSEAS；REGION_WEIGHT_TIER区域阶梯行为空',
+  destination_code VARCHAR(32) NULL COMMENT 'FBA目的仓编码；区域阶梯模型为空',
+  destination_warehouse_id BIGINT UNSIGNED NULL COMMENT '平台海外仓稳定ID；不存环境专属ID',
+  destination_name VARCHAR(128) NULL COMMENT '目的仓名称快照',
+  region_code VARCHAR(16) NULL COMMENT '区域阶梯模型区域编码',
+  pricing_tax_mode VARCHAR(16) NULL COMMENT '报价包税维度；独立于订单tax_mode',
+  weight_from_kg DECIMAL(18,6) NULL COMMENT '区域阶梯起始计费重量KG',
  charge_unit VARCHAR(16) NOT NULL COMMENT '计费单位：KG或CBM',
  unit_price DECIMAL(18,6) NOT NULL COMMENT '基础单价',
  currency CHAR(3) NOT NULL COMMENT '币种',
  additional_fee DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '固定附加费',
+  source_sheet_name VARCHAR(128) NULL COMMENT '原始Excel Sheet',
+  source_row_number INT UNSIGNED NULL COMMENT '原始Excel行号',
+  source_destination_text VARCHAR(1000) NULL COMMENT '原始组合仓库或区域文本',
  effective_from DATETIME(3) NOT NULL COMMENT '生效开始时间',
  effective_to DATETIME(3) NULL COMMENT '生效结束时间',
-  status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '价格状态',
+  status VARCHAR(24) NOT NULL DEFAULT 'ACTIVE' COMMENT '价格状态：PENDING_CONFIRMATION、ACTIVE或SUPERSEDED',
  remark VARCHAR(500) NULL COMMENT '价格备注',
  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
@@ -335,39 +378,187 @@ CREATE TABLE IF NOT EXISTS fl_carrier_fba_rate (
  version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
  PRIMARY KEY (id),
  UNIQUE KEY uk_fba_rate_version (tenant_id, rate_code, rate_version),
-  KEY idx_fba_rate_match (tenant_id, origin_warehouse_id, business_type, channel_code, carrier_id, destination_code, charge_unit, status, effective_from, effective_to)
+  KEY idx_fba_rate_match (tenant_id, origin_warehouse_id, business_type, channel_code, carrier_id, destination_type, destination_code, destination_warehouse_id, charge_unit, status, effective_from, effective_to),
+  KEY idx_fba_rate_book (price_book_version_id, channel_code, origin_warehouse_id, price_model, status),
+  KEY idx_fba_rate_destination (price_book_version_id, channel_code, origin_warehouse_id, destination_type, destination_warehouse_id, destination_code),
+  KEY idx_fba_rate_region (price_book_version_id, channel_code, origin_warehouse_id, region_code, weight_from_kg)
 ) ENGINE=InnoDB COMMENT='船司FBA目的仓价格版本';

+CREATE TABLE IF NOT EXISTS fl_price_channel_catalog (
+  id BIGINT UNSIGNED NOT NULL COMMENT '渠道目录ID',
+  channel_code VARCHAR(64) NOT NULL COMMENT '稳定渠道编码',
+  display_name VARCHAR(128) NOT NULL COMMENT '平台渠道名称',
+  price_model VARCHAR(32) NOT NULL COMMENT '默认价格模型',
+  source_sheet_name VARCHAR(128) NOT NULL COMMENT '来源Sheet名称；海派为同一Sheet',
+  aliases_json JSON NOT NULL COMMENT '上传名称别名数组',
+  status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' 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_price_channel_code (channel_code),
+  KEY idx_price_channel_status (status, price_model)
+) ENGINE=InnoDB COMMENT='平台公共船期价格固定渠道目录';
+
+CREATE TABLE IF NOT EXISTS fl_price_origin_alias (
+  id BIGINT UNSIGNED NOT NULL COMMENT '起运仓别名ID',
+  warehouse_code VARCHAR(64) NOT NULL COMMENT '平台仓库稳定编码，不存环境专属ID',
+  alias_name VARCHAR(128) NOT NULL COMMENT 'Excel起运仓名称别名',
+  status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE',
+  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_price_origin_alias (warehouse_code, alias_name),
+  KEY idx_price_origin_alias_name (alias_name, status)
+) ENGINE=InnoDB COMMENT='价格表起运仓名称别名映射';
+
+CREATE TABLE IF NOT EXISTS fl_price_warehouse_mapping (
+  id BIGINT UNSIGNED NOT NULL COMMENT '价格仓映射ID',
+  source_type VARCHAR(24) NOT NULL COMMENT '来源维度：ORIGIN_CODE或OVERSEAS_NAME',
+  source_value VARCHAR(128) NOT NULL COMMENT '解析后的来源仓编码或海外仓名称',
+  warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '固定平台公共仓库ID',
+  warehouse_code VARCHAR(64) NOT NULL COMMENT '平台仓库稳定编码快照',
+  warehouse_type VARCHAR(16) NOT NULL COMMENT 'DOMESTIC或OVERSEAS',
+  status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE',
+  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_price_warehouse_mapping_source (source_type, source_value),
+  KEY idx_price_warehouse_mapping_target (warehouse_id, status)
+) ENGINE=InnoDB COMMENT='价格表来源仓与固定平台公共仓映射';
+
+CREATE TABLE IF NOT EXISTS fl_price_book_version (
+  id BIGINT UNSIGNED NOT NULL COMMENT '整表价格版本ID',
+  tenant_id BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '平台公共价格作用域固定为0',
+  version_no INT UNSIGNED NOT NULL COMMENT '整表版本号',
+  original_file_name VARCHAR(255) NOT NULL COMMENT '原始Excel文件名',
+  source_file_id BIGINT UNSIGNED NULL COMMENT 'File服务原始文件ID',
+  source_sha256 CHAR(64) NULL COMMENT '原始文件SHA-256',
+  status VARCHAR(24) NOT NULL DEFAULT 'PENDING_CONFIRMATION' COMMENT '待确认上传记录；ACTIVE/SUPERSEDED/FAILED',
+  blocking_error_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '阻断错误数',
+  warning_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '警告数',
+  parse_issues_json JSON NULL COMMENT '上传解析问题及待确认重新校验结果',
+  channel_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '解析渠道数',
+  rate_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '解析价格数',
+  created_by BIGINT UNSIGNED NOT NULL,
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  published_by BIGINT UNSIGNED NULL,
+  published_at DATETIME(3) NULL COMMENT '确认并生效时间',
+  superseded_at DATETIME(3) NULL COMMENT '被下一版本替换时间',
+  updated_by BIGINT UNSIGNED NOT NULL,
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+  deleted TINYINT(1) NOT NULL DEFAULT 0,
+  version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_price_book_version (tenant_id, version_no),
+  KEY idx_price_book_status (tenant_id, status, published_at),
+  KEY idx_price_book_source_hash (tenant_id, source_sha256)
+) ENGINE=InnoDB COMMENT='平台公共船期价格整表版本';
+
+CREATE TABLE IF NOT EXISTS fl_price_book_channel (
+  id BIGINT UNSIGNED NOT NULL COMMENT '版本渠道快照ID',
+  price_book_version_id BIGINT UNSIGNED NOT NULL COMMENT '整表价格版本ID',
+  channel_code VARCHAR(64) NOT NULL COMMENT '固定渠道编码',
+  channel_name VARCHAR(128) NOT NULL COMMENT '渠道名称快照',
+  price_model VARCHAR(32) NOT NULL COMMENT '价格模型快照',
+  source_sheet_name VARCHAR(128) NOT NULL COMMENT '原始Excel Sheet',
+  estimated_departure_date DATE NULL COMMENT '标准预计开船日期',
+  estimated_departure_text VARCHAR(128) NULL COMMENT '原始预计开船日期文本',
+  latest_warehouse_entry VARCHAR(128) NULL COMMENT '最晚进仓时间',
+  vessel_name VARCHAR(128) NULL COMMENT '船名',
+  voyage_no VARCHAR(64) NULL COMMENT '航次',
+  reference_transit VARCHAR(128) NULL COMMENT '参考时效',
+  surcharge_description VARCHAR(2000) NULL COMMENT '附加费说明，仅展示',
+  remark VARCHAR(2000) NULL COMMENT '渠道备注',
+  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+  deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除标记',
+  version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_price_book_channel (price_book_version_id, channel_code),
+  KEY idx_price_book_channel_code (channel_code, price_book_version_id)
+) ENGINE=InnoDB COMMENT='价格版本渠道及船期快照';
+
+INSERT INTO fl_price_channel_catalog
+  (id, channel_code, display_name, price_model, source_sheet_name, aliases_json, status)
+VALUES
+  (1, 'MATSON_CLX_TRUCK', '美森正班海卡', 'FBA_WAREHOUSE_RATE', '美森正班海卡', JSON_ARRAY('美森正班海卡'), 'ACTIVE'),
+  (2, 'MATSON_MAX_TRUCK', '美森加班海卡', 'FBA_WAREHOUSE_RATE', '美森加班海卡', JSON_ARRAY('美森加班海卡'), 'ACTIVE'),
+  (3, 'EXX_TRUCK', 'EXX海卡', 'FBA_WAREHOUSE_RATE', 'EXX海卡', JSON_ARRAY('EXX海卡'), 'ACTIVE'),
+  (4, 'HEDE_TRUCK', '合德海卡', 'FBA_WAREHOUSE_RATE', '合德海卡', JSON_ARRAY('合德海卡'), 'ACTIVE'),
+  (5, 'EXX_RAIL_NY', '纽约EXX海铁', 'FBA_WAREHOUSE_RATE', '纽约EXX海铁', JSON_ARRAY('纽约EXX海铁'), 'ACTIVE'),
+  (6, 'OA_LA_TRUCK', '洛杉矶普船海卡', 'FBA_WAREHOUSE_RATE', '洛杉矶普船海卡', JSON_ARRAY('洛杉矶普船海卡'), 'ACTIVE'),
+  (7, 'OA_LA_FULL_TRUCK', '洛杉矶普船全卡', 'FBA_WAREHOUSE_RATE', '洛杉矶普船全卡', JSON_ARRAY('洛杉矶普船全卡'), 'ACTIVE'),
+  (8, 'OA_CHICAGO_RAIL', '芝加哥普船海铁', 'FBA_WAREHOUSE_RATE', '芝加哥普船海铁', JSON_ARRAY('芝加哥普船海铁'), 'ACTIVE'),
+  (9, 'OA_HOUSTON_TRUCK', '休斯顿普船海卡', 'FBA_WAREHOUSE_RATE', '休斯顿普船海卡', JSON_ARRAY('休斯顿普船海卡'), 'ACTIVE'),
+  (10, 'OA_NEW_YORK_TRUCK', '纽约普船海卡', 'FBA_WAREHOUSE_RATE', '纽约普船海卡', JSON_ARRAY('纽约普船海卡'), 'ACTIVE'),
+  (11, 'OA_SAVANNAH_TRUCK', '萨凡纳普船海卡', 'FBA_WAREHOUSE_RATE', '萨凡纳普船海卡', JSON_ARRAY('萨凡纳普船海卡'), 'ACTIVE'),
+  (12, 'MATSON_CLX_PARCEL', '美森正班海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('美森正班海派'), 'ACTIVE'),
+  (13, 'MATSON_MAX_PARCEL', '美森加班海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('美森加班海派'), 'ACTIVE'),
+  (14, 'HEDE_PARCEL', '合德海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('合德海派'), 'ACTIVE'),
+  (15, 'OA_PARCEL', '普船海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('普船海派'), 'ACTIVE')
+ON DUPLICATE KEY UPDATE
+  display_name = VALUES(display_name), price_model = VALUES(price_model),
+  source_sheet_name = VALUES(source_sheet_name), aliases_json = VALUES(aliases_json), status = VALUES(status);
+
+INSERT INTO fl_price_origin_alias (id, warehouse_code, alias_name, status)
+VALUES
+  (1, 'CN-YIWU-01', '华东仓（义乌）', 'ACTIVE'),
+  (2, 'CN-YIWU-01', '义乌仓', 'ACTIVE'),
+  (3, 'CN-YIWU-01', '义乌', 'ACTIVE'),
+  (4, 'CN-DONGGUAN-01', '华南仓（深圳）', 'ACTIVE'),
+  (5, 'CN-DONGGUAN-01', '东莞仓', 'ACTIVE'),
+  (6, 'CN-DONGGUAN-01', '深圳仓', 'ACTIVE'),
+  (7, 'CN-DONGGUAN-01', '华南仓（深圳/东莞）', 'ACTIVE')
+ON DUPLICATE KEY UPDATE status = VALUES(status);
+
+INSERT INTO fl_price_warehouse_mapping
+  (id, source_type, source_value, warehouse_id, warehouse_code, warehouse_type, status)
+VALUES
+  (1, 'ORIGIN_CODE', 'CN-YIWU-01', 193000000000200001, 'CN-YIWU-01', 'DOMESTIC', 'ACTIVE'),
+  (2, 'ORIGIN_CODE', 'CN-DONGGUAN-01', 193000000000200002, 'CN-DONGGUAN-01', 'DOMESTIC', 'ACTIVE'),
+  (3, 'OVERSEAS_NAME', '洛杉矶仓', 193000000000200003, 'US-LAX-01', 'OVERSEAS', 'ACTIVE'),
+  (4, 'OVERSEAS_NAME', '纽约仓', 193000000000200004, 'US-NYC-01', 'OVERSEAS', 'ACTIVE')
+ON DUPLICATE KEY UPDATE
+  warehouse_id = VALUES(warehouse_id), warehouse_code = VALUES(warehouse_code),
+  warehouse_type = VALUES(warehouse_type), status = VALUES(status);
+
 CREATE TABLE IF NOT EXISTS fl_inbound_fee (
  id BIGINT UNSIGNED NOT NULL COMMENT '入库费用ID',
  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '数据所属租户ID',
  inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
  fee_no VARCHAR(40) NOT NULL COMMENT '租户内唯一费用单号',
  fee_version INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '费用快照版本',
-  charge_rule_id BIGINT UNSIGNED NOT NULL COMMENT '客户计费规则ID',
-  charge_rule_version INT UNSIGNED NOT NULL COMMENT '客户规则版本快照',
+  charge_rule_id BIGINT UNSIGNED NULL COMMENT '历史客户计费规则ID；渠道价格可为空',
+  charge_rule_version INT UNSIGNED NULL COMMENT '历史客户规则版本快照',
  carrier_rate_id BIGINT UNSIGNED NOT NULL COMMENT '船司FBA价格ID',
  carrier_rate_version INT UNSIGNED NOT NULL COMMENT '船司价格版本快照',
-  rule_code VARCHAR(50) NOT NULL COMMENT '客户规则编码快照',
+  price_book_version_id BIGINT UNSIGNED NULL COMMENT '整表价格版本ID快照',
+  rule_code VARCHAR(50) NULL COMMENT '历史客户规则编码快照',
  customer_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID快照',
  customer_name VARCHAR(128) NOT NULL COMMENT '客户名称快照',
  business_type VARCHAR(32) NOT NULL COMMENT '业务类型快照',
-  tax_mode VARCHAR(24) NULL COMMENT '包税模式快照',
-  rounding_scale TINYINT UNSIGNED NOT NULL COMMENT '计费量保留位数快照',
-  rounding_mode VARCHAR(24) NOT NULL COMMENT '舍入方式快照',
-  rule_effective_from DATETIME(3) NOT NULL COMMENT '客户规则生效开始快照',
+  tax_mode VARCHAR(24) NULL COMMENT '订单买单或退税模式快照',
+  pricing_tax_mode VARCHAR(16) NULL COMMENT '报价包税维度快照',
+  rounding_scale TINYINT UNSIGNED NULL COMMENT '历史客户规则计费量保留位数快照',
+  rounding_mode VARCHAR(24) NULL COMMENT '历史客户规则舍入方式快照',
+  rule_effective_from DATETIME(3) NULL COMMENT '历史客户规则生效开始快照',
  rule_effective_to DATETIME(3) NULL COMMENT '客户规则生效结束快照',
  rate_code VARCHAR(50) NOT NULL COMMENT '船司价格编码快照',
  origin_warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '起运仓ID快照',
  origin_warehouse_name VARCHAR(128) NOT NULL COMMENT '起运仓名称快照',
  channel_code VARCHAR(64) NOT NULL COMMENT '渠道编码快照',
-  carrier_id BIGINT UNSIGNED NOT NULL COMMENT '船司ID快照',
-  carrier_name VARCHAR(128) NOT NULL COMMENT '船司名称快照',
-  destination_code VARCHAR(32) NOT NULL COMMENT 'FBA仓编码快照',
+  carrier_id BIGINT UNSIGNED NULL COMMENT '历史承运商ID；渠道价格可为空',
+  carrier_name VARCHAR(128) NULL COMMENT '历史承运商名称；渠道价格可为空',
+  destination_type VARCHAR(16) NULL COMMENT '目的地类型快照：FBA或OVERSEAS',
+  destination_warehouse_id BIGINT UNSIGNED NULL COMMENT '海外仓或FBA目的仓ID快照',
+  destination_name VARCHAR(128) NULL COMMENT '目的仓名称快照',
+  destination_code VARCHAR(32) NULL COMMENT 'FBA仓编码快照；海外仓可为空',
  rate_effective_from DATETIME(3) NOT NULL COMMENT '价格生效开始快照',
  rate_effective_to DATETIME(3) NULL COMMENT '价格生效结束快照',
-  charge_mode VARCHAR(16) NOT NULL COMMENT '计费口径：KG或CBM',
-  conversion_factor DECIMAL(18,6) NOT NULL COMMENT '使用的换算系数快照',
+  charge_mode VARCHAR(16) NULL COMMENT '计费口径：KG或CBM',
+  conversion_factor DECIMAL(18,6) NULL COMMENT '历史客户规则使用的换算系数快照',
  actual_weight_kg DECIMAL(18,3) NOT NULL COMMENT '试算时实际重量kg',
  actual_volume_cbm DECIMAL(18,4) NOT NULL COMMENT '试算时实际体积m3',
  converted_quantity DECIMAL(18,4) NOT NULL COMMENT '换算后的重量或体积',
@@ -538,3 +729,21 @@ CREATE TABLE IF NOT EXISTS fl_inbound_idempotency (
  UNIQUE KEY uk_inbound_idempotency (tenant_id, operation, operator_id, idempotency_key),
  KEY idx_inbound_idempotency_created (created_at)
 ) ENGINE=InnoDB COMMENT='第三方测量、审核、费用发送和入库写操作幂等记录';
+
+CREATE TABLE IF NOT EXISTS fl_customer_dimension_config (
+  id BIGINT UNSIGNED NOT NULL COMMENT '配置ID',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户隔离ID',
+  edge_addition_cm DECIMAL(6,3) NOT NULL DEFAULT 2.000 COMMENT '每个尺寸方向的单侧加宽厘米数',
+  remark VARCHAR(500) NULL COMMENT '备注',
+  initialization_key VARCHAR(128) NOT NULL COMMENT '创建流程幂等键及补偿归属',
+  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除',
+  version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_customer_dimension_config_tenant (tenant_id),
+  CONSTRAINT chk_customer_dimension_edge_addition
+    CHECK (edge_addition_cm >= 0.001 AND edge_addition_cm <= 100.000)
+) ENGINE=InnoDB COMMENT='客户尺寸计算配置';