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

完善MES审批流设计功能，新增审批可选回调动作、发起人撤销及催办接口，支持审批状态恢复与联动回退，提升审批流程的灵活性与用户体验。

Browse Source
This commit is contained in:
geht
2026-05-29 18:57:09 +08:00
parent aefa44b8a9
commit 0ff4a201b0
33 changed files with 1617 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,14 @@
-- 【QH-MES审批流设计】驳回/撤销恢复初始状态：审批流配置状态字段名，实例快照发起时业务状态原值
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_approval_flow`
ADD COLUMN `status_field` varchar(64) DEFAULT NULL COMMENT '业务单据状态字段名(驳回/撤销时回写其发起时原值)' AFTER `route_path`;
ALTER TABLE `mes_xsl_approval_instance`
ADD COLUMN `status_field` varchar(64) DEFAULT NULL COMMENT '业务单据状态字段名(发起时快照)' AFTER `biz_title`,
ADD COLUMN `origin_status` varchar(64) DEFAULT NULL COMMENT '发起审批时业务状态原值(驳回/撤销回写)' AFTER `status_field`;
-- 密炼PS编制默认以 status 字段作为可恢复状态字段
UPDATE `mes_xsl_approval_flow`
SET `status_field` = 'status'
WHERE `biz_table` = 'mes_xsl_mixer_ps_compile' AND (`status_field` IS NULL OR `status_field` = '');

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

@@ -0,0 +1,10 @@
-- 【QH-MES审批流完善】①乐观锁防并发 ②超时配置 ③催办记录时间
SET NAMES utf8mb4;
-- 审批实例：乐观锁版本号，防止多人同时审批导致进度覆盖写
ALTER TABLE `mes_xsl_approval_instance`
ADD COLUMN `version` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁版本号' AFTER `remark`;
-- 审批流定义：超时提醒小时数（0=不提醒），默认24h
ALTER TABLE `mes_xsl_approval_flow`
ADD COLUMN `timeout_hours` int(11) NOT NULL DEFAULT 24 COMMENT '超时提醒小时数(0=不提醒)' AFTER `status_field`;