From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java
index 88c5280..8f03254 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java
@@ -5,6 +5,9 @@
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmImportExcelVO;
@@ -60,8 +63,16 @@
*/
private static final String TECH_CONFIRM_APPROVE_BIZ_TYPE = "pd_tech_confirm_approve";
+ /**
+ * 鎶�鏈‘璁ゅ嚱瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String TECH_CONFIRM_APPROVE_PROCESS_KEY = "pd_tech_confirm_approve";
+
@Resource
private ProductTechConfirmMapper techConfirmMapper;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@@ -145,6 +156,30 @@
// 鐢� UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鏇存柊绛栫暐浼氬拷鐣� null锛�
// 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜� / 瀹℃牳鏃堕棿 / 瀹℃牳鎰忚鐪熸娓呯┖銆�
techConfirmMapper.submitAndResetAuditInfo(id, MesPdTechConfirmStatusEnum.PENDING_AUDIT.getStatus());
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(TECH_CONFIRM_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateTechConfirmAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓虹‘璁ゅ嚱鐘舵�侊細閫氳繃=宸插鏍� / 涓嶉�氳繃=瀹℃牳涓嶉�氳繃锛堝彲淇敼鍚庨噸鏂版彁浜わ級
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = MesPdTechConfirmStatusEnum.AUDITED.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = MesPdTechConfirmStatusEnum.REJECTED.getStatus();
+ } else {
+ // 鎶�鏈‘璁ゅ嚱娌℃湁銆屽凡鍙栨秷銆嶇姸鎬侊紝鍏朵綑 BPM 缁撴灉锛堝鎾ゆ秷锛夊拷鐣�
+ log.warn("[updateTechConfirmAuditStatus] 蹇界暐涓嶆敮鎸佺殑 BPM 鐘舵��({})锛宼echConfirmId={}", bpmStatus, id);
+ return;
+ }
+ if (techConfirmMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateTechConfirmAuditStatus] 鎶�鏈‘璁ゅ嚱({}) 涓嶅浜庡緟瀹℃牳鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
@Override
--
Gitblit v1.9.3