提交

scripts/db/incremental.sql

@@ -239,6 +239,9 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan (
   UNIQUE KEY uk_ll_inbound_plan_container (tenant_id,container_no)
 ) ENGINE=InnoDB COMMENT='尾程入库计划表：每个租户的每个集装箱生成一张入库单';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan' AND column_name='version'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan ADD COLUMN version INT NOT NULL DEFAULT 0 COMMENT ''入库计划乐观锁版本'' AFTER updated_at'));
+PREPARE ll_inbound_plan_version_ddl FROM @ddl; EXECUTE ll_inbound_plan_version_ddl; DEALLOCATE PREPARE ll_inbound_plan_version_ddl;
+
 CREATE TABLE IF NOT EXISTS ll_inbound_plan_line (
   id BIGINT NOT NULL COMMENT '入库计划明细ID（雪花ID）',
   plan_id BIGINT NOT NULL COMMENT '入库计划ID',
@@ -440,6 +443,7 @@ CREATE TABLE IF NOT EXISTS ll_order (
   relabel_order_no VARCHAR(128) NULL COMMENT '换标单号',
   relabel_status VARCHAR(32) NULL COMMENT '换标状态',
   pallet_merge_flag VARCHAR(32) NULL COMMENT '合托标记',
+  pallet_merge_batch_id VARCHAR(64) NULL COMMENT '平台预标记合托分组号',
   current_status VARCHAR(32) NOT NULL DEFAULT 'PENDING_ASSIGNMENT' COMMENT '当前业务状态',
   private_remark VARCHAR(1000) NULL COMMENT '备注（仅自己）',
   customer_remark VARCHAR(1000) NULL COMMENT '备注（客户）',
@@ -457,6 +461,9 @@ CREATE TABLE IF NOT EXISTS ll_order (
   KEY idx_ll_order_list (tenant_id,current_status,created_at)
 ) ENGINE=InnoDB COMMENT='尾程订单主表';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_order' AND column_name='pallet_merge_batch_id'), 'SELECT 1', 'ALTER TABLE ll_order ADD COLUMN pallet_merge_batch_id VARCHAR(64) NULL COMMENT ''平台预标记合托分组号'' AFTER pallet_merge_flag'));
+PREPARE ll_order_merge_batch_ddl FROM @ddl; EXECUTE ll_order_merge_batch_ddl; DEALLOCATE PREPARE ll_order_merge_batch_ddl;
+
 CREATE TABLE IF NOT EXISTS ll_order_detail (
   id BIGINT NOT NULL AUTO_INCREMENT COMMENT '订单明细主键',
   order_id BIGINT NOT NULL COMMENT '尾程订单ID',