提交

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchCandidatePageMapper.java

@@ -35,7 +35,7 @@ public interface DispatchCandidatePageMapper {
         }
         /** 在UNION前统一文本列，避免表字段、CAST及聚合结果采用不同collation而报1271；数值与时间保持原类型。 */
         private static String column(String field,String expression) {
-            return (TEXT_FIELDS.contains(field)?"CONVERT("+expression+" USING utf8mb4) COLLATE utf8mb4_unicode_ci":expression)+" AS "+field;
+            return (TEXT_FIELDS.contains(field)?"CONVERT("+expression+" USING utf8mb4) COLLATE utf8mb4_0900_ai_ci":expression)+" AS "+field;
         }
         /** 不同来源用同一组筛选和稳定行标识组合，排序前排除未选来源类型。 */
         private static String rows(boolean count) {

lastleg-service/src/main/java/com/baiyue/lastleg/exceptionorder/mapper/ExceptionWorkflowMapper.java

@@ -24,11 +24,14 @@ public interface ExceptionWorkflowMapper {
     @Select("""
         SELECT e.exception_no,p.vehicle_plate,e.customer_name,e.status,e.package_count,
           COALESCE((SELECT SUM(i.received_packages) FROM ll_exception_return_item i
-            WHERE i.exception_order_id=e.id AND i.customer_id=e.customer_id),0) received_packages,
+            WHERE i.exception_order_id=e.id
+              AND i.customer_id COLLATE utf8mb4_0900_ai_ci=e.customer_id COLLATE utf8mb4_0900_ai_ci),0) received_packages,
           r.order_no return_order_no
-        FROM ll_exception_order e JOIN ll_order r ON r.customer_id=e.customer_id
-          AND r.source_region='EXCEPTION_RETURN' AND r.source_inbound_id=CAST(e.id AS CHAR)
-        JOIN ll_delivery_order d ON d.id=e.delivery_order_id AND d.customer_id=e.customer_id
+        FROM ll_exception_order e JOIN ll_order r ON r.customer_id COLLATE utf8mb4_0900_ai_ci=e.customer_id COLLATE utf8mb4_0900_ai_ci
+          AND r.source_region='EXCEPTION_RETURN'
+          AND r.source_inbound_id=CAST(e.id AS CHAR CHARACTER SET utf8mb4) COLLATE utf8mb4_0900_ai_ci
+        JOIN ll_delivery_order d ON d.id=e.delivery_order_id
+          AND d.customer_id COLLATE utf8mb4_0900_ai_ci=e.customer_id COLLATE utf8mb4_0900_ai_ci
         LEFT JOIN ll_dispatch_order p ON p.id=d.dispatch_order_id
         WHERE e.overseas_warehouse_id=#{warehouse} AND e.status='PROCESSING'
           AND e.exception_type='RETURN' AND e.return_direction='OVERSEAS_WAREHOUSE'

lastleg-service/src/main/resources/db/appointment-receiving.sql

@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_agreement (
   snapshot_json LONGTEXT NOT NULL COMMENT '客户逐来源覆盖、确认时区及仓库依据快照',
   PRIMARY KEY (agreement_key),
   UNIQUE KEY uk_fba_receiving_confirmation (destination_key, confirmation_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='独立于送货批次的收货预约';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='独立于送货批次的收货预约';
 
 CREATE TABLE IF NOT EXISTS ll_fba_receiving_member (
   agreement_key VARCHAR(64) NOT NULL COMMENT '所属收货预约业务键',
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_member (
   PRIMARY KEY (agreement_key,batch_key,customer_id),
   UNIQUE KEY uk_fba_receiving_active_member (active_ref),
   KEY idx_fba_receiving_batch (batch_key,customer_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='收货预约当前覆盖关联及退出历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='收货预约当前覆盖关联及退出历史';
 
 CREATE TABLE IF NOT EXISTS ll_fba_receiving_change (
   change_key VARCHAR(64) NOT NULL COMMENT '客户预约变化业务键',
@@ -32,18 +32,18 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_change (
   PRIMARY KEY (change_key),
   UNIQUE KEY uk_fba_receiving_pending (active_ref),
   KEY idx_fba_receiving_pending_batch (batch_key,status)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='保留原安排且阻止误发车的客户变化';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='保留原安排且阻止误发车的客户变化';
 
 CREATE TABLE IF NOT EXISTS 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='收货预约覆盖与确认不可变历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='收货预约覆盖与确认不可变历史';
 
 CREATE TABLE IF NOT EXISTS ll_fba_receiving_plan (
   batch_key VARCHAR(128) NOT NULL COMMENT '稳定送货批次键',
   customer_id VARCHAR(128) NOT NULL COMMENT '计划所属客户标识',
   snapshot_json LONGTEXT NOT NULL COMMENT '本客户未确认计划、目标窗口及业务时区，不含有效预约确认',
   PRIMARY KEY (batch_key,customer_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='按批次及客户保存的未确认收货计划';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='按批次及客户保存的未确认收货计划';

lastleg-service/src/main/resources/db/appointment-work.sql

@@ -11,13 +11,13 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_appointment_allocation (
   PRIMARY KEY(dispatch_item_id,batch_key,source_key,destination_key),
   KEY idx_dispatch_appointment_batch(batch_key,customer_id),
   KEY idx_dispatch_appointment_dispatch(dispatch_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='排车实物与预约批次逐票分配，原执行域事实';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排车实物与预约批次逐票分配，原执行域事实';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_commitment (
   entity_key VARCHAR(160) NOT NULL COMMENT '原业务实体稳定键',
   state_json LONGTEXT NOT NULL COMMENT '原业务命令产生的只读语义影响基线，不是第二份可编辑计划',
   impact_version BIGINT NOT NULL DEFAULT 0 COMMENT '承诺影响单调递增版本',
   PRIMARY KEY (entity_key)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='工作事项承诺影响审计基线';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='工作事项承诺影响审计基线';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_guard (
   id INT NOT NULL COMMENT '工作事项协调锁，固定1',
   scan_cursor VARCHAR(128) NULL COMMENT '已开船来源同步游标',
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS ll_appointment_work_guard (
   synchronized_requirement_version BIGINT NOT NULL DEFAULT 0 COMMENT '完整扫描已消费需求版本',
   scan_requirement_version BIGINT NOT NULL DEFAULT 0 COMMENT '当前扫描需求版本，防跨页漂移',
   PRIMARY KEY (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项同步与命令串行守卫';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约工作事项同步与命令串行守卫';
 INSERT INTO ll_appointment_work_guard(id,initialized) SELECT 1,FALSE WHERE NOT EXISTS(SELECT 1 FROM ll_appointment_work_guard WHERE id=1);
 
 CREATE TABLE IF NOT EXISTS ll_appointment_work (
@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS ll_appointment_work (
   state_json LONGTEXT NOT NULL COMMENT '工作关系责任跟进及影响基线，不保存可编辑业务执行事实',
   PRIMARY KEY (work_item_key),
   KEY idx_appointment_work_container (container_booking_id,retired)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项需求与关系';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约工作事项需求与关系';
 
 CREATE TABLE IF NOT EXISTS ll_appointment_work_history (
   id VARCHAR(36) NOT NULL COMMENT '历史记录标识',
@@ -56,4 +56,4 @@ CREATE TABLE IF NOT EXISTS ll_appointment_work_history (
   PRIMARY KEY (id),
   UNIQUE KEY uk_appointment_work_command (work_item_key,command_key),
   KEY idx_appointment_work_history (work_item_key,occurred_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项历史与幂等命令';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约工作事项历史与幂等命令';

lastleg-service/src/main/resources/db/lastleg.sql

@@ -1,6 +1,6 @@
 SET NAMES utf8mb4;
 
-CREATE DATABASE IF NOT EXISTS baiyue_lastleg DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+CREATE DATABASE IF NOT EXISTS baiyue_lastleg DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
 USE baiyue_lastleg;
 
 CREATE TABLE IF NOT EXISTS ll_loading_event_inbox (
@@ -1179,7 +1179,7 @@ CREATE TABLE ll_fleet_external_booking (
   booking_no VARCHAR(32) NOT NULL COMMENT '外接预订业务编号',
   trip_id BIGINT NOT NULL COMMENT '所属车次',
   trip_no VARCHAR(32) NOT NULL COMMENT '车次业务编号',
-  customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '委托客户及付款归属',
+  customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '委托客户及付款归属',
   customer_code VARCHAR(64) NOT NULL COMMENT '客户编号快照',
   customer_name VARCHAR(255) NOT NULL COMMENT '客户名称快照',
   status VARCHAR(16) NOT NULL COMMENT 'DRAFT询价/CONFIRMED占位/RECEIVED确认实收/BOUND关联发运/CANCELLED取消',
@@ -1234,7 +1234,7 @@ CREATE TABLE ll_fleet_pool_order_link (
   id BIGINT NOT NULL COMMENT '内部主键',
   booking_id BIGINT NOT NULL COMMENT '唯一外接预订',
   booking_no VARCHAR(64) NOT NULL COMMENT '预订业务编号',
-  customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '商业客户隔离范围',
+  customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '商业客户隔离范围',
   business_type VARCHAR(32) NOT NULL COMMENT '本土散板或本土卡车商业类型',
   business_order_id BIGINT NOT NULL COMMENT '对应商业订单内部关联',
   business_order_no VARCHAR(64) NOT NULL COMMENT '本土商业订单业务编号',
@@ -1386,7 +1386,7 @@ CREATE TABLE ll_fleet_quote (
   UNIQUE KEY uk_fleet_quote_natural (natural_key),
   UNIQUE KEY uk_fleet_quote_create (created_by,create_key),
   KEY idx_fleet_quote_search (kind,status,valid_from,valid_to)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='车辆采购与外接销售报价';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='车辆采购与外接销售报价';
 
 CREATE TABLE ll_fleet_quote_history (
   id BIGINT PRIMARY KEY COMMENT '报价历史主键',
@@ -1397,7 +1397,7 @@ CREATE TABLE ll_fleet_quote_history (
   occurred_at DATETIME(3) NOT NULL COMMENT '操作时间UTC',
   snapshot_json JSON NOT NULL COMMENT '报价完整版本快照',
   UNIQUE KEY uk_fleet_quote_history_version (quote_id,record_version)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='车辆报价不可变版本历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='车辆报价不可变版本历史';
 
 CREATE TABLE ll_fleet_trip_cost (
   id BIGINT NOT NULL COMMENT '内部主键',
@@ -1662,7 +1662,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_agreement (
   snapshot_json LONGTEXT NOT NULL COMMENT '客户逐来源覆盖、确认时区及仓库依据快照',
   PRIMARY KEY (agreement_key),
   UNIQUE KEY uk_fba_receiving_confirmation (destination_key, confirmation_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='独立于送货批次的收货预约';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='独立于送货批次的收货预约';
 
 CREATE TABLE IF NOT EXISTS ll_fba_receiving_member (
   agreement_key VARCHAR(64) NOT NULL COMMENT '所属收货预约业务键',
@@ -1672,7 +1672,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_member (
   PRIMARY KEY (agreement_key,batch_key,customer_id),
   UNIQUE KEY uk_fba_receiving_active_member (active_ref),
   KEY idx_fba_receiving_batch (batch_key,customer_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='收货预约当前覆盖关联及退出历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='收货预约当前覆盖关联及退出历史';
 
 CREATE TABLE IF NOT EXISTS ll_fba_receiving_change (
   change_key VARCHAR(64) NOT NULL COMMENT '客户预约变化业务键',
@@ -1686,21 +1686,21 @@ CREATE TABLE IF NOT EXISTS ll_fba_receiving_change (
   PRIMARY KEY (change_key),
   UNIQUE KEY uk_fba_receiving_pending (active_ref),
   KEY idx_fba_receiving_pending_batch (batch_key,status)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='保留原安排且阻止误发车的客户变化';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='保留原安排且阻止误发车的客户变化';
 
 CREATE TABLE IF NOT EXISTS 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='收货预约覆盖与确认不可变历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='收货预约覆盖与确认不可变历史';
 
 CREATE TABLE IF NOT EXISTS ll_fba_receiving_plan (
   batch_key VARCHAR(128) NOT NULL COMMENT '稳定送货批次键',
   customer_id VARCHAR(128) NOT NULL COMMENT '计划所属客户标识',
   snapshot_json LONGTEXT NOT NULL COMMENT '本客户未确认计划、目标窗口及业务时区，不含有效预约确认',
   PRIMARY KEY (batch_key,customer_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='按批次及客户保存的未确认收货计划';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='按批次及客户保存的未确认收货计划';
 
 
 CREATE TABLE IF NOT EXISTS ll_inbound_fba_appointment (
@@ -1731,7 +1731,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_fba_appointment (
   UNIQUE KEY uk_ll_fba_appointment_no (appointment_no),
   KEY idx_ll_fba_appointment_list (appointment_at,appointment_status,fba_warehouse_code),
   KEY idx_ll_fba_appointment_planned (planned_at,appointment_status)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='FBA预约安排与正式确认唯一主记录';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='FBA预约安排与正式确认唯一主记录';
 
 CREATE TABLE IF NOT EXISTS ll_inbound_fba_appointment_item (
   id BIGINT NOT NULL COMMENT '记录主键',
@@ -1753,7 +1753,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_fba_appointment_item (
   KEY idx_ll_fba_active_order (customer_id,order_id,active),
   KEY idx_ll_fba_item_source_lookup (source_key,customer_id),
   KEY idx_ll_fba_item_customer_order (customer_id,order_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='入仓前后共用的预约真实货源';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='入仓前后共用的预约真实货源';
 
 CREATE TABLE IF NOT EXISTS ll_appointment_cargo_verification (
   id BIGINT NOT NULL COMMENT '核实记录主键',
@@ -1776,7 +1776,7 @@ CREATE TABLE IF NOT EXISTS ll_appointment_cargo_verification (
   UNIQUE KEY uk_ll_cargo_verification_command (customer_id,source_key,command_key),
   CONSTRAINT chk_ll_cargo_verification_quantity CHECK (package_count IS NULL OR package_count > 0),
   CONSTRAINT chk_ll_cargo_verification_version CHECK (version > 0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约货物核实资料及不可覆盖的版本历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约货物核实资料及不可覆盖的版本历史';
 
 CREATE TABLE IF NOT EXISTS ll_fba_appointment_command (
   command_key VARCHAR(128) NOT NULL COMMENT '持久化幂等键',
@@ -1788,7 +1788,7 @@ CREATE TABLE IF NOT EXISTS ll_fba_appointment_command (
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建UTC时间',
   PRIMARY KEY(command_key),
   KEY idx_ll_fba_command_appointment(appointment_no,created_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约命令与变更历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约命令与变更历史';
 
 ALTER TABLE ll_loading_order_status_history
   MODIFY COLUMN id BIGINT NOT NULL AUTO_INCREMENT COMMENT '状态历史主键',
@@ -1939,7 +1939,7 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_order (
   UNIQUE KEY uk_dispatch_trip (trip_id),
   KEY idx_ll_dispatch_order_list (overseas_warehouse_id,status,stage,created_at,id),
   KEY idx_ll_dispatch_order_vehicle (vehicle_plate,status,created_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='平台整车排车作业主单，客户归属在真实明细';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='平台整车排车作业主单，客户归属在真实明细';
 
 CREATE TABLE IF NOT EXISTS ll_dispatch_history (
   id BIGINT NOT NULL COMMENT '排车历史内部主键',
@@ -1952,7 +1952,7 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_history (
   occurred_at DATETIME(3) NOT NULL COMMENT '真实操作发生时间',
   PRIMARY KEY (id),
   KEY idx_dispatch_history_version (dispatch_id,record_version,id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='整车排车版本与审核轮次的追加历史';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='整车排车版本与审核轮次的追加历史';
 
 CREATE TABLE IF NOT EXISTS ll_dispatch_item (
   customer_name VARCHAR(255) NULL COMMENT '本条真实客户名称快照',
@@ -2194,7 +2194,7 @@ CREATE TABLE ll_return_stock_receipt (
   KEY idx_return_stock_receipt_order(customer_id,order_id),
   KEY idx_return_stock_receipt_position(customer_id,inventory_balance_id,inventory_position_id),
   CONSTRAINT chk_return_stock_receipt_packages CHECK(received_packages>0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='真实退回入仓及再次发运来源凭据';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='真实退回入仓及再次发运来源凭据';
 
 CREATE TABLE IF NOT EXISTS ll_dispatch_pda_pick_order (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID', pick_id BIGINT NOT NULL COMMENT 'PDA拣货记录ID',
@@ -2245,7 +2245,7 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_command (
   PRIMARY KEY (id),
   UNIQUE KEY uk_dispatch_command_key (idempotency_key),
   KEY idx_dispatch_command_history (dispatch_id,created_at,id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='整车排车公共持久命令账本';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='整车排车公共持久命令账本';
 
 CREATE TABLE IF NOT EXISTS ll_dispatch_delivery_arrangement (
   id BIGINT NOT NULL COMMENT '安排事实内部主键',
@@ -2264,7 +2264,7 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_delivery_arrangement (
   UNIQUE KEY uk_dispatch_arrangement_dispatch (dispatch_order_id),
   UNIQUE KEY uk_dispatch_arrangement_key (arrangement_key),
   UNIQUE KEY uk_dispatch_arrangement_command (original_command_key)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='整车排车唯一派送安排事实';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='整车排车唯一派送安排事实';
 
 CREATE TABLE IF NOT EXISTS ll_delivery_facts_changed (
   id BIGINT NOT NULL COMMENT '持久信号内部主键',
@@ -2285,7 +2285,7 @@ CREATE TABLE IF NOT EXISTS ll_delivery_facts_changed (
   UNIQUE KEY uk_delivery_fact_version (customer_id,delivery_id,delivery_version),
   KEY idx_delivery_fact_due (state,next_attempt_at,id),
   KEY idx_delivery_fact_dispatch (dispatch_id,state,id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='正常签收事实变化的本地持久待汇总信号';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='正常签收事实变化的本地持久待汇总信号';
 
 CREATE TABLE IF NOT EXISTS ll_outbound_pallet_item (
   dispatch_item_id BIGINT NULL COMMENT '本次整车排车作业明细ID',
@@ -2601,7 +2601,7 @@ CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_receipt_command (
   UNIQUE KEY uk_ll_wh_receipt_cmd_key (customer_id, idempotency_key),
   KEY idx_ll_wh_receipt_cmd_target (customer_id, transfer_order_id, target_pallet_id),
   CONSTRAINT ck_ll_wh_receipt_cmd_status CHECK (status IN ('PREPARED','RESERVED','COMPLETED'))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='转运逐来源收货原请求与共享目标资源占用命令';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='转运逐来源收货原请求与共享目标资源占用命令';
 
 -- Customer relabel application: header, item snapshots, and immutable process history.
 CREATE TABLE IF NOT EXISTS ll_relabel_application (
@@ -3140,24 +3140,24 @@ CREATE TABLE IF NOT EXISTS ll_exception_return_item (
 
 CREATE TABLE IF NOT EXISTS ll_return_carton_stock_receipt (
   id BIGINT NOT NULL COMMENT '原箱回仓凭据明细标识',
-  customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户数据隔离键',
-  receipt_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原箱回仓实收业务号',
+  customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '客户数据隔离键',
+  receipt_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '原箱回仓实收业务号',
   exception_order_id BIGINT NOT NULL COMMENT '本次异常退回订单',
   exception_return_item_id BIGINT NOT NULL COMMENT '本次冻结的原箱来源明细',
   delivery_order_id BIGINT NOT NULL COMMENT '原运输派送单',
   source_pick_id BIGINT NOT NULL COMMENT '原箱实际出库拣货凭据',
-  source_outbound_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原出库单业务号',
+  source_outbound_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '原出库单业务号',
   source_dispatch_item_id BIGINT NOT NULL COMMENT '原排车货物明细',
   source_outbound_pallet_item_id BIGINT NOT NULL COMMENT '原出库托盘明细',
   return_carton_id BIGINT NOT NULL COMMENT '真实退货原箱标识',
-  carton_mark VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原箱业务箱码快照',
-  overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '实际回仓海外仓标识',
+  carton_mark VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '原箱业务箱码快照',
+  overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '实际回仓海外仓标识',
   target_pallet_id BIGINT NOT NULL COMMENT '实际回仓目标实物托盘',
-  target_pallet_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '实际目标托盘业务码',
+  target_pallet_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '实际目标托盘业务码',
   target_location_id BIGINT NOT NULL COMMENT '实际回仓目标库位',
-  target_location_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '实际目标库位业务码',
-  sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原出库快照中的商品编码',
-  product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '原出库快照中的中文品名',
+  target_location_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '实际目标库位业务码',
+  sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '原出库快照中的商品编码',
+  product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '原出库快照中的中文品名',
   quantity BIGINT NOT NULL COMMENT '本次原SKU实际恢复件数',
   packages BIGINT NOT NULL COMMENT '本箱仅首条SKU记录计一箱其余为零',
   evidence_file_ids_json JSON NOT NULL COMMENT '本次实收证据文件引用',
@@ -3251,9 +3251,9 @@ CREATE TABLE IF NOT EXISTS ll_destuff_pallet_cost_allocation (
 -- 客户退货预报、PDA 签收与仓储费起算批次
 CREATE TABLE IF NOT EXISTS ll_return_order (
  -- need_relabel is added below for existing deployments
- id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户ID和隔离键', return_no VARCHAR(128) NOT NULL COMMENT '退货订单号', overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '操作海外仓ID', warehouse_contact_name VARCHAR(128) NULL COMMENT '中转仓联系人快照', warehouse_contact_phone VARCHAR(64) NULL COMMENT '中转仓联系电话快照', customer_reference_no VARCHAR(128) NULL COMMENT '客户参考号', lastleg_order_id BIGINT NULL COMMENT '尾程订单ID', lastleg_order_no VARCHAR(32) NULL COMMENT '尾程订单号', status VARCHAR(32) NOT NULL COMMENT 'PENDING_RECEIPT、PARTIALLY_RECEIVED或COMPLETED', expected_sku_types INT NOT NULL COMMENT '预报SKU种类数', expected_quantity BIGINT NOT NULL COMMENT '预报总数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '累计实收总数量', remark VARCHAR(1000) NULL COMMENT '客户备注', idempotency_key VARCHAR(255) NOT NULL COMMENT '创建幂等键', request_hash CHAR(64) NOT NULL COMMENT '创建请求SHA-256', created_by VARCHAR(128) NULL COMMENT '创建操作人ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '客户ID和隔离键', return_no VARCHAR(128) NOT NULL COMMENT '退货订单号', overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '操作海外仓ID', warehouse_contact_name VARCHAR(128) NULL COMMENT '中转仓联系人快照', warehouse_contact_phone VARCHAR(64) NULL COMMENT '中转仓联系电话快照', customer_reference_no VARCHAR(128) NULL COMMENT '客户参考号', lastleg_order_id BIGINT NULL COMMENT '尾程订单ID', lastleg_order_no VARCHAR(32) NULL COMMENT '尾程订单号', status VARCHAR(32) NOT NULL COMMENT 'PENDING_RECEIPT、PARTIALLY_RECEIVED或COMPLETED', expected_sku_types INT NOT NULL COMMENT '预报SKU种类数', expected_quantity BIGINT NOT NULL COMMENT '预报总数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '累计实收总数量', remark VARCHAR(1000) NULL COMMENT '客户备注', idempotency_key VARCHAR(255) NOT NULL COMMENT '创建幂等键', request_hash CHAR(64) NOT NULL COMMENT '创建请求SHA-256', created_by VARCHAR(128) NULL COMMENT '创建操作人ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_order_customer_no(customer_id,return_no), UNIQUE KEY uk_ll_return_order_customer_key(customer_id,idempotency_key), KEY idx_ll_return_order_warehouse_status(overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_order_quantity CHECK(expected_sku_types>0 AND expected_quantity>0 AND received_quantity>=0 AND received_quantity<=expected_quantity)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='客户退货订单及SKU实收汇总';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='客户退货订单及SKU实收汇总';
 SET @ll_return_order_need_relabel = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='need_relabel'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN need_relabel TINYINT(1) NOT NULL DEFAULT 0 COMMENT ''是否需要换标'' AFTER customer_reference_no')); PREPARE stmt FROM @ll_return_order_need_relabel; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='lastleg_order_id'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN lastleg_order_id BIGINT NULL COMMENT ''尾程订单ID'' AFTER customer_reference_no')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='lastleg_order_no'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN lastleg_order_no VARCHAR(32) NULL COMMENT ''尾程订单号'' AFTER lastleg_order_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
@@ -3263,14 +3263,14 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='relabel_no'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN relabel_no VARCHAR(64) NULL COMMENT ''绑定换标单号'' AFTER relabel_application_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='relabel_status'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN relabel_status VARCHAR(32) NULL COMMENT ''换标状态'' AFTER relabel_no')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 CREATE TABLE IF NOT EXISTS ll_return_order_item (
- id BIGINT NOT NULL COMMENT '退货预报明细ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '中文品名', expected_quantity BIGINT NOT NULL COMMENT 'SKU预报数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT 'SKU累计实收数量', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ id BIGINT NOT NULL COMMENT '退货预报明细ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '中文品名', expected_quantity BIGINT NOT NULL COMMENT 'SKU预报数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT 'SKU累计实收数量', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_item_order_sku(return_order_id,sku_code), KEY idx_ll_return_item_sku(sku_code,received_quantity), CONSTRAINT chk_ll_return_item_quantity CHECK(expected_quantity>0 AND received_quantity>=0 AND received_quantity<=expected_quantity)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='客户退货订单的SKU预报与实收明细';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='客户退货订单的SKU预报与实收明细';
 CREATE TABLE IF NOT EXISTS ll_return_receipt (
  original_packaging TINYINT(1) NULL COMMENT '是否使用原箱原包装', measurement_source VARCHAR(32) NULL COMMENT '尺寸重量来源',
- id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', receipt_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '签收单号', receipt_batch_no VARCHAR(128) NOT NULL COMMENT '签收批次号', tracking_no VARCHAR(128) NULL COMMENT '本次签收包裹的可选快递单号', bound_by VARCHAR(16) NOT NULL COMMENT '开始签收方式，RETURN_NO退货单号或SKU候选', status VARCHAR(32) NOT NULL COMMENT '签收状态，当前SIGNED', received_quantity BIGINT NOT NULL COMMENT '本次实收数量', operator_id VARCHAR(128) NOT NULL COMMENT 'PDA操作人ID', operator_name VARCHAR(128) NULL COMMENT 'PDA操作人名称', idempotency_key VARCHAR(255) NOT NULL COMMENT 'PDA确认幂等键', request_hash CHAR(64) NOT NULL COMMENT 'PDA确认请求SHA-256', signed_at DATETIME(3) NOT NULL COMMENT '签收时间', created_at DATETIME(3) NOT NULL COMMENT '创建时间',
+ id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', receipt_no VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '签收单号', receipt_batch_no VARCHAR(128) NOT NULL COMMENT '签收批次号', tracking_no VARCHAR(128) NULL COMMENT '本次签收包裹的可选快递单号', bound_by VARCHAR(16) NOT NULL COMMENT '开始签收方式，RETURN_NO退货单号或SKU候选', status VARCHAR(32) NOT NULL COMMENT '签收状态，当前SIGNED', received_quantity BIGINT NOT NULL COMMENT '本次实收数量', operator_id VARCHAR(128) NOT NULL COMMENT 'PDA操作人ID', operator_name VARCHAR(128) NULL COMMENT 'PDA操作人名称', idempotency_key VARCHAR(255) NOT NULL COMMENT 'PDA确认幂等键', request_hash CHAR(64) NOT NULL COMMENT 'PDA确认请求SHA-256', signed_at DATETIME(3) NOT NULL COMMENT '签收时间', created_at DATETIME(3) NOT NULL COMMENT '创建时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_receipt_no(receipt_no), UNIQUE KEY uk_ll_return_receipt_batch(receipt_batch_no), UNIQUE KEY uk_ll_return_receipt_operator_key(operator_id,idempotency_key), KEY idx_ll_return_receipt_order(return_order_id,signed_at), CONSTRAINT chk_ll_return_receipt_quantity CHECK(received_quantity>0), CONSTRAINT chk_ll_return_receipt_bound CHECK(bound_by IN('RETURN_NO','SKU'))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='PDA退货实收签收事实';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='PDA退货实收签收事实';
 
 -- 已创建开发库升级为“客户只预报 SKU，快递单号仅属于签收批次”的最终模型。
 SET @ll_return_item_drop_tracking_order_sku = (SELECT IF(COUNT(*) > 0, 'ALTER TABLE ll_return_order_item DROP INDEX uk_ll_return_item_order_tracking_sku', 'SELECT 1') FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND index_name='uk_ll_return_item_order_tracking_sku');
@@ -3313,9 +3313,9 @@ PREPARE ll_return_receipt_add_measurement_facts_stmt FROM @ll_return_receipt_add
 SET @ll_return_receipt_add_measurement_facts = (SELECT IF(COUNT(*)=0, 'ALTER TABLE ll_return_receipt ADD COLUMN measurement_source VARCHAR(32) NULL COMMENT ''尺寸重量来源'' AFTER original_packaging', 'SELECT 1') FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_receipt' AND column_name='measurement_source');
 PREPARE ll_return_receipt_add_measurement_facts_stmt FROM @ll_return_receipt_add_measurement_facts; EXECUTE ll_return_receipt_add_measurement_facts_stmt; DEALLOCATE PREPARE ll_return_receipt_add_measurement_facts_stmt;
 CREATE TABLE IF NOT EXISTS ll_return_receipt_item (
- id BIGINT NOT NULL COMMENT '签收SKU明细ID', receipt_id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_item_id BIGINT NOT NULL COMMENT '退货预报明细ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SKU编码', received_quantity BIGINT NOT NULL COMMENT '本次SKU实收数量',
+ id BIGINT NOT NULL COMMENT '签收SKU明细ID', receipt_id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_item_id BIGINT NOT NULL COMMENT '退货预报明细ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'SKU编码', received_quantity BIGINT NOT NULL COMMENT '本次SKU实收数量',
  PRIMARY KEY(id), KEY idx_ll_return_receipt_item_receipt(receipt_id), KEY idx_ll_return_receipt_item_order_item(return_order_item_id), CONSTRAINT chk_ll_return_receipt_item_quantity CHECK(received_quantity>0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='PDA退货签收SKU实际数量明细';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='PDA退货签收SKU实际数量明细';
 CREATE TABLE IF NOT EXISTS ll_return_receipt_batch (
  id BIGINT NOT NULL COMMENT '退货仓储计费批次ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', receipt_id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', batch_no VARCHAR(128) NOT NULL COMMENT '签收批次号', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '操作海外仓ID', storage_billing_status VARCHAR(32) NOT NULL COMMENT '仓储计费状态，初始PENDING_PRICING', storage_started_at DATETIME(3) NOT NULL COMMENT '仓储计费起算时间', created_at DATETIME(3) NOT NULL COMMENT '创建时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_batch_no(batch_no), UNIQUE KEY uk_ll_return_batch_receipt(receipt_id), KEY idx_ll_return_batch_billing(customer_id,overseas_warehouse_id,storage_billing_status,storage_started_at)
@@ -3327,9 +3327,9 @@ PREPARE return_receipt_carton_mark_stmt FROM @ddl; EXECUTE return_receipt_carton
 CREATE TABLE IF NOT EXISTS ll_return_inventory_carton (
  original_packaging TINYINT(1) NULL COMMENT '是否使用原箱原包装',
  new_carton_mark VARCHAR(255) NULL COMMENT '换标后新箱唛',
- id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '海外仓ID', source_receipt_id BIGINT NULL COMMENT '来源PDA签收单ID', source_batch_no VARCHAR(128) NULL COMMENT '来源签收批次号', carton_mark VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '退货箱号和箱唛编码', status VARCHAR(32) NOT NULL COMMENT 'AVAILABLE可用或MERGED已合箱', sku_types INT NOT NULL COMMENT '箱内SKU种类数', total_quantity BIGINT NOT NULL COMMENT '箱内总件数', length DECIMAL(12,3) NULL COMMENT '箱长CM', width DECIMAL(12,3) NULL COMMENT '箱宽CM', height DECIMAL(12,3) NULL COMMENT '箱高CM', weight DECIMAL(12,3) NULL COMMENT '箱重KG', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间', merged_at DATETIME(3) NULL COMMENT '合箱完成时间',
+ id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '海外仓ID', source_receipt_id BIGINT NULL COMMENT '来源PDA签收单ID', source_batch_no VARCHAR(128) NULL COMMENT '来源签收批次号', carton_mark VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '退货箱号和箱唛编码', status VARCHAR(32) NOT NULL COMMENT 'AVAILABLE可用或MERGED已合箱', sku_types INT NOT NULL COMMENT '箱内SKU种类数', total_quantity BIGINT NOT NULL COMMENT '箱内总件数', length DECIMAL(12,3) NULL COMMENT '箱长CM', width DECIMAL(12,3) NULL COMMENT '箱宽CM', height DECIMAL(12,3) NULL COMMENT '箱高CM', weight DECIMAL(12,3) NULL COMMENT '箱重KG', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间', merged_at DATETIME(3) NULL COMMENT '合箱完成时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_mark(carton_mark), UNIQUE KEY uk_ll_return_inventory_carton_receipt(source_receipt_id), KEY idx_ll_return_inventory_carton_customer(customer_id,overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED','DISCARD_PENDING') AND sku_types>0 AND total_quantity>0) OR (status IN('MERGED','DISCARDED') AND sku_types=0 AND total_quantity=0)), CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED','DISCARD_PENDING','DISCARDED'))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='退货实物库存箱及箱唛';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='退货实物库存箱及箱唛';
 SET @ll_return_carton_add_pallet = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='pallet_code'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN pallet_code VARCHAR(128) NULL COMMENT ''签收时绑定的托盘码'' AFTER source_batch_no'));
 PREPARE ll_return_carton_add_pallet_stmt FROM @ll_return_carton_add_pallet; EXECUTE ll_return_carton_add_pallet_stmt; DEALLOCATE PREPARE ll_return_carton_add_pallet_stmt;
 SET @ll_return_carton_add_original_packaging = (SELECT IF(COUNT(*)=0, 'ALTER TABLE ll_return_inventory_carton ADD COLUMN original_packaging TINYINT(1) NULL COMMENT ''是否使用原箱原包装'' AFTER weight', 'SELECT 1') FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='original_packaging');
@@ -3352,20 +3352,20 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='relabel_status'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN relabel_status VARCHAR(32) NULL COMMENT ''换标状态'' AFTER relabel_no')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='relabel_completed_at'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN relabel_completed_at DATETIME(3) NULL COMMENT ''换标完成时间'' AFTER relabel_status')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 CREATE TABLE IF NOT EXISTS ll_return_inventory_carton_item (
- id BIGINT NOT NULL COMMENT '退货库存箱SKU明细ID', carton_id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '中文品名', quantity BIGINT NOT NULL COMMENT '该SKU箱内数量',
+ id BIGINT NOT NULL COMMENT '退货库存箱SKU明细ID', carton_id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '中文品名', quantity BIGINT NOT NULL COMMENT '该SKU箱内数量',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_item(carton_id,sku_code), KEY idx_ll_return_inventory_carton_item_customer(customer_id,sku_code), CONSTRAINT chk_ll_return_inventory_carton_item_quantity CHECK(quantity>=0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='退货库存箱内SKU和数量';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='退货库存箱内SKU和数量';
 -- 退货出库按SKU固化扣减前后快照，与PDA拣货同事务提交；不修改历史箱内容。
 CREATE TABLE IF NOT EXISTS ll_return_inventory_outbound_movement (
  id BIGINT NOT NULL COMMENT '退货出库SKU流水ID',
  outbound_pick_id BIGINT NOT NULL COMMENT '同事务PDA出库拣货记录ID',
- customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '库存所属客户ID和隔离键',
- overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '实际出库海外仓ID',
+ customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '库存所属客户ID和隔离键',
+ overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '实际出库海外仓ID',
  carton_id BIGINT NOT NULL COMMENT '真实退货库存箱ID',
  carton_mark VARCHAR(128) NOT NULL COMMENT '冻结的真实退货箱业务码',
- outbound_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '本次退货出库业务单号',
- sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '本次出库SKU编码快照',
- product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '中文品名快照',
+ outbound_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '本次退货出库业务单号',
+ sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '本次出库SKU编码快照',
+ product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '中文品名快照',
  quantity BIGINT NOT NULL COMMENT '本箱该SKU实际出库件数，始终为正',
  total_before BIGINT NOT NULL COMMENT '客户仓SKU出库前实物总数量',
  total_after BIGINT NOT NULL COMMENT '客户仓SKU出库后实物总数量',
@@ -3381,7 +3381,7 @@ CREATE TABLE IF NOT EXISTS ll_return_inventory_outbound_movement (
  CONSTRAINT chk_ll_return_outbound_movement_delta CHECK(quantity>0 AND total_after>=0 AND available_after>=0
    AND total_before-total_after=quantity AND available_before-available_after=quantity
    AND cartons_after>=0 AND cartons_before-cartons_after IN (0,1) AND total_after>=available_after)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='不可变退货出库SKU库存流水';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='不可变退货出库SKU库存流水';
 
 CREATE TABLE IF NOT EXISTS ll_return_inventory_balance (
  id BIGINT NOT NULL COMMENT '退货库存余额ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '海外仓ID', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) NULL COMMENT '中文品名', total_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '实物总库存，仅实际出库扣减', available_quantity BIGINT NOT NULL COMMENT '未合箱可用上架数量', carton_quantity BIGINT NOT NULL COMMENT '包含该SKU的可用箱数', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
@@ -3679,17 +3679,17 @@ SET @return_sku_ddl = (SELECT IF(EXISTS(SELECT 1 FROM information_schema.columns
 PREPARE return_sku_stmt FROM @return_sku_ddl; EXECUTE return_sku_stmt; DEALLOCATE PREPARE return_sku_stmt;
 CREATE TABLE IF NOT EXISTS ll_return_sku_conversion (
  id BIGINT NOT NULL COMMENT 'SKU库存转换记录ID',
- customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户隔离键',
- overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '操作海外仓ID',
+ customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '客户隔离键',
+ overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '操作海外仓ID',
  application_id BIGINT NOT NULL COMMENT '换标申请ID',
- relabel_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标单号',
+ relabel_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '换标单号',
  item_id BIGINT NOT NULL COMMENT '换标箱级明细ID',
  round_key VARCHAR(64) NOT NULL COMMENT '作业轮次，退回重做使用新轮次',
  carton_id BIGINT NOT NULL COMMENT '实物来源包裹或箱ID',
  carton_mark VARCHAR(128) NOT NULL COMMENT '完工时仓库识别码',
- old_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标前SKU',
- new_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标后SKU',
- product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '中文品名快照',
+ old_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '换标前SKU',
+ new_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '换标后SKU',
+ product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '中文品名快照',
  quantity BIGINT NOT NULL COMMENT '实际完成转换件数',
  status VARCHAR(32) NOT NULL COMMENT 'APPLIED待客户确认/CONFIRMED已确认/REVERSED退回冲回',
  ownership_json LONGTEXT NOT NULL COMMENT '本次转换件数的来源退货单快照，供精确冲回',
@@ -3702,7 +3702,7 @@ CREATE TABLE IF NOT EXISTS ll_return_sku_conversion (
  KEY idx_return_sku_conversion_app(customer_id,application_id,status),
  KEY idx_return_sku_conversion_carton(customer_id,carton_id),
  CONSTRAINT chk_return_sku_conversion_quantity CHECK(quantity>0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='退货实物SKU换标库存转换和冲回记录';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='退货实物SKU换标库存转换和冲回记录';
 
 
 -- 平台自营领星统计：独立事实与不可变发布版本；仅空库初始化，不自动执行。
@@ -4042,7 +4042,7 @@ CREATE TABLE IF NOT EXISTS ll_cargo_discard_photo (
   PRIMARY KEY (id),
   UNIQUE KEY uk_cargo_discard_photo_file (file_id),
   KEY idx_cargo_discard_photo_application (customer_id, application_id, pallet_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='海外PDA货物废弃照片凭证';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='海外PDA货物废弃照片凭证';
 
 CREATE TABLE ll_selfop_owner (
   id BIGINT NOT NULL COMMENT '主键',
@@ -4212,13 +4212,13 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_appointment_allocation (
   PRIMARY KEY(dispatch_item_id,batch_key,source_key,destination_key),
   KEY idx_dispatch_appointment_batch(batch_key,customer_id),
   KEY idx_dispatch_appointment_dispatch(dispatch_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='排车实物与预约批次逐票分配，原执行域事实';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排车实物与预约批次逐票分配，原执行域事实';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_commitment (
   entity_key VARCHAR(160) NOT NULL COMMENT '原业务实体稳定键',
   state_json LONGTEXT NOT NULL COMMENT '原业务命令产生的只读语义影响基线，不是第二份可编辑计划',
   impact_version BIGINT NOT NULL DEFAULT 0 COMMENT '承诺影响单调递增版本',
   PRIMARY KEY (entity_key)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='工作事项承诺影响审计基线';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='工作事项承诺影响审计基线';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_guard (
   id INT NOT NULL COMMENT '工作事项协调锁，固定1',
   scan_cursor VARCHAR(128) NULL COMMENT '已开船来源同步游标',
@@ -4230,7 +4230,7 @@ CREATE TABLE IF NOT EXISTS ll_appointment_work_guard (
   synchronized_requirement_version BIGINT NOT NULL DEFAULT 0 COMMENT '完整扫描已消费需求版本',
   scan_requirement_version BIGINT NOT NULL DEFAULT 0 COMMENT '当前扫描需求版本，防跨页漂移',
   PRIMARY KEY (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项同步与命令串行守卫';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约工作事项同步与命令串行守卫';
 INSERT INTO ll_appointment_work_guard(id,initialized) SELECT 1,FALSE WHERE NOT EXISTS(SELECT 1 FROM ll_appointment_work_guard WHERE id=1);
 
 CREATE TABLE IF NOT EXISTS ll_appointment_work (
@@ -4241,7 +4241,7 @@ CREATE TABLE IF NOT EXISTS ll_appointment_work (
   state_json LONGTEXT NOT NULL COMMENT '工作关系责任跟进及影响基线，不保存可编辑业务执行事实',
   PRIMARY KEY (work_item_key),
   KEY idx_appointment_work_container (container_booking_id,retired)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项需求与关系';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约工作事项需求与关系';
 
 CREATE TABLE IF NOT EXISTS ll_appointment_work_history (
   id VARCHAR(36) NOT NULL COMMENT '历史记录标识',
@@ -4257,7 +4257,7 @@ CREATE TABLE IF NOT EXISTS ll_appointment_work_history (
   PRIMARY KEY (id),
   UNIQUE KEY uk_appointment_work_command (work_item_key,command_key),
   KEY idx_appointment_work_history (work_item_key,occurred_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='预约工作事项历史与幂等命令';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='预约工作事项历史与幂等命令';
 
 -- 新单据短号：相同业务及客户名称缩写共享逻辑秒，避免同秒或多实例重号。
 -- 库存转运无需再次预约入仓；目标库：lastleg-service 所属数据库。可重复执行。
@@ -4408,11 +4408,11 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_truck_task (
   active_order VARCHAR(193) NULL COMMENT '有效原单唯一键；取消置空，完成保留',
   PRIMARY KEY(dispatch_no), UNIQUE KEY uk_transport_trip(trip_no), UNIQUE KEY uk_transport_source(active_order),
   KEY idx_transport_order(customer_id,order_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='排车与本土卡车原单关联';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排车与本土卡车原单关联';
 CREATE TABLE IF NOT EXISTS ll_dispatch_transport_create (
   trip_no VARCHAR(64) NOT NULL PRIMARY KEY COMMENT '本次运输资源记录号',
   request_hash CHAR(64) NOT NULL COMMENT '首次安排请求摘要'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='本土卡车排车创建请求账本';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='本土卡车排车创建请求账本';
 CREATE TABLE IF NOT EXISTS ll_dispatch_transport_command (
   dispatch_no VARCHAR(64) NOT NULL COMMENT '排车业务号',
   request_key VARCHAR(128) NOT NULL COMMENT '客户端幂等请求键',
@@ -4420,7 +4420,7 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_transport_command (
   evidence_json JSON NULL COMMENT '已确认运输完成凭证标识列表',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '业务命令提交时间',
   PRIMARY KEY(dispatch_no,request_key)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='排车运输执行命令与凭证账本';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排车运输执行命令与凭证账本';
 
 -- 统一业务单号：前缀 + yyyyMMdd + 四位日流水。
 CREATE TABLE IF NOT EXISTS ll_document_sequence (
@@ -4428,7 +4428,7 @@ CREATE TABLE IF NOT EXISTS ll_document_sequence (
   current_value BIGINT NOT NULL COMMENT '该前缀当日已分配流水，已分配号不回收',
   PRIMARY KEY (sequence_key),
   CONSTRAINT chk_ll_document_sequence_value CHECK (current_value > 0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='业务单据每日独立原子流水';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='业务单据每日独立原子流水';
 
 CREATE TABLE IF NOT EXISTS ll_fleet_resource_photo (
   resource_kind VARCHAR(16) NOT NULL COMMENT '档案类型：车辆或司机',
@@ -4472,7 +4472,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_inbound (
   created_at datetime(3) NOT NULL COMMENT '计租登记时间，采用协调世界时',
   PRIMARY KEY (receipt_id),
   KEY idx_storage_rent_inbound_lot (lot_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='头程实收计租幂等登记';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='头程实收计租幂等登记';
 
 CREATE TABLE IF NOT EXISTS ll_storage_rent_lot (
   id bigint NOT NULL COMMENT '原批次主键',
@@ -4501,7 +4501,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_lot (
   UNIQUE KEY uk_storage_rent_lot_source (source_key),
   KEY idx_storage_rent_stock (balance_id,batch_no),
   KEY idx_storage_rent_customer (customer_id,warehouse_id,inbound_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='实收计租原批次';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='实收计租原批次';
 
 CREATE TABLE IF NOT EXISTS ll_storage_rent_share (
   balance_id bigint DEFAULT NULL COMMENT '普通库存当前余额，退货箱份额为空',
@@ -4518,7 +4518,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_share (
   UNIQUE KEY uk_storage_rent_stock_share (lot_id,balance_id,batch_no),
   KEY idx_storage_rent_carton (customer_id,warehouse_id,carton_mark),
   KEY idx_storage_rent_share_stock (customer_id,warehouse_id,balance_id,batch_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='当前库存与原计租批次份额';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='当前库存与原计租批次份额';
 
 CREATE TABLE IF NOT EXISTS ll_storage_rent_preparation (
   id bigint NOT NULL COMMENT '预校验主键',
@@ -4556,7 +4556,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_preparation (
   KEY idx_storage_rent_business (customer_id,business_no),
   KEY idx_storage_rent_recovery (status,updated_at),
   KEY idx_storage_rent_release (release_status,updated_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='仓租扫码资金预占与结算快照';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='仓租扫码资金预占与结算快照';
 
 -- SKU 换标原计租份额快照，存量数据库可重复执行。
 SET @storage_rent_sku_column = (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_sku_conversion' AND column_name='storage_rent_shares_json');
@@ -4605,10 +4605,10 @@ CREATE TABLE IF NOT EXISTS ll_procurement_workflow_command (
 
 CREATE TABLE IF NOT EXISTS ll_order_budget_reservation (
   id BIGINT NOT NULL COMMENT '预算冻结记录主键',
-  customer_id VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户隔离标识',
+  customer_id VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '客户隔离标识',
   kind VARCHAR(32) NOT NULL COMMENT '客户下单业务类型',
   request_key VARCHAR(128) NOT NULL COMMENT '下单幂等键',
-  order_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '成功创建的业务单号',
+  order_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '成功创建的业务单号',
   original_amount DECIMAL(18,2) NOT NULL COMMENT '客户预估原币金额',
   currency VARCHAR(3) NOT NULL COMMENT '预估金额币种',
   amount_cny DECIMAL(18,2) NOT NULL COMMENT '按下单月份汇率折算的人民币冻结金额',
@@ -4622,4 +4622,4 @@ CREATE TABLE IF NOT EXISTS ll_order_budget_reservation (
   PRIMARY KEY(id), UNIQUE KEY uk_order_budget_request(customer_id,kind,request_key),
   KEY idx_order_budget_release(status,release_requested,created_at),
   KEY idx_order_budget_order(customer_id,kind,order_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='海外客户下单预估资金冻结投影';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='海外客户下单预估资金冻结投影';

lastleg-service/src/main/resources/db/return-sku-conversion.sql

@@ -3,17 +3,17 @@ SET @return_sku_ddl = (SELECT IF(EXISTS(SELECT 1 FROM information_schema.columns
 PREPARE return_sku_stmt FROM @return_sku_ddl; EXECUTE return_sku_stmt; DEALLOCATE PREPARE return_sku_stmt;
 CREATE TABLE IF NOT EXISTS ll_return_sku_conversion (
  id BIGINT NOT NULL COMMENT 'SKU库存转换记录ID',
- customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户隔离键',
- overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '操作海外仓ID',
+ customer_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '客户隔离键',
+ overseas_warehouse_id VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '操作海外仓ID',
  application_id BIGINT NOT NULL COMMENT '换标申请ID',
- relabel_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标单号',
+ relabel_no VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '换标单号',
  item_id BIGINT NOT NULL COMMENT '换标箱级明细ID',
  round_key VARCHAR(64) NOT NULL COMMENT '作业轮次，退回重做使用新轮次',
  carton_id BIGINT NOT NULL COMMENT '实物来源包裹或箱ID',
  carton_mark VARCHAR(128) NOT NULL COMMENT '完工时仓库识别码',
- old_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标前SKU',
- new_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标后SKU',
- product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '中文品名快照',
+ old_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '换标前SKU',
+ new_sku_code VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '换标后SKU',
+ product_name_zh VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '中文品名快照',
  quantity BIGINT NOT NULL COMMENT '实际完成转换件数',
  status VARCHAR(32) NOT NULL COMMENT 'APPLIED待客户确认/CONFIRMED已确认/REVERSED退回冲回',
  ownership_json LONGTEXT NOT NULL COMMENT '本次转换件数的来源退货单快照，供精确冲回',
@@ -26,4 +26,4 @@ CREATE TABLE IF NOT EXISTS ll_return_sku_conversion (
  KEY idx_return_sku_conversion_app(customer_id,application_id,status),
  KEY idx_return_sku_conversion_carton(customer_id,carton_id),
  CONSTRAINT chk_return_sku_conversion_quantity CHECK(quantity>0)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='退货实物SKU换标库存转换和冲回记录';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='退货实物SKU换标库存转换和冲回记录';

lastleg-service/src/main/resources/db/storage-rent.sql

@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_inbound (
   created_at datetime(3) NOT NULL COMMENT '计租登记时间，采用协调世界时',
   PRIMARY KEY (receipt_id),
   KEY idx_storage_rent_inbound_lot (lot_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='头程实收计租幂等登记';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='头程实收计租幂等登记';
 
 CREATE TABLE IF NOT EXISTS ll_storage_rent_lot (
   id bigint NOT NULL COMMENT '原批次主键',
@@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_lot (
   UNIQUE KEY uk_storage_rent_lot_source (source_key),
   KEY idx_storage_rent_stock (balance_id,batch_no),
   KEY idx_storage_rent_customer (customer_id,warehouse_id,inbound_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='实收计租原批次';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='实收计租原批次';
 
 CREATE TABLE IF NOT EXISTS ll_storage_rent_share (
   balance_id bigint DEFAULT NULL COMMENT '普通库存当前余额，退货箱份额为空',
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_share (
   UNIQUE KEY uk_storage_rent_stock_share (lot_id,balance_id,batch_no),
   KEY idx_storage_rent_carton (customer_id,warehouse_id,carton_mark),
   KEY idx_storage_rent_share_stock (customer_id,warehouse_id,balance_id,batch_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='当前库存与原计租批次份额';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='当前库存与原计租批次份额';
 
 CREATE TABLE IF NOT EXISTS ll_storage_rent_preparation (
   id bigint NOT NULL COMMENT '预校验主键',
@@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS ll_storage_rent_preparation (
   KEY idx_storage_rent_business (customer_id,business_no),
   KEY idx_storage_rent_recovery (status,updated_at),
   KEY idx_storage_rent_release (release_status,updated_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='仓租扫码资金预占与结算快照';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='仓租扫码资金预占与结算快照';
 
 -- SKU 换标原计租份额快照，存量数据库可重复执行。
 SET @storage_rent_sku_column = (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_sku_conversion' AND column_name='storage_rent_shares_json');

lastleg-service/src/test/java/com/baiyue/lastleg/delivery/Phase5PdaDeploymentSqlContractTest.java

@@ -15,7 +15,7 @@ class Phase5PdaDeploymentSqlContractTest {
             StandardCharsets.UTF_8);
         String normalized = sql.replaceAll("\\s+", "");
 
-        assertTrue(sql.contains("warehouse_id varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL"));
+        assertTrue(sql.contains("warehouse_id varchar(128) COLLATE utf8mb4_0900_ai_ci NOT NULL"));
         assertTrue(sql.contains("completion_idempotency_key varchar(255)"));
         assertTrue(normalized.contains("UNIQUEKEYuk_ll_dispatch_order_no(dispatch_no)"));
         assertTrue(normalized.contains("UNIQUEKEYuk_ll_outbound_no(outbound_no)"));

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/mapper/DispatchCandidateMySqlReadOnlyTest.java

@@ -47,7 +47,7 @@ class DispatchCandidateMySqlReadOnlyTest {
         var project=DispatchCandidatePageMapper.Sql.class.getDeclaredMethod("project",String.class,Set.class,boolean.class);
         project.setAccessible(true);
         String general="SELECT "+fields.stream().sorted().map(f->"_utf8mb4'洛杉矶-001' COLLATE utf8mb4_general_ci AS "+f).collect(Collectors.joining(","));
-        String unicode=general.replace("utf8mb4_general_ci","utf8mb4_unicode_ci");
+        String unicode=general.replace("utf8mb4_general_ci","utf8mb4_0900_ai_ci");
         try(var connection=connect();var statement=connection.createStatement()) {
             statement.setQueryTimeout(10);
             var failure=assertThrows(SQLException.class,()->statement.executeQuery(general+" UNION ALL "+unicode));

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchMergedRelabelPersistenceTest.java

@@ -298,7 +298,7 @@ class DispatchMergedRelabelPersistenceTest {
     public static class H2CandidateLanguageDriver extends org.apache.ibatis.scripting.xmltags.XMLLanguageDriver {
         @Override public org.apache.ibatis.mapping.SqlSource createSqlSource(org.apache.ibatis.session.Configuration configuration,String script,Class<?> parameterType) {
             return super.createSqlSource(configuration,script.replaceAll(
-                "CONVERT\\((s\\.\\w+|NULL) USING utf8mb4\\) COLLATE utf8mb4_unicode_ci","$1"),parameterType);
+                "CONVERT\\((s\\.\\w+|NULL) USING utf8mb4\\) COLLATE utf8mb4_0900_ai_ci","$1"),parameterType);
         }
     }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryMovementSqlTest.java

@@ -34,14 +34,14 @@ class ReturnInventoryMovementSqlTest {
                 var block = Pattern.compile("(?s)(?:CREATE TABLE (?:IF NOT EXISTS )?|ALTER TABLE )" + entry.getKey() + "\\b.*?;").matcher(sql);
                 assertTrue(block.find(), file + ": " + entry.getKey());
                 for (String column : entry.getValue()) {
-                    assertTrue(Pattern.compile("(?i)\\b" + column + "\\s+varchar\\(\\d+\\) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci").matcher(block.group()).find(),
+                    assertTrue(Pattern.compile("(?i)\\b" + column + "\\s+varchar\\(\\d+\\) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci").matcher(block.group()).find(),
                             file + ": " + entry.getKey() + "." + column);
                 }
             }
         }
         String standalone = Files.readString(Path.of("src/main/resources/db/return-sku-conversion.sql"));
         for (String column : fields.get("ll_return_sku_conversion"))
-            assertTrue(Pattern.compile("\\b" + column + "\\s+VARCHAR\\(\\d+\\) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci").matcher(standalone).find());
+            assertTrue(Pattern.compile("\\b" + column + "\\s+VARCHAR\\(\\d+\\) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci").matcher(standalone).find());
     }
 
     @Test

lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnSkuConversionPersistenceTest.java

@@ -58,7 +58,7 @@ class ReturnSkuConversionPersistenceTest {
                     + (f.getName().equals("id") ? " PRIMARY KEY" : "")).collect(Collectors.joining(","));
             jdbc.execute("CREATE TABLE " + entity.getAnnotation(TableName.class).value() + " (" + columns + ")"
                 + (mysqlMode ? " ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE="
-                    + (entity == ReturnInventoryCartonItem.class ? "utf8mb4_0900_ai_ci" : "utf8mb4_unicode_ci") : ""));
+                    + (entity == ReturnInventoryCartonItem.class ? "utf8mb4_0900_ai_ci" : "utf8mb4_0900_ai_ci") : ""));
         }
         jdbc.execute("CREATE UNIQUE INDEX balance_sku ON ll_return_inventory_balance(customer_id,overseas_warehouse_id,sku_code)");
         jdbc.execute("CREATE UNIQUE INDEX conversion_round ON ll_return_sku_conversion(item_id,round_key,old_sku_code,new_sku_code)");

lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnSkuMySqlTestDatabase.java

@@ -35,7 +35,7 @@ final class ReturnSkuMySqlTestDatabase implements AutoCloseable {
         try(var connection=administration.getConnection();var statement=connection.createStatement()) {
             if(!"information_schema".equals(connection.getCatalog()) || !"MySQL".equals(connection.getMetaData().getDatabaseProductName())
                 || connection.getMetaData().getDatabaseMajorVersion()!=8) throw new IllegalStateException("Expected TEST MySQL 8 administrative read catalog");
-            statement.execute("CREATE DATABASE `"+schema+"` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
+            statement.execute("CREATE DATABASE `"+schema+"` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci");
             created=true;
         } catch(SQLException failure) { throw new IllegalStateException("TEST isolated schema creation failed; SQLState="+failure.getSQLState()); }
         source=new DriverManagerDataSource(prefix+schema+options,user,password) {