From b60a16a9b981382a62137d031e0e4196c1cf274e Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Fri, 14 Aug 2026 13:43:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B6=E6=95=9BLMS=E6=97=A5=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=88=9D=E5=A7=8B=E5=8C=96=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/lms_daily_plan.sql | 35 ++----------------------------- sql/mysql/lms_daily_plan_menu.sql | 5 ++++- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/sql/mysql/lms_daily_plan.sql b/sql/mysql/lms_daily_plan.sql index 7d8779f3..9f654362 100644 --- a/sql/mysql/lms_daily_plan.sql +++ b/sql/mysql/lms_daily_plan.sql @@ -41,37 +41,6 @@ CREATE TABLE IF NOT EXISTS `lms_daily_plan` ( UNIQUE KEY `uk_erp_order_code_tenant` (`erp_order_code`, `tenant_id`) ) COMMENT='LMS日计划'; --- 兼容已经执行过旧版脚本的环境，幂等迁移字段规格和完成时间字段名称。 -SET @rename_stocking_complete_time = IF( - EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'lms_daily_plan' AND column_name = 'stocking_end_time'), - 'ALTER TABLE lms_daily_plan CHANGE COLUMN stocking_end_time stocking_complete_time datetime DEFAULT NULL COMMENT ''备货完成时间''', - 'SELECT 1' -); -PREPARE rename_stocking_complete_time_stmt FROM @rename_stocking_complete_time; -EXECUTE rename_stocking_complete_time_stmt; -DEALLOCATE PREPARE rename_stocking_complete_time_stmt; - -SET @rename_sleeving_complete_time = IF( - EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'lms_daily_plan' AND column_name = 'sleeving_end_time'), - 'ALTER TABLE lms_daily_plan CHANGE COLUMN sleeving_end_time sleeving_complete_time datetime DEFAULT NULL COMMENT ''套管完成时间''', - 'SELECT 1' -); -PREPARE rename_sleeving_complete_time_stmt FROM @rename_sleeving_complete_time; -EXECUTE rename_sleeving_complete_time_stmt; -DEALLOCATE PREPARE rename_sleeving_complete_time_stmt; - -ALTER TABLE lms_daily_plan - MODIFY COLUMN material_spec varchar(128) DEFAULT NULL COMMENT '物料规格', - MODIFY COLUMN plan_qty int NOT NULL DEFAULT 0 COMMENT '计划数量', - MODIFY COLUMN append_qty int NOT NULL DEFAULT 0 COMMENT '追加数量', - MODIFY COLUMN stocked_qty int NOT NULL DEFAULT 0 COMMENT '已备货数量', - MODIFY COLUMN sleeved_qty int NOT NULL DEFAULT 0 COMMENT '已套管数量', - MODIFY COLUMN packing_info text COMMENT '包装信息', - MODIFY COLUMN sort_seq int NOT NULL COMMENT '排序序号', - MODIFY COLUMN weight int NOT NULL DEFAULT 1 COMMENT '调度权重', - MODIFY COLUMN stocking_status tinyint NOT NULL DEFAULT 0 COMMENT '备货状态：0未开始，1进行中，2已完成，3已取消', - MODIFY COLUMN sleeving_status tinyint NOT NULL DEFAULT 0 COMMENT '套管状态：0未开始，1进行中，2已完成，3已取消'; - CREATE TABLE IF NOT EXISTS `lms_daily_plan_strategy` ( `strategy_id` bigint NOT NULL COMMENT '策略ID', `strategy_type` tinyint NOT NULL COMMENT '策略类型：1备货，2套管', @@ -104,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `lms_daily_plan_operation_log` ( PRIMARY KEY (`operation_log_id`) ) COMMENT='LMS日计划操作日志'; --- 编码格式：DP + yyyyMMdd + 4位日流水。 +-- 2093号段用于 LMS 日计划固定基础数据；编码格式：DP + yyyyMMdd + 4位日流水。 INSERT INTO base_code_rule (id, rule_name, rule_code, segment_config, code_separator, letter_case, total_length, seq_strategy, status, remark, creator, create_time, updater, update_time, deleted) @@ -160,7 +129,7 @@ WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type='lms_daily_plan -- 为全部有效租户分别初始化备货、套管顺序策略。 INSERT INTO lms_daily_plan_strategy (strategy_id, strategy_type, strategy_mode, cursor_daily_plan_id, version, creator, create_time, updater, update_time, deleted, tenant_id) -SELECT 2093100000000000000 + tenant.id * 10 + strategy.strategy_type, +SELECT UUID_SHORT(), strategy.strategy_type, 1, NULL, 0, '1', NOW(), '1', NOW(), b'0', tenant.id FROM system_tenant tenant CROSS JOIN (SELECT 1 strategy_type UNION ALL SELECT 2) strategy diff --git a/sql/mysql/lms_daily_plan_menu.sql b/sql/mysql/lms_daily_plan_menu.sql index d2f2db10..6de01381 100644 --- a/sql/mysql/lms_daily_plan_menu.sql +++ b/sql/mysql/lms_daily_plan_menu.sql @@ -1,10 +1,11 @@ --- LMS 日计划菜单及按钮权限，按路径、组件和权限编码幂等插入。 +-- LMS 日计划菜单及按钮权限，固定基础数据使用预留的 2093 号段。 INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted) SELECT 2093000000000000100, '日计划管理', '', 2, 20, parent.id, 'daily-plan', '', 'lms/dailyplan/index', 'LmsDailyPlan', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' FROM system_menu parent +JOIN system_menu lms ON lms.id = parent.parent_id AND lms.path = '/lms' AND lms.deleted = b'0' WHERE parent.path = 'tube-library' AND parent.deleted = b'0' AND NOT EXISTS (SELECT 1 FROM system_menu WHERE component='lms/dailyplan/index' AND deleted=b'0'); @@ -14,6 +15,7 @@ INSERT INTO system_menu SELECT 2093000000000000101, '日计划作业', '', 2, 30, parent.id, 'daily-plan-work', '', 'lms/dailyplanwork/index', 'LmsDailyPlanWork', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0' FROM system_menu parent +JOIN system_menu lms ON lms.id = parent.parent_id AND lms.path = '/lms' AND lms.deleted = b'0' WHERE parent.path = 'tube-library' AND parent.deleted = b'0' AND NOT EXISTS (SELECT 1 FROM system_menu WHERE component='lms/dailyplanwork/index' AND deleted=b'0'); @@ -52,6 +54,7 @@ SELECT DISTINCT child_role.role_id, parent.id, '1', NOW(), '1', NOW(), b'0', chi FROM system_role_menu child_role JOIN system_menu child ON child.id=child_role.menu_id AND child.deleted=b'0' JOIN system_menu parent ON parent.id=child.parent_id AND parent.path='tube-library' AND parent.deleted=b'0' +JOIN system_menu lms ON lms.id=parent.parent_id AND lms.path='/lms' AND lms.deleted=b'0' WHERE child_role.deleted=b'0' AND NOT EXISTS ( SELECT 1 FROM system_role_menu parent_role