提交

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

@@ -77,6 +77,7 @@ CREATE TABLE IF NOT EXISTS ll_order (
   relabel_order_no VARCHAR(128) COMMENT '换标单号',
   relabel_status VARCHAR(32) COMMENT '换标状态',
   pallet_merge_flag VARCHAR(32) COMMENT '合托标记',
+  pallet_merge_batch_id VARCHAR(64) NULL COMMENT '平台预标记合托分组号',
   current_status VARCHAR(32) NOT NULL DEFAULT 'PENDING_ASSIGNMENT' COMMENT '当前业务状态：PENDING_ASSIGNMENT待分配、PENDING_INBOUND待入库、INBOUND_COMPLETED入库完成、PENDING_DELIVERY待派送、DELIVERING派送中、DELIVERED派送完成',
   sub_order_status VARCHAR(255) NULL COMMENT '子单据状态汇总',
   private_remark VARCHAR(1000) COMMENT '备注（仅自己）',
@@ -97,6 +98,9 @@ CREATE TABLE IF NOT EXISTS ll_order (
   KEY idx_ll_order_list(customer_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 '订单明细主键',
   customer_id VARCHAR(128) NOT NULL COMMENT '客户数据隔离键',
@@ -432,6 +436,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan (
   total_volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '集装箱总体积（立方米）',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  version INT NOT NULL DEFAULT 0 COMMENT '入库计划乐观锁版本',
   PRIMARY KEY (id),
   UNIQUE KEY uk_ll_inbound_plan_no (plan_no),
   UNIQUE KEY uk_ll_inbound_plan_source_order (customer_id, source_order_id),