chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新配合示方模块，新增密炼PS审批联动功能，支持状态与审批人同步，优化相关服务实现，调整数据库状态字典，增强系统数据一致性和用户体验。

Browse Source
This commit is contained in:
geht
2026-05-22 12:15:05 +08:00
parent 89407d1f1d
commit 680eb6c54c
6 changed files with 116 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_97__mes_xsl_formula_spec_status_dict.sql Normal file
View File

@@ -0,0 +1,45 @@
-- 配合示方状态字典：编制/提交审批/检讨审批/承认审批/作废/尚未到生效期
SET NAMES utf8mb4;
UPDATE `sys_dict`
SET `description` = 'MES配合示方状态（编制/提交审批/检讨/承认/作废/生效期）', `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000000013';
UPDATE `sys_dict_item`
SET `item_text` = '编制', `item_value` = 'compile', `sort_order` = 1, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001031';
UPDATE `sys_dict_item`
SET `item_text` = '提交审批', `item_value` = 'submit', `sort_order` = 2, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001032';
UPDATE `sys_dict_item`
SET `item_text` = '检讨审批通过', `item_value` = 'review_pass', `sort_order` = 3, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001033';
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
VALUES ('1995000000000001037', '1995000000000000013', '检讨审批退回', 'review_return', 4, 1, 'admin', NOW());
UPDATE `sys_dict_item`
SET `item_text` = '承认审批通过-即正式发布', `item_value` = 'recognition_pass', `sort_order` = 5, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001034';
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
VALUES ('1995000000000001038', '1995000000000000013', '承认审批退回', 'recognition_return', 6, 1, 'admin', NOW());
UPDATE `sys_dict_item`
SET `item_text` = '作废', `item_value` = 'obsolete', `sort_order` = 7, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001035';
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
VALUES ('1995000000000001039', '1995000000000000013', '尚未到生效期', 'not_effective', 8, 1, 'admin', NOW());
UPDATE `sys_dict_item` SET `status` = 0, `update_by` = 'admin', `update_time` = NOW()
WHERE `dict_id` = '1995000000000000013' AND `id` = '1995000000000001036';
UPDATE `mes_xsl_formula_spec` SET `status` = 'submit' WHERE `status` = 'proofread';
UPDATE `mes_xsl_formula_spec` SET `status` = 'review_pass' WHERE `status` = 'audit';
UPDATE `mes_xsl_formula_spec` SET `status` = 'recognition_pass' WHERE `status` IN ('approve', 'released');
ALTER TABLE `mes_xsl_formula_spec`
MODIFY COLUMN `status` varchar(32) DEFAULT 'compile' COMMENT '状态（字典xslmes_formula_spec_status：compile编制 submit提交审批 review_pass检讨通过 review_return检讨退回 recognition_pass承认通过 recognition_return承认退回 obsolete作废 not_effective尚未生效）';