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)
---
/dev/null | 22 ---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java | 31 +++--
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java | 1
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java | 3
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java | 173 +++++++++++++++++++++-------
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java | 2
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java | 48 ++-----
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java | 11 +
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java | 52 ++++++++
9 files changed, 226 insertions(+), 117 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java
index 3fa0e12..140a2a4 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java
@@ -15,7 +15,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import java.util.Map;
+
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - SRM 渚涘簲鍟嗗噯鍏�")
@RestController
@@ -66,45 +70,19 @@
}
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦鐢宠")
- @Parameter(name = "id", description = "缂栧彿", required = true)
+ @Operation(summary = "鎻愪氦鍑嗗叆鐢宠瀹℃壒锛堝惎鍔ㄥ崗鍚屽姙鍏祦绋嬶級")
@PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> submitApply(@RequestParam("id") Long id) {
- applyService.submitApply(id);
+ public CommonResult<Boolean> submitApply(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ applyService.submitApply(id, processDefinitionKey, getLoginUserId());
return success(true);
}
- @PutMapping("/review-purchase")
- @Operation(summary = "閲囪喘瀹℃牳")
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> reviewPurchase(@Valid @RequestBody SrmSupplierApplyReviewReqVO reqVO) {
- applyService.reviewPurchase(reqVO.getId(), reqVO.getOpinion(), reqVO.getPassed());
- return success(true);
- }
-
- @PutMapping("/review-quality")
- @Operation(summary = "璐ㄩ噺瀹℃牳")
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> reviewQuality(@Valid @RequestBody SrmSupplierApplyReviewReqVO reqVO) {
- applyService.reviewQuality(reqVO.getId(), reqVO.getOpinion(), reqVO.getPassed());
- return success(true);
- }
-
- @PutMapping("/review-finance")
- @Operation(summary = "璐㈠姟瀹℃牳")
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> reviewFinance(@Valid @RequestBody SrmSupplierApplyReviewReqVO reqVO) {
- applyService.reviewFinance(reqVO.getId(), reqVO.getOpinion(), reqVO.getPassed());
- return success(true);
- }
-
- @PutMapping("/approve")
- @Operation(summary = "閫氳繃鍚庤嚜鍔ㄥ垱寤轰緵搴斿晢")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> approve(@RequestParam("id") Long id) {
- applyService.approve(id);
- return success(true);
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇鍑嗗叆鐢宠瀹℃壒娴佺▼鍒楄〃")
+ @PreAuthorize("@ss.hasPermission('srm:supplier-apply:query')")
+ public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
+ return success(applyService.getSupplierApplyApproveProcessDefinitionList());
}
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
index 47f69b1..eb2b6e6 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
@@ -70,6 +70,9 @@
@Schema(description = "鐢宠鐘舵��", example = "0")
private Integer applyStatus;
+ @Schema(description = "BPM 娴佺▼瀹炰緥缂栧彿", example = "1a2b3c4d")
+ private String processInstanceId;
+
@Schema(description = "閲囪喘瀹℃牳浜篒D", example = "2")
private Long purchaseReviewerId;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyReviewReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyReviewReqVO.java
deleted file mode 100644
index 2135775..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyReviewReqVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.apply.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠＄悊鍚庡彴 - SRM 渚涘簲鍟嗗噯鍏ョ敵璇峰鏍� Request VO")
-@Data
-public class SrmSupplierApplyReviewReqVO {
-
- @Schema(description = "鐢宠ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鐢宠ID涓嶈兘涓虹┖")
- private Long id;
-
- @Schema(description = "瀹℃牳鎰忚", example = "閫氳繃")
- private String opinion;
-
- @Schema(description = "鏄惁閫氳繃", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "瀹℃牳缁撴灉涓嶈兘涓虹┖")
- private Boolean passed;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
index 8c0d57b..169f2df 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
@@ -44,6 +44,7 @@
private String applyUserName;
private LocalDateTime applyTime;
private Integer applyStatus;
+ private String processInstanceId;
private Long purchaseReviewerId;
private LocalDateTime purchaseReviewTime;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java
index 3c112d2..fb42aa5 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java
@@ -21,6 +21,8 @@
ErrorCode APPLY_STATUS_NOT_PENDING = new ErrorCode(1_040_200_002, "褰撳墠鐘舵�佷笉鍏佽瀹℃牳");
ErrorCode APPLY_SUPPLIER_EXISTS = new ErrorCode(1_040_200_003, "璇ヤ緵搴斿晢宸插瓨鍦ㄥ噯鍏ヨ褰�");
ErrorCode APPLY_SUPPLIER_NAME_REQUIRED = new ErrorCode(1_040_200_004, "鏈�夋嫨SRM渚涘簲鍟嗘椂锛屼緵搴斿晢鍚嶇О涓嶈兘涓虹┖");
+ ErrorCode APPLY_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_040_200_005, "渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫讳笉瀛樺湪锛岃鍏堝湪BPM妯″潡鍒涘缓渚涘簲鍟嗗噯鍏ュ鎵规祦绋嬪垎绫�");
+ ErrorCode APPLY_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_040_200_006, "渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫讳笅娌℃湁鍙敤鐨勬祦绋嬫ā鍨嬶紝璇峰厛鍒涘缓骞跺彂甯冩祦绋�");
// ========== 渚涘簲鍟嗚祫璐� 1_040_300_000 ==========
ErrorCode CERTIFICATE_NOT_EXISTS = new ErrorCode(1_040_300_000, "璧勮川璇佷功涓嶅瓨鍦�");
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java
index 25924cb..ccfd1c3 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java
@@ -4,16 +4,19 @@
/**
* 渚涘簲鍟嗗噯鍏ョ敵璇风姸鎬佹灇涓�
+ *
+ * 鎺ュ叆鍗忓悓鍔炲叕(BPM)鍚�,SRM 渚у彧鎰熺煡娴佺▼鏈�缁堢粨鏋�,褰撳墠瀹℃壒杩涘害鍦ㄥ崗鍚屽姙鍏煡鐪嬨��
+ * 鍘嗗彶鐘舵��(寰呴噰璐鏍� 10 / 寰呰川閲忓鏍� 20 / 寰呰储鍔″鏍� 30)宸插簾寮�,
+ * 鐢� SQL 鑴氭湰缁熶竴杩佺Щ:鍘嗗彶瀹℃壒涓崟鎹噸缃负銆屽緟鎻愪氦銆�,閲嶆柊鎻愪氦璧板崗鍚屽姙鍏��
*/
@Getter
public enum SupplierApplyStatusEnum {
DRAFT(0, "寰呮彁浜�"),
- PENDING_PURCHASE(10, "寰呴噰璐鏍�"),
- PENDING_QUALITY(20, "寰呰川閲忓鏍�"),
- PENDING_FINANCE(30, "寰呰储鍔″鏍�"),
+ PROCESS(10, "瀹℃壒涓�"),
+ CANCEL(30, "宸插彇娑�"),
APPROVED(40, "宸查�氳繃"),
- REJECTED(50, "宸叉嫆缁�");
+ REJECTED(50, "宸查┏鍥�");
SupplierApplyStatusEnum(Integer code, String name) {
this.code = code;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java
index ba759ca..fb3603f 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java
@@ -6,6 +6,9 @@
import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierApplyDO;
import jakarta.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
/**
* SRM 渚涘簲鍟嗗噯鍏ョ敵璇� Service 鎺ュ彛
*/
@@ -37,32 +40,34 @@
PageResult<SrmSupplierApplyDO> getApplyPage(SrmSupplierApplyPageReqVO pageReqVO);
/**
- * 鎻愪氦鐢宠锛堝緟閲囪喘瀹℃牳锛�
+ * 鎻愪氦鐢宠锛堝惎鍔ㄥ崗鍚屽姙鍏祦绋嬶紝鐘舵�佺疆涓哄鎵逛腑锛�
+ *
+ * @param id 鐢宠缂栧彿
+ * @param processDefinitionKey 鍗忓悓鍔炲叕娴佺▼瀹氫箟 Key
+ * @param userId 鎻愪氦浜虹紪鍙�
*/
- void submitApply(Long id);
+ void submitApply(Long id, String processDefinitionKey, Long userId);
/**
- * 閲囪喘瀹℃牳
+ * 鑾峰彇渚涘簲鍟嗗噯鍏ュ鎵规祦绋嬪垪琛紙鍗忓悓鍔炲叕宸插彂甯冧笖婵�娲荤殑娴佺▼锛�
*/
- void reviewPurchase(Long id, String opinion, Boolean passed);
+ List<Map<String, Object>> getSupplierApplyApproveProcessDefinitionList();
/**
- * 璐ㄩ噺瀹℃牳
+ * 鍗忓悓鍔炲叕娴佺▼缁撴灉鍥炲啓
+ *
+ * @param id 鐢宠缂栧彿
+ * @param bpmResult 娴佺▼缁撴灉锛坽@link cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum}锛�
*/
- void reviewQuality(Long id, String opinion, Boolean passed);
+ void updateSupplierApplyAuditStatus(Long id, Integer bpmResult);
/**
- * 璐㈠姟瀹℃牳
- */
- void reviewFinance(Long id, String opinion, Boolean passed);
-
- /**
- * 閫氳繃鍚庤嚜鍔ㄥ垱寤轰緵搴斿晢
+ * 瀹℃壒閫氳繃鍚庤嚜鍔ㄥ垱寤轰緵搴斿晢
*/
void approve(Long id);
/**
- * 纭繚渚涘簲鍟嗗凡鍑嗗叆锛氭湭鍑嗗叆鍒欒嚜鍔ㄥ垱寤哄噯鍏ョ敵璇峰苟缃负宸查�氳繃
+ * 纭繚渚涘簲鍟嗗凡鍑嗗叆锛氭湭鍑嗗叆鍒欒嚜鍔ㄥ垱寤哄噯鍏ョ敵璇峰苟缃负宸查�氳繃锛堝畾鏍囪嚜鍔ㄥ噯鍏ワ紝涓嶈蛋鍗忓悓鍔炲叕锛�
*
* @param supplierId 渚涘簲鍟嗙紪鍙�
*/
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() {
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java
new file mode 100644
index 0000000..8435fcb
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.srm.service.apply.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 渚涘簲鍟嗗噯鍏ュ鎵圭姸鎬佺洃鍚櫒
+ *
+ * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鏇存柊鍑嗗叆鐢宠鐨勫鎵圭姸鎬侊紙鍗忓悓鍔炲叕瀹℃壒鍚庡洖鍐欙級
+ */
+@Component
+@Slf4j
+public class SrmSupplierApplyStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ /**
+ * 渚涘簲鍟嗗噯鍏ュ鎵规祦绋嬪畾涔� Key
+ */
+ private static final String PROCESS_DEFINITION_KEY = "supplier_apply_approve";
+
+ @Resource
+ private SrmSupplierApplyService supplierApplyService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ Long applyId;
+ try {
+ applyId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨勫噯鍏ョ敵璇风紪鍙�", event.getBusinessKey());
+ return;
+ }
+
+ log.info("[onEvent] 鏀跺埌BPM瀹℃壒浜嬩欢锛宎pplyId={}, status={}", applyId, event.getStatus());
+
+ try {
+ supplierApplyService.updateSupplierApplyAuditStatus(applyId, event.getStatus());
+ log.info("[onEvent] 鍑嗗叆鐢宠({}) 瀹℃壒鐘舵�佹洿鏂板畬鎴�", applyId);
+ } catch (Exception e) {
+ log.error("[onEvent] 鏇存柊鍑嗗叆鐢宠瀹℃壒鐘舵�佸け璐ワ紝applyId={}", applyId, e);
+ }
+ }
+
+}
--
Gitblit v1.9.3