From 1d56cb54d8e606547ba5e763cade1c3e26c46be9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 07 九月 2026 18:05:50 +0800
Subject: [PATCH] feat(mes): 为MES仓储模块添加BPM审批流程支持
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
index 8861bc8..c179604 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
@@ -15,13 +15,21 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+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.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
-import java.util.List;
+import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -42,6 +50,10 @@
private MesWmMiscIssueLineService miscIssueLineService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Override
public Long createMiscIssue(MesWmMiscIssueSaveReqVO createReqVO) {
@@ -91,7 +103,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitMiscIssue(Long id) {
+ public void submitMiscIssueApproval(Long id, String processDefinitionKey) {
// 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateMiscIssueExistsAndDraft(id);
// 鏍￠獙鑷冲皯鏈変竴鏉¤
@@ -99,10 +111,87 @@
if (CollUtil.isEmpty(lines)) {
throw exception(WM_MISC_ISSUE_NO_LINE);
}
-
- // 鎻愪氦锛堣崏绋� 鈫� 寰呮墽琛屽嚭搴擄級
+ // 鍒涘缓 BPM 娴佺▼瀹炰緥
+ String processInstanceId = processInstanceApi.createProcessInstance(getCurrentUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+ // 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 瀹℃壒涓級
miscIssueMapper.updateById(new MesWmMiscIssueDO()
- .setId(id).setStatus(MesWmMiscIssueStatusEnum.APPROVED.getStatus()));
+ .setId(id)
+ .setStatus(MesWmMiscIssueStatusEnum.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ public List<Map<String, Object>> getMiscIssueApprovalProcessDefinitionList() {
+ return getProcessDefinitionListByCategory(APPROVE_CATEGORY_CODE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateMiscIssueAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ MesWmMiscIssueDO issue = validateMiscIssueExists(id);
+ if (!MesWmMiscIssueStatusEnum.APPROVING.getStatus().equals(issue.getStatus())) {
+ log.warn("[updateMiscIssueAuditStatus] 鏉傞」鍑哄簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ return;
+ }
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToStatus(bpmResult);
+ if (newStatus != null) {
+ miscIssueMapper.updateById(new MesWmMiscIssueDO().setId(id).setStatus(newStatus));
+ }
+ }
+
+ private Integer convertBpmResultToStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return MesWmMiscIssueStatusEnum.APPROVED.getStatus();
+ }
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return MesWmMiscIssueStatusEnum.PREPARE.getStatus();
+ }
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return MesWmMiscIssueStatusEnum.CANCELED.getStatus();
+ }
+ return null;
+ }
+
+ private List<Map<String, Object>> getProcessDefinitionListByCategory(String categoryCode) {
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(categoryCode);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+ // 杩囨护婵�娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
+ ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
+ if (pd == null || pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ result.add(item);
+ }
+ return result;
+ }
+
+ private Long getCurrentUserId() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null && authentication.getPrincipal() instanceof Long) {
+ return (Long) authentication.getPrincipal();
+ }
+ return 1L; // 榛樿鐢ㄦ埛
}
@Override
--
Gitblit v1.9.3