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

# Conflicts:
#	deploy/sql/README.md
#	deploy/sql/海外区域统一增量-MySQL8.sql

deploy/sql/海外区域统一增量-MySQL8.sql

@@ -850,7 +850,7 @@ CREATE TABLE ll_finance_fee_source (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='海外业务不可变费用来源版本；发布后经跨区事件进入Finance';
 
 -- V13 receiving coverage and pending changes; baseline only, no test data migration.
-CREATE TABLE IF NOT EXISTS ll_fba_receiving_agreement (
+CREATE TABLE ll_fba_receiving_agreement (
   agreement_key VARCHAR(64) NOT NULL COMMENT '收货预约独立业务键',
   version INT NOT NULL COMMENT '预约覆盖范围与确认资料版本',
   status VARCHAR(24) NOT NULL COMMENT '有效、取消或已替代状态',
@@ -861,7 +861,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_agreement (
   UNIQUE KEY uk_fba_receiving_confirmation (destination_key, confirmation_no)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='独立于送货批次的收货预约';
 
-CREATE TABLE IF NOT EXISTS ll_fba_receiving_member (
+CREATE TABLE ll_fba_receiving_member (
   agreement_key VARCHAR(64) NOT NULL COMMENT '所属收货预约业务键',
   batch_key VARCHAR(128) NOT NULL COMMENT '稳定送货批次键',
   customer_id VARCHAR(128) NOT NULL COMMENT '货物所属客户标识',
@@ -871,7 +871,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_member (
   KEY idx_fba_receiving_batch (batch_key,customer_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='收货预约当前覆盖关联及退出历史';
 
-CREATE TABLE IF NOT EXISTS ll_fba_receiving_change (
+CREATE TABLE ll_fba_receiving_change (
   change_key VARCHAR(64) NOT NULL COMMENT '客户预约变化业务键',
   version INT NOT NULL COMMENT '变化续办版本',
   status VARCHAR(24) NOT NULL COMMENT '待仓库确认、已应用或已撤回状态',
@@ -885,14 +885,14 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_change (
   KEY idx_fba_receiving_pending_batch (batch_key,status)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='保留原安排且阻止误发车的客户变化';
 
-CREATE TABLE IF NOT EXISTS ll_fba_receiving_revision (
+CREATE TABLE ll_fba_receiving_revision (
   agreement_key VARCHAR(64) NOT NULL COMMENT '收货预约业务键',
   version INT NOT NULL COMMENT '不可变覆盖与确认版本',
   snapshot_json LONGTEXT NOT NULL COMMENT '该版本完整客户覆盖、确认时段及回复依据',
   PRIMARY KEY (agreement_key,version)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='收货预约覆盖与确认不可变历史';
 
-CREATE TABLE IF NOT EXISTS ll_fba_receiving_plan (
+CREATE TABLE ll_fba_receiving_plan (
   batch_key VARCHAR(128) NOT NULL COMMENT '稳定送货批次键',
   customer_id VARCHAR(128) NOT NULL COMMENT '计划所属客户标识',
   snapshot_json LONGTEXT NOT NULL COMMENT '本客户未确认计划、目标窗口及业务时区，不含有效预约确认',
@@ -3348,7 +3348,7 @@ CREATE TABLE ll_warehouse_transfer_order (
   pickup_contact_phone varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '提货联系电话',
   package_count int NOT NULL COMMENT '箱数',
   delivery_method varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '入仓方式',
-  estimated_arrival_at datetime(3) NOT NULL COMMENT '预计入仓时间',
+  estimated_arrival_at datetime(3) NULL COMMENT '预计入仓时间，库存转运不填写',
   estimated_ship_at datetime(3) DEFAULT NULL COMMENT '预计发货时间',
   fba_shipment_no varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '可选FBA货件编号',
   tracking_no varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '物流跟踪号',
@@ -4614,4 +4614,12 @@ CREATE TABLE ll_appointment_work_history (
   KEY idx_appointment_work_history (work_item_key,occurred_at)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项历史与幂等命令';
 
-SELECT 'PASS' AS initialization_status, 'OVERSEAS' AS region, 213 AS initialized_tables;
+-- 海外业务短单号分配时钟。
+CREATE TABLE ll_compact_number_clock (
+  number_key VARCHAR(16) NOT NULL COMMENT '业务前缀和客户名称缩写',
+  last_second BIGINT NOT NULL COMMENT '最后分配的Unix逻辑秒',
+  PRIMARY KEY (number_key)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='海外业务短单号分配时钟';
+
+SELECT 'PASS' AS initialization_status, 'OVERSEAS' AS region, 214 AS initialized_tables;
+