From bce8152aff2dcdf44e1152362c85b184b49ca170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <15984991+wwh2328692301@user.noreply.gitee.com> Date: Sat, 4 Jul 2026 09:46:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor(pt):=20=E8=B0=83=E6=95=B4PtProductTole?= =?UTF-8?q?rance=E7=9B=B8=E5=85=B3=E7=B1=BB=E7=9A=84=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将产品公差相关的domain、bo、vo、mapper、service等类统一迁移到pt模块包下，同时新增数据库对齐和菜单修复的SQL脚本 --- docs/sql_align_databases.sql | 25 +++++++ docs/sql_align_databases_v2.sql | 51 ++++++++++++++ docs/sql_align_dev.sql | 69 +++++++++++++++++++ .../PtProductToleranceController.java | 8 +-- .../com/klp/pt/domain/PtProductTolerance.java | 2 +- .../pt/domain/bo/PtProductToleranceBo.java | 2 +- .../pt/domain/vo/PtProductToleranceVo.java | 2 +- .../pt/mapper/PtProductToleranceMapper.java | 6 +- .../service/IPtProductToleranceService.java | 8 +-- .../impl/PtProductToleranceServiceImpl.java | 10 +-- .../mapper/pt/PtProductToleranceMapper.xml | 4 +- 11 files changed, 166 insertions(+), 21 deletions(-) create mode 100644 docs/sql_align_databases.sql create mode 100644 docs/sql_align_databases_v2.sql create mode 100644 docs/sql_align_dev.sql diff --git a/docs/sql_align_databases.sql b/docs/sql_align_databases.sql new file mode 100644 index 000000000..6c15a8610 --- /dev/null +++ b/docs/sql_align_databases.sql @@ -0,0 +1,25 @@ +-- ============================================================= +-- 线上线下库对齐修复脚本 +-- 用于 klp-oa（线上）和 klp-oa-test（线下） +-- ============================================================= +SET NAMES utf8mb4; + +-- ==================== 第一部分：补字典（两边都执行） ==================== + +-- 1.1 regrade_quality_type 字典类型 +INSERT IGNORE INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) +VALUES ('改判后质量状态', 'regrade_quality_type', '0', 'admin', NOW(), 'admin', NOW(), ''); + +-- 1.2 regrade_quality_type 字典数据 +INSERT IGNORE INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (1, '协议销售', 'protocol_sale', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()), +(2, '转分剪', 'to_slitting', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()), +(3, '降级', 'downgrade', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()), +(4, '返修', 'rework', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()), +(5, '报废', 'scrap', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()); + +-- 1.3 quality_review_status 补充缺失数据 +INSERT IGNORE INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (2, '待审批', '2', 'quality_review_status', '', 'warning', 'Y', '0', 'admin', NOW()), +(3, '已通过', '3', 'quality_review_status', '', 'success', 'Y', '0', 'admin', NOW()), +(4, '已驳回', '4', 'quality_review_status', '', 'danger', 'Y', '0', 'admin', NOW()); diff --git a/docs/sql_align_databases_v2.sql b/docs/sql_align_databases_v2.sql new file mode 100644 index 000000000..ec5506593 --- /dev/null +++ b/docs/sql_align_databases_v2.sql @@ -0,0 +1,51 @@ +-- ============================================================= +-- 线上线下库对齐修复（修复版v2） +-- 适配 dict_code / dict_id 非自增的表结构 +-- ============================================================= +SET NAMES utf8mb4; + +-- ==================== 1. 补字典类型 ==================== +SET @max_dict_id = (SELECT COALESCE(MAX(dict_id), 0) FROM sys_dict_type); + +INSERT IGNORE INTO sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time) +VALUES (@max_dict_id + 1, '改判后质量状态', 'regrade_quality_type', '0', 'admin', NOW()); + +-- ==================== 2. 补字典数据 ==================== +SET @max_code = (SELECT COALESCE(MAX(dict_code), 0) FROM sys_dict_data); +SET @code = @max_code + 1; + +-- quality_review_status 缺失的3条 +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 2, '待审批', '2', 'quality_review_status', '', 'warning', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 3, '已通过', '3', 'quality_review_status', '', 'success', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 4, '已驳回', '4', 'quality_review_status', '', 'danger', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +-- regrade_quality_type 5条 +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 1, '协议销售', 'protocol_sale', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 2, '转分剪', 'to_slitting', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 3, '降级', 'downgrade', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 4, '返修', 'rework', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()); +SET @code = @code + 1; + +INSERT IGNORE INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time) +VALUES (@code, 5, '报废', 'scrap', 'regrade_quality_type', '', '', 'Y', '0', 'admin', NOW()); + +-- ==================== 3. 验证 ==================== +SELECT 'Dict fix OK' AS result; diff --git a/docs/sql_align_dev.sql b/docs/sql_align_dev.sql new file mode 100644 index 000000000..bdb76e58e --- /dev/null +++ b/docs/sql_align_dev.sql @@ -0,0 +1,69 @@ +-- ============================================================= +-- 线下库 klp-oa-test 菜单对齐修复 +-- 将质量评审菜单从"质量管理"下移到"评审流程"目录下 +-- 并补充次品钢卷、O级卷菜单 +-- ============================================================= +SET NAMES utf8mb4; + +-- ==================== 1. 清理旧的质量评审菜单 ==================== +DELETE FROM sys_role_menu WHERE menu_id IN (2100000000000000036,2100000000000000037,2100000000000000038,2100000000000000039,2100000000000000040,2100000000000000041,2100000000000000042,2100000000000000043); +DELETE FROM sys_menu WHERE menu_id IN (2100000000000000036,2100000000000000037,2100000000000000038,2100000000000000039,2100000000000000040,2100000000000000041,2100000000000000042,2100000000000000043); + +-- 计算可用菜单ID +SET @max_id = (SELECT COALESCE(MAX(menu_id), 0) FROM sys_menu); + +-- ==================== 2. 创建"评审流程"目录（挂在质量管理下） ==================== +SET @parent_quality = 2068954238598967297; -- 质量管理 +SET @id_review_dir = @max_id + 1; +INSERT IGNORE INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, is_frame, is_cache, menu_type, visible, status, icon, create_by, create_time, update_by, update_time) +VALUES (@id_review_dir, '评审流程', @parent_quality, 5, 'review', 1, 0, 'M', '0', '0', 'guide', 'admin', NOW(), 'admin', NOW()); + +-- ==================== 3. 在评审流程下创建子菜单 ==================== +SET @parent = @id_review_dir; +SET @id = @max_id + 2; + +-- 次品钢卷 (order=4) +INSERT IGNORE INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, icon, create_by, create_time) +VALUES (@id, '次品钢卷', @parent, 4, 'rubbish', 'wms/coil/views/scrap', 1, 0, 'C', '0', '0', 'checkbox', 'admin', NOW()); +SET @id = @id + 1; + +-- O级卷 (order=5) +INSERT IGNORE INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, icon, create_by, create_time) +VALUES (@id, 'O级卷', @parent, 5, 'jishu', 'wms/coil/views/jishu', 1, 0, 'C', '0', '0', 'checkbox', 'admin', NOW()); +SET @id = @id + 1; + +-- 质量评审 (order=6) +SET @id_review_menu = @id; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time) +VALUES (@id_review_menu, '质量评审', @parent, 6, 'qualityReview', 'mes/qc/qualityReview/index', 1, 0, 'C', '0', '0', 'qc:qualityReview:list', 'guide', 'admin', NOW()); +SET @id = @id + 1; + +-- 质量评审待审批 (order=7, 隐藏) +SET @id_review_todo = @id; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time) +VALUES (@id_review_todo, '质量评审待审批', @parent, 7, 'qualityReviewTodo', 'mes/qc/qualityReview/todo', 1, 0, 'C', '1', '0', 'qc:qualityReview:approve', 'checkbox', 'admin', NOW()); +SET @id = @id + 1; + +-- ==================== 4. 按钮权限（挂在质量评审菜单下） ==================== +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, menu_type, visible, status, perms, create_by, create_time) +VALUES (@id, '质量评审新增', @id_review_menu, 1, 'F', '0', '0', 'qc:qualityReview:add', 'admin', NOW()); SET @id = @id + 1; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, menu_type, visible, status, perms, create_by, create_time) +VALUES (@id, '质量评审修改', @id_review_menu, 2, 'F', '0', '0', 'qc:qualityReview:edit', 'admin', NOW()); SET @id = @id + 1; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, menu_type, visible, status, perms, create_by, create_time) +VALUES (@id, '质量评审删除', @id_review_menu, 3, 'F', '0', '0', 'qc:qualityReview:delete', 'admin', NOW()); SET @id = @id + 1; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, menu_type, visible, status, perms, create_by, create_time) +VALUES (@id, '质量评审提交送审', @id_review_menu, 4, 'F', '0', '0', 'qc:qualityReview:submit', 'admin', NOW()); SET @id = @id + 1; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, menu_type, visible, status, perms, create_by, create_time) +VALUES (@id, '质量评审审批', @id_review_menu, 5, 'F', '0', '0', 'qc:qualityReview:approve', 'admin', NOW()); SET @id = @id + 1; +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, menu_type, visible, status, perms, create_by, create_time) +VALUES (@id, '质量评审执行改判', @id_review_menu, 6, 'F', '0', '0', 'qc:qualityReview:execute', 'admin', NOW()); + +-- ==================== 5. 授权admin角色 ==================== +INSERT IGNORE INTO sys_role_menu (role_id, menu_id) VALUES +(1, @parent_quality), (1, @id_review_dir), +(1, @id_review_menu), (1, @id_review_todo); +-- 按钮权限 +INSERT IGNORE INTO sys_role_menu (role_id, menu_id) SELECT 1, menu_id FROM sys_menu WHERE parent_id = @id_review_menu AND menu_type = 'F'; + +-- ==================== 6. 验证 ==================== +SELECT 'Dev align OK' AS result; diff --git a/klp-pt/src/main/java/com/klp/pt/controller/PtProductToleranceController.java b/klp-pt/src/main/java/com/klp/pt/controller/PtProductToleranceController.java index c45a70796..a19c0a164 100644 --- a/klp-pt/src/main/java/com/klp/pt/controller/PtProductToleranceController.java +++ b/klp-pt/src/main/java/com/klp/pt/controller/PtProductToleranceController.java @@ -1,4 +1,4 @@ -package com.klp.controller; +package com.klp.pt.controller; import java.util.List; import java.util.Arrays; @@ -17,9 +17,9 @@ import com.klp.common.core.validate.AddGroup; import com.klp.common.core.validate.EditGroup; import com.klp.common.enums.BusinessType; import com.klp.common.utils.poi.ExcelUtil; -import com.klp.domain.vo.PtProductToleranceVo; -import com.klp.domain.bo.PtProductToleranceBo; -import com.klp.service.IPtProductToleranceService; +import com.klp.pt.domain.vo.PtProductToleranceVo; +import com.klp.pt.domain.bo.PtProductToleranceBo; +import com.klp.pt.service.IPtProductToleranceService; import com.klp.common.core.page.TableDataInfo; /** diff --git a/klp-pt/src/main/java/com/klp/pt/domain/PtProductTolerance.java b/klp-pt/src/main/java/com/klp/pt/domain/PtProductTolerance.java index e52493e34..ff4620bfb 100644 --- a/klp-pt/src/main/java/com/klp/pt/domain/PtProductTolerance.java +++ b/klp-pt/src/main/java/com/klp/pt/domain/PtProductTolerance.java @@ -1,4 +1,4 @@ -package com.klp.domain; +package com.klp.pt.domain; import com.baomidou.mybatisplus.annotation.*; import com.klp.common.core.domain.BaseEntity; diff --git a/klp-pt/src/main/java/com/klp/pt/domain/bo/PtProductToleranceBo.java b/klp-pt/src/main/java/com/klp/pt/domain/bo/PtProductToleranceBo.java index 854a5da01..e150c7628 100644 --- a/klp-pt/src/main/java/com/klp/pt/domain/bo/PtProductToleranceBo.java +++ b/klp-pt/src/main/java/com/klp/pt/domain/bo/PtProductToleranceBo.java @@ -1,4 +1,4 @@ -package com.klp.domain.bo; +package com.klp.pt.domain.bo; import com.klp.common.core.domain.BaseEntity; import lombok.Data; diff --git a/klp-pt/src/main/java/com/klp/pt/domain/vo/PtProductToleranceVo.java b/klp-pt/src/main/java/com/klp/pt/domain/vo/PtProductToleranceVo.java index cdb472bbc..5218432a2 100644 --- a/klp-pt/src/main/java/com/klp/pt/domain/vo/PtProductToleranceVo.java +++ b/klp-pt/src/main/java/com/klp/pt/domain/vo/PtProductToleranceVo.java @@ -1,4 +1,4 @@ -package com.klp.domain.vo; +package com.klp.pt.domain.vo; import java.math.BigDecimal; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; diff --git a/klp-pt/src/main/java/com/klp/pt/mapper/PtProductToleranceMapper.java b/klp-pt/src/main/java/com/klp/pt/mapper/PtProductToleranceMapper.java index 7425f1a9a..13dfc0a4b 100644 --- a/klp-pt/src/main/java/com/klp/pt/mapper/PtProductToleranceMapper.java +++ b/klp-pt/src/main/java/com/klp/pt/mapper/PtProductToleranceMapper.java @@ -1,7 +1,7 @@ -package com.klp.mapper; +package com.klp.pt.mapper; -import com.klp.domain.PtProductTolerance; -import com.klp.domain.vo.PtProductToleranceVo; +import com.klp.pt.domain.PtProductTolerance; +import com.klp.pt.domain.vo.PtProductToleranceVo; import com.klp.common.core.mapper.BaseMapperPlus; /** diff --git a/klp-pt/src/main/java/com/klp/pt/service/IPtProductToleranceService.java b/klp-pt/src/main/java/com/klp/pt/service/IPtProductToleranceService.java index e2605d15d..500a19f08 100644 --- a/klp-pt/src/main/java/com/klp/pt/service/IPtProductToleranceService.java +++ b/klp-pt/src/main/java/com/klp/pt/service/IPtProductToleranceService.java @@ -1,8 +1,8 @@ -package com.klp.service; +package com.klp.pt.service; -import com.klp.domain.PtProductTolerance; -import com.klp.domain.vo.PtProductToleranceVo; -import com.klp.domain.bo.PtProductToleranceBo; +import com.klp.pt.domain.PtProductTolerance; +import com.klp.pt.domain.vo.PtProductToleranceVo; +import com.klp.pt.domain.bo.PtProductToleranceBo; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; diff --git a/klp-pt/src/main/java/com/klp/pt/service/impl/PtProductToleranceServiceImpl.java b/klp-pt/src/main/java/com/klp/pt/service/impl/PtProductToleranceServiceImpl.java index dded8985f..e0a25740a 100644 --- a/klp-pt/src/main/java/com/klp/pt/service/impl/PtProductToleranceServiceImpl.java +++ b/klp-pt/src/main/java/com/klp/pt/service/impl/PtProductToleranceServiceImpl.java @@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import com.klp.domain.bo.PtProductToleranceBo; -import com.klp.domain.vo.PtProductToleranceVo; -import com.klp.domain.PtProductTolerance; -import com.klp.mapper.PtProductToleranceMapper; -import com.klp.service.IPtProductToleranceService; +import com.klp.pt.domain.bo.PtProductToleranceBo; +import com.klp.pt.domain.vo.PtProductToleranceVo; +import com.klp.pt.domain.PtProductTolerance; +import com.klp.pt.mapper.PtProductToleranceMapper; +import com.klp.pt.service.IPtProductToleranceService; import java.util.List; import java.util.Map; diff --git a/klp-pt/src/main/resources/mapper/pt/PtProductToleranceMapper.xml b/klp-pt/src/main/resources/mapper/pt/PtProductToleranceMapper.xml index 9ae5d3732..ef63d45b1 100644 --- a/klp-pt/src/main/resources/mapper/pt/PtProductToleranceMapper.xml +++ b/klp-pt/src/main/resources/mapper/pt/PtProductToleranceMapper.xml @@ -2,9 +2,9 @@ - + - +