java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
This commit is contained in:
ouyangxq
2026-09-03 11:55:46 +08:00
parent b15d003217 fd3dbb2fc6
commit bdcc32a095
12 changed files with 230 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/sql/头程数据库统一增量-MySQL8.sql
+48 -6
View File
@@ -566,6 +566,7 @@ CREATE TABLE IF NOT EXISTS ord_order (
destination_warehouse_name VARCHAR(128) NOT NULL COMMENT '目的仓名称快照',
expected_ship_date DATE NULL COMMENT '预计发运日期',
expected_arrival_at DATETIME(3) NULL COMMENT '客户申报预计到货时间',
estimated_volume_cbm DECIMAL(18,4) NULL COMMENT '平台运营预估体积（立方米），独立于客户下单及实测体积',
customer_remark VARCHAR(1000) NULL COMMENT '客户可见备注',
pickup_method VARCHAR(24) NULL COMMENT '取货方式',
requested_pickup_at DATETIME(3) NULL COMMENT '客户要求平台上门提货的预约时间',
@@ -14976,12 +14977,9 @@ CALL queue_column_comment('baiyue_warehouse', 'wh_warehouse_address', 'version',
CALL queue_column_comment('baiyue_warehouse', 'wh_warehouse_address', 'warehouse_id', '所属仓库ID');
-- END GENERATED NINE-SCHEMA COMMENT UPGRADE CALLS
CALL apply_queued_comments();
DROP PROCEDURE IF EXISTS apply_queued_comments;
DROP PROCEDURE IF EXISTS apply_one_table_comments;
DROP PROCEDURE IF EXISTS queue_column_comment;
DROP PROCEDURE IF EXISTS queue_table_comment;
DROP TEMPORARY TABLE IF EXISTS tmp_column_comment_target;
DROP TEMPORARY TABLE IF EXISTS tmp_table_comment_target;
-- 后续还会创建整柜报关和同柜组最新基线，保留本会话内的结构保真注释升级器并清空首批队列。
TRUNCATE TABLE tmp_column_comment_target;
TRUNCATE TABLE tmp_table_comment_target;
-- 三期统一最终总断言：稳定箱号、单箱测量、墨家收件箱、客户尺寸和装柜权限。
USE baiyue_firstleg;
@@ -17194,6 +17192,50 @@ CREATE TABLE IF NOT EXISTS fl_dropship_pallet (
CONSTRAINT chk_dropship_pallet_status CHECK (pallet_status IN ('OPEN','COMPLETED'))
) ENGINE=InnoDB COMMENT='一件代发合托形成的可打印托盘';
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','id','柜次证据记录ID');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','file_id','File服务文件ID');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','file_name','文件名称快照');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','seal_no','带锁码照对应锁码');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','remark','证据备注');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','status','证据状态：ACTIVE有效、VOID作废');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','void_reason','作废原因');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','voided_by','作废操作人ID');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','voided_by_name','作废操作人名称快照');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','voided_at','作废时间');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','version','乐观锁版本号');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','created_by','创建操作人ID');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','created_by_name','创建操作人名称快照');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','updated_by','最后修改操作人ID');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','updated_by_name','最后修改操作人名称快照');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','created_at','创建时间');
CALL queue_column_comment('baiyue_firstleg','fl_loading_cabinet_evidence','updated_at','最后更新时间');
CALL queue_column_comment('baiyue_firstleg','fl_order_declaration_event','consumed_at','事件消费完成时间');
CALL queue_column_comment('baiyue_firstleg','fl_order_declaration_snapshot','created_at','快照创建时间');
CALL queue_column_comment('baiyue_firstleg','fl_order_declaration_snapshot','updated_at','快照更新时间');
SET @unified_ddl = IF(
(SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA='baiyue_order' AND TABLE_NAME='ord_order' AND COLUMN_NAME='estimated_volume_cbm') = 0,
'ALTER TABLE baiyue_order.ord_order ADD COLUMN estimated_volume_cbm DECIMAL(18,4) NULL COMMENT ''平台运营预估体积（立方米），独立于客户下单及实测体积'' AFTER expected_arrival_at',
'SELECT 1'
);
PREPARE unified_stmt FROM @unified_ddl; EXECUTE unified_stmt; DEALLOCATE PREPARE unified_stmt;
CALL queue_column_comment('baiyue_order','ord_order','estimated_volume_cbm','平台运营预估体积（立方米），独立于客户下单及实测体积');
CALL queue_column_comment('baiyue_order','ord_customer_address','created_by','创建人ID');
CALL queue_column_comment('baiyue_order','ord_customer_address','created_at','创建时间');
CALL queue_column_comment('baiyue_order','ord_customer_address','updated_by','最后修改人ID');
CALL queue_column_comment('baiyue_order','ord_customer_address','updated_at','更新时间');
CALL queue_column_comment('baiyue_order','ord_customer_address','deleted','逻辑删除标记：0未删除、1已删除');
CALL queue_column_comment('baiyue_order','ord_customer_address','version','乐观锁版本号');
CALL apply_queued_comments();
DROP PROCEDURE IF EXISTS apply_queued_comments;
DROP PROCEDURE IF EXISTS apply_one_table_comments;
DROP PROCEDURE IF EXISTS queue_column_comment;
DROP PROCEDURE IF EXISTS queue_table_comment;
DROP TEMPORARY TABLE IF EXISTS tmp_column_comment_target;
DROP TEMPORARY TABLE IF EXISTS tmp_table_comment_target;
CREATE TABLE IF NOT EXISTS fl_dropship_pallet_carton (
id BIGINT UNSIGNED NOT NULL COMMENT '托盘箱明细ID',
task_id BIGINT UNSIGNED NOT NULL COMMENT '所属合托任务ID',