优化

firstleg/src/main/resources/db/phase3-channel-container-migration.sql

@@ -103,6 +103,7 @@ BEGIN
     OR NOT (OLD.destination_port_code <=> NEW.destination_port_code) OR NOT (OLD.destination_port_name <=> NEW.destination_port_name)
     OR NOT (OLD.destination_warehouse_code <=> NEW.destination_warehouse_code) OR NOT (OLD.destination_warehouse_name <=> NEW.destination_warehouse_name)
     OR NOT (OLD.capacity_cbm <=> NEW.capacity_cbm) OR NOT (OLD.max_weight_kg <=> NEW.max_weight_kg)
+    OR NOT (OLD.terminal_trucking_company_id <=> NEW.terminal_trucking_company_id)
     OR NOT (OLD.terminal_trucking_company <=> NEW.terminal_trucking_company) OR NOT (OLD.loading_at <=> NEW.loading_at)
     OR NOT (OLD.actual_sailing_at <=> NEW.actual_sailing_at)
     OR NOT (OLD.estimated_port_arrival_at <=> NEW.estimated_port_arrival_at) OR NOT (OLD.actual_port_arrival_at <=> NEW.actual_port_arrival_at)

firstleg/src/main/resources/db/phase3-customs-schema.sql

@@ -116,6 +116,22 @@ CREATE TABLE IF NOT EXISTS fl_customs_submission_batch (
   CONSTRAINT chk_customs_batch_status CHECK (status IN ('SUBMITTED','ACKNOWLEDGED','REJECTED','COMPLETED'))
 ) ENGINE=InnoDB COMMENT='报关代理提交批次及冻结文件版本';
 
+-- 历史代理名称无法安全反推Supplier ID，旧行保持NULL；新写入由服务端校验并持久化。
+DROP PROCEDURE IF EXISTS phase3_customs_supplier_snapshot_add_column;
+DELIMITER $$
+CREATE PROCEDURE phase3_customs_supplier_snapshot_add_column()
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+      WHERE table_schema=DATABASE() AND table_name='fl_customs_submission_batch'
+        AND column_name='customs_agent_id') THEN
+    ALTER TABLE fl_customs_submission_batch
+      ADD COLUMN customs_agent_id BIGINT UNSIGNED NULL COMMENT '本批次报关代理Supplier逻辑ID快照；历史数据无法推导时为空' AFTER batch_version;
+  END IF;
+END$$
+DELIMITER ;
+CALL phase3_customs_supplier_snapshot_add_column();
+DROP PROCEDURE phase3_customs_supplier_snapshot_add_column;
+
 CREATE TABLE IF NOT EXISTS fl_customs_receipt (
   id BIGINT UNSIGNED NOT NULL COMMENT '报关回执文件版本逻辑ID',
   customs_case_id BIGINT UNSIGNED NOT NULL COMMENT '所属报关协同单ID',

firstleg/src/main/resources/db/phase3-simple-customs-document-migration.sql

@@ -48,6 +48,7 @@ BEGIN
     OR NOT (OLD.destination_warehouse_code <=> NEW.destination_warehouse_code)
     OR NOT (OLD.destination_warehouse_name <=> NEW.destination_warehouse_name)
     OR NOT (OLD.capacity_cbm <=> NEW.capacity_cbm) OR NOT (OLD.max_weight_kg <=> NEW.max_weight_kg)
+    OR NOT (OLD.terminal_trucking_company_id <=> NEW.terminal_trucking_company_id)
     OR NOT (OLD.terminal_trucking_company <=> NEW.terminal_trucking_company) OR NOT (OLD.loading_at <=> NEW.loading_at)
     OR NOT (OLD.actual_sailing_at <=> NEW.actual_sailing_at)
     OR NOT (OLD.estimated_port_arrival_at <=> NEW.estimated_port_arrival_at)

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

@@ -80,6 +80,22 @@ CREATE TABLE IF NOT EXISTS fl_container_booking (
   CONSTRAINT chk_container_booking_weight CHECK (max_weight_kg IS NULL OR max_weight_kg > 0)
 ) ENGINE=InnoDB COMMENT='平台货柜预订资料；预装状态唯一来源为装柜计划';
 
+-- 触发器创建前先收敛旧库货柜供应商ID列；历史名称无法反推ID，保持NULL。
+DROP PROCEDURE IF EXISTS phase3_container_supplier_snapshot_add_column;
+DELIMITER $$
+CREATE PROCEDURE phase3_container_supplier_snapshot_add_column()
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+      WHERE table_schema=DATABASE() AND table_name='fl_container_booking'
+        AND column_name='terminal_trucking_company_id') THEN
+    ALTER TABLE fl_container_booking
+      ADD COLUMN terminal_trucking_company_id BIGINT UNSIGNED NULL COMMENT '码头拖车Supplier逻辑ID快照；历史数据无法推导时为空' AFTER max_weight_kg;
+  END IF;
+END$$
+DELIMITER ;
+CALL phase3_container_supplier_snapshot_add_column();
+DROP PROCEDURE phase3_container_supplier_snapshot_add_column;
+
 CREATE TABLE IF NOT EXISTS fl_loading_plan (
   id BIGINT UNSIGNED NOT NULL COMMENT '智能装柜计划ID（雪花ID）',
   plan_no VARCHAR(40) NOT NULL COMMENT '平台唯一装柜计划号',
@@ -607,6 +623,7 @@ BEGIN
     OR NOT (OLD.destination_warehouse_name <=> NEW.destination_warehouse_name)
     OR NOT (OLD.capacity_cbm <=> NEW.capacity_cbm)
     OR NOT (OLD.max_weight_kg <=> NEW.max_weight_kg)
+    OR NOT (OLD.terminal_trucking_company_id <=> NEW.terminal_trucking_company_id)
     OR NOT (OLD.terminal_trucking_company <=> NEW.terminal_trucking_company)
     OR NOT (OLD.loading_at <=> NEW.loading_at)
     OR NOT (OLD.actual_sailing_at <=> NEW.actual_sailing_at)
@@ -1206,7 +1223,7 @@ BEGIN
        WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_container_booking'
          AND column_name IN ('booking_no', 'cabinet_no', 'warehouse_id', 'bill_of_lading_no',
                              'vessel_name', 'voyage_no', 'container_type', 'capacity_cbm',
-                             'max_weight_kg', 'terminal_trucking_company')) <> 10 THEN
+                             'max_weight_kg', 'terminal_trucking_company_id', 'terminal_trucking_company')) <> 11 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：货柜原型字段缺失';
   END IF;
   IF (SELECT COUNT(*) FROM information_schema.columns

firstleg/src/test/java/com/baiyue/firstleg/repository/Phase3FinalUnifiedSqlContractTest.java

@@ -32,7 +32,8 @@ class Phase3FinalUnifiedSqlContractTest {
             .contains("CREATE TABLE IF NOT EXISTS fl_customs_submission_batch")
             .contains("customs_agent_id BIGINT UNSIGNED NULL")
             .contains("terminal_trucking_company_id BIGINT UNSIGNED NULL")
-            .contains("phase3_supplier_snapshot_add_columns")
+            .contains("phase3_container_supplier_snapshot_add_column")
+            .contains("phase3_customs_supplier_snapshot_add_column")
             .contains("CREATE TABLE IF NOT EXISTS fl_customs_receipt")
             .contains("CREATE TABLE IF NOT EXISTS fl_port_schedule")
             .contains("CREATE TABLE IF NOT EXISTS fl_port_schedule_history")