From a08832337f8de6a53edebbab1fb0b5a3bd1785aa Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 17:23:04 +0800
Subject: [PATCH] feat(srm): 供应商准入审核接入协同办公(BPM)
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java | 173 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 130 insertions(+), 43 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
index 9a1a9f3..3601894 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
@@ -1,9 +1,17 @@
package cn.iocoder.yudao.module.srm.service.apply;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+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.BpmCategoryDO;
+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.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplyPageReqVO;
import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplySaveReqVO;
import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierApplyDO;
@@ -13,24 +21,47 @@
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.srm.enums.SupplierApplyStatusEnum;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* SRM 渚涘簲鍟嗗噯鍏ョ敵璇� Service 瀹炵幇绫�
+ *
+ * 鎺ュ叆鍗忓悓鍔炲叕(BPM)鍚�,閲囪喘/璐ㄩ噺/璐㈠姟瀹℃牳鍦ㄥ崗鍚屽姙鍏祦绋嬩腑瀹屾垚,
+ * SRM 渚у彧璐熻矗鍙戣捣娴佺▼骞舵帴鏀舵祦绋嬬粨鏉熶簨浠跺洖鍐欑姸鎬併��
*/
@Service
@Validated
+@Slf4j
public class SrmSupplierApplyServiceImpl implements SrmSupplierApplyService {
+
+ /**
+ * BPM 渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫荤紪鐮�
+ */
+ private static final String SUPPLIER_APPLY_APPROVE_CATEGORY_CODE = "supplier_apply_approve";
@Resource
private SrmSupplierApplyMapper supplierApplyMapper;
@Resource
private SrmSupplierMapper supplierMapper;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Override
public Long createApply(SrmSupplierApplySaveReqVO createReqVO) {
@@ -54,7 +85,9 @@
@Override
public void updateApply(SrmSupplierApplySaveReqVO updateReqVO) {
SrmSupplierApplyDO apply = validateApplyExists(updateReqVO.getId());
- if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())) {
+ // 浠呭緟鎻愪氦/宸查┏鍥炲彲缂栬緫
+ if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())
+ && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT);
}
// 鏍￠獙锛氬繀椤婚�夋嫨 SRM 渚涘簲鍟嗘垨鎵嬪姩濉啓渚涘簲鍟嗗悕绉�
@@ -72,7 +105,12 @@
@Override
public void deleteApply(Long id) {
- validateApplyExists(id);
+ SrmSupplierApplyDO apply = validateApplyExists(id);
+ // 浠呭緟鎻愪氦/宸查┏鍥炲彲鍒犻櫎
+ if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())
+ && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT);
+ }
supplierApplyMapper.deleteById(id);
}
@@ -88,59 +126,83 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitApply(Long id) {
+ public void submitApply(Long id, String processDefinitionKey, Long userId) {
+ // 1. 鏍￠獙瀛樺湪 + 寰呮彁浜�/宸查┏鍥炵姸鎬�
SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())) {
+ if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())
+ && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT);
}
- apply.setApplyStatus(SupplierApplyStatusEnum.PENDING_PURCHASE.getCode());
- apply.setApplyTime(LocalDateTime.now());
- supplierApplyMapper.updateById(apply);
+ // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堥噰璐鏍糕啋璐ㄩ噺瀹℃牳鈫掕储鍔″鏍革紝娴佺▼涓庡鎵逛汉鍦ㄥ崗鍚屽姙鍏厤缃級
+ String processInstanceId = processInstanceApi.createProcessInstance(userId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+ // 3. 鏇存柊鐢宠鐘舵�佷负瀹℃壒涓紝鍥炲瓨娴佺▼瀹炰緥缂栧彿
+ supplierApplyMapper.updateById(new SrmSupplierApplyDO()
+ .setId(id)
+ .setApplyStatus(SupplierApplyStatusEnum.PROCESS.getCode())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ public List<Map<String, Object>> getSupplierApplyApproveProcessDefinitionList() {
+ // 1. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
+ validateSupplierApplyApproveCategoryAndProcessDefinition();
+
+ // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SUPPLIER_APPLY_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+
+ // 3. 閬嶅巻鑾峰彇娴佺▼瀹氫箟璇︽儏锛岃繃婊ゆ縺娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ 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);
+ }
+ }
+
+ // 4. 杩斿洖娴佺▼瀹氫箟鍒楄〃
+ 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;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void reviewPurchase(Long id, String opinion, Boolean passed) {
+ public void updateSupplierApplyAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.PENDING_PURCHASE.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_PENDING);
+ if (!SupplierApplyStatusEnum.PROCESS.getCode().equals(apply.getApplyStatus())) {
+ log.warn("[updateSupplierApplyAuditStatus] 鍑嗗叆鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ return;
}
- apply.setPurchaseReviewOpinion(opinion);
- apply.setPurchaseReviewTime(LocalDateTime.now());
- apply.setApplyStatus(Boolean.TRUE.equals(passed)
- ? SupplierApplyStatusEnum.PENDING_QUALITY.getCode()
- : SupplierApplyStatusEnum.REJECTED.getCode());
- supplierApplyMapper.updateById(apply);
- }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void reviewQuality(Long id, String opinion, Boolean passed) {
- SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.PENDING_QUALITY.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_PENDING);
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToStatus(bpmResult);
+ if (newStatus != null) {
+ supplierApplyMapper.updateById(new SrmSupplierApplyDO()
+ .setId(id).setApplyStatus(newStatus));
}
- apply.setQualityReviewOpinion(opinion);
- apply.setQualityReviewTime(LocalDateTime.now());
- apply.setApplyStatus(Boolean.TRUE.equals(passed)
- ? SupplierApplyStatusEnum.PENDING_FINANCE.getCode()
- : SupplierApplyStatusEnum.REJECTED.getCode());
- supplierApplyMapper.updateById(apply);
- }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void reviewFinance(Long id, String opinion, Boolean passed) {
- SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.PENDING_FINANCE.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_PENDING);
+ // 3. 瀹℃壒閫氳繃锛氳嚜鍔ㄥ垱寤�/鍏宠仈渚涘簲鍟嗘。妗�
+ if (SupplierApplyStatusEnum.APPROVED.getCode().equals(newStatus)) {
+ approve(id);
}
- apply.setFinanceReviewOpinion(opinion);
- apply.setFinanceReviewTime(LocalDateTime.now());
- apply.setApplyStatus(Boolean.TRUE.equals(passed)
- ? SupplierApplyStatusEnum.APPROVED.getCode()
- : SupplierApplyStatusEnum.REJECTED.getCode());
- supplierApplyMapper.updateById(apply);
}
@Override
@@ -158,7 +220,7 @@
if (supplierApplyMapper.existsApprovedBySupplierId(supplierId)) {
return;
}
- // 鑷姩鍒涘缓鍑嗗叆鐢宠骞剁洿鎺ョ疆涓哄凡閫氳繃
+ // 鑷姩鍒涘缓鍑嗗叆鐢宠骞剁洿鎺ョ疆涓哄凡閫氳繃锛堝畾鏍囪嚜鍔ㄥ噯鍏ワ紝涓嶈蛋鍗忓悓鍔炲叕锛�
SrmSupplierApplyDO apply = new SrmSupplierApplyDO();
apply.setApplyNo(generateApplyNo());
apply.setSupplierId(supplierId);
@@ -221,6 +283,31 @@
}
/**
+ * 鏍￠獙渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫诲瓨鍦�
+ */
+ private void validateSupplierApplyApproveCategoryAndProcessDefinition() {
+ List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
+ Collections.singletonList(SUPPLIER_APPLY_APPROVE_CATEGORY_CODE));
+ if (CollUtil.isEmpty(categories)) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_BPM_CATEGORY_NOT_EXISTS);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓轰笟鍔＄姸鎬�
+ */
+ private Integer convertBpmResultToStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return SupplierApplyStatusEnum.APPROVED.getCode();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return SupplierApplyStatusEnum.REJECTED.getCode();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return SupplierApplyStatusEnum.CANCEL.getCode();
+ }
+ return null;
+ }
+
+ /**
* 鐢熸垚鐢宠缂栧彿
*/
private String generateApplyNo() {
--
Gitblit v1.9.3