From ccdebc5369c108e6616550bfbe1cd47ec1e05813 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 11:44:31 +0800
Subject: [PATCH] feat(bpm): 接入询价单与项目用印审批流程
---
sql/mysql/20261109_pd_seal.sql | 32 ++++
yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalTest.java | 35 ++++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java | 48 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java | 95 +++++++++++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java | 1
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java | 8 +
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java | 86 +++++++++-
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 12
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java | 2
sql/mysql/srm_inquiry_approval_20261109.sql | 3
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalListener.java | 20 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealStatusListener.java | 11 +
sql/bpm/hrm-seal-use-approval.bpmn | 26 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/seal/PdSealController.java | 41 +++++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java | 1
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java | 5
17 files changed, 409 insertions(+), 21 deletions(-)
diff --git a/sql/bpm/hrm-seal-use-approval.bpmn b/sql/bpm/hrm-seal-use-approval.bpmn
new file mode 100644
index 0000000..750f5f1
--- /dev/null
+++ b/sql/bpm/hrm-seal-use-approval.bpmn
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://flowable.org/processdef">
+ <process id="hrm-seal-use-approval" name="椤圭洰璺熻釜琛ㄧ敤鍗板鎵�" isExecutable="true">
+ <startEvent id="StartEvent" name="鎻愪氦鐢宠" />
+ <userTask id="SealApproval" name="鐢ㄥ嵃瀹℃壒">
+ <extensionElements>
+ <flowable:candidateStrategy>30</flowable:candidateStrategy>
+ <flowable:candidateParam>1</flowable:candidateParam>
+ <flowable:approveType>1</flowable:approveType>
+ <flowable:approveMethod>1</flowable:approveMethod>
+ <flowable:assignStartUserHandlerType>1</flowable:assignStartUserHandlerType>
+ <flowable:assignEmptyHandlerType>2</flowable:assignEmptyHandlerType>
+ </extensionElements>
+ </userTask>
+ <endEvent id="EndEvent" name="缁撴潫" />
+ <sequenceFlow id="flow1" sourceRef="StartEvent" targetRef="SealApproval" />
+ <sequenceFlow id="flow2" sourceRef="SealApproval" targetRef="EndEvent" />
+ </process>
+ <bpmndi:BPMNDiagram id="Diagram"><bpmndi:BPMNPlane id="Plane" bpmnElement="hrm-seal-use-approval">
+ <bpmndi:BPMNShape id="StartShape" bpmnElement="StartEvent"><dc:Bounds x="160" y="132" width="36" height="36" /></bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="ApprovalShape" bpmnElement="SealApproval"><dc:Bounds x="260" y="110" width="120" height="80" /></bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="EndShape" bpmnElement="EndEvent"><dc:Bounds x="450" y="132" width="36" height="36" /></bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="Flow1Edge" bpmnElement="flow1"><di:waypoint x="196" y="150" /><di:waypoint x="260" y="150" /></bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Flow2Edge" bpmnElement="flow2"><di:waypoint x="380" y="150" /><di:waypoint x="450" y="150" /></bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane></bpmndi:BPMNDiagram>
+</definitions>
diff --git a/sql/mysql/20261109_pd_seal.sql b/sql/mysql/20261109_pd_seal.sql
new file mode 100644
index 0000000..5cda3ca
--- /dev/null
+++ b/sql/mysql/20261109_pd_seal.sql
@@ -0,0 +1,32 @@
+-- 鐢ㄥ嵃绠$悊锛氬浘鐗囧拰鏂囨。蹇収瀛樻暟鎹簱锛屼笉浣跨敤鍏紑闄勪欢鍦板潃銆�
+CREATE TABLE IF NOT EXISTS pd_seal (
+ id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, tenant_id BIGINT NOT NULL DEFAULT 0, name VARCHAR(100) NOT NULL,
+ image_data MEDIUMBLOB NOT NULL, image_hash CHAR(64) NOT NULL, enabled BIT NOT NULL DEFAULT 1,
+ created_by BIGINT NOT NULL, create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ deleted BIT NOT NULL DEFAULT 0
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE IF NOT EXISTS pd_seal_application (
+ id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, tenant_id BIGINT NOT NULL DEFAULT 0, project_id BIGINT NOT NULL, project_code VARCHAR(128),
+ seal_id BIGINT NOT NULL, seal_name VARCHAR(100) NOT NULL, seal_image MEDIUMBLOB NOT NULL,
+ document_snapshot MEDIUMBLOB NOT NULL, reason VARCHAR(500) NOT NULL, applicant_id BIGINT NOT NULL,
+ status INT NOT NULL DEFAULT 1, process_instance_id VARCHAR(128),
+ create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, finish_time DATETIME,
+ INDEX idx_seal_app_user_project (applicant_id,project_id), INDEX idx_seal_app_process (process_instance_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE IF NOT EXISTS pd_seal_download_log (
+ id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, tenant_id BIGINT NOT NULL DEFAULT 0, application_id BIGINT NOT NULL, user_id BIGINT NOT NULL,
+ create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX idx_seal_download_app (application_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 鏍规嵁鐜版湁鐨勪汉鍔涜祫婧愮洰褰曞畾浣嶏紱濡傛病鏈夎鐩綍锛岄渶鎵嬪伐鍦ㄨ彍鍗曠鐞嗕腑鍒涘缓銆�
+SET @hrm_parent = (SELECT id FROM system_menu WHERE name='浜哄姏璧勬簮' AND type=1 AND deleted=b'0' ORDER BY id LIMIT 1);
+INSERT INTO system_menu(name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater,deleted)
+SELECT '鐢ㄥ嵃绠$悊','',2,90,@hrm_parent,'seal','ep:stamp','hrm/seal/index','HrmSeal',0,b'1',b'0',b'1','1','1',b'0'
+WHERE @hrm_parent IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu WHERE component='hrm/seal/index' AND deleted=b'0');
+SET @seal_menu = (SELECT id FROM system_menu WHERE component='hrm/seal/index' AND deleted=b'0' ORDER BY id LIMIT 1);
+INSERT INTO system_menu(name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater,deleted)
+SELECT '鍗扮珷缁存姢','mes:pd-seal:manage',3,1,@seal_menu,'','','','',0,b'1',b'0',b'1','1','1',b'0'
+WHERE @seal_menu IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu WHERE permission='mes:pd-seal:manage' AND deleted=b'0');
+INSERT INTO system_role_menu(role_id,menu_id,creator,updater,deleted)
+SELECT r.id,m.id,'1','1',b'0' FROM system_role r JOIN system_menu m ON m.deleted=b'0' AND (m.id=@seal_menu OR m.parent_id=@seal_menu)
+WHERE r.code='super_admin' AND r.deleted=b'0' AND NOT EXISTS (SELECT 1 FROM system_role_menu rm WHERE rm.role_id=r.id AND rm.menu_id=m.id AND rm.deleted=b'0');
diff --git a/sql/mysql/srm_inquiry_approval_20261109.sql b/sql/mysql/srm_inquiry_approval_20261109.sql
new file mode 100644
index 0000000..e3b4fc8
--- /dev/null
+++ b/sql/mysql/srm_inquiry_approval_20261109.sql
@@ -0,0 +1,3 @@
+-- 鎵ц鍓嶇‘璁ゅ綋鍓嶆暟鎹簱鍖呭惈 srm_inquiry锛屼笖灏氭湭娣诲姞姝ゅ瓧娈点��
+ALTER TABLE srm_inquiry ADD COLUMN process_instance_id varchar(64) DEFAULT NULL COMMENT 'BPM娴佺▼瀹炰緥缂栧彿';
+-- 鍦� BPM 娴佺▼绠$悊涓垱寤哄苟鍙戝竷娴佺▼鏍囪瘑 srm_inquiry_approve锛岄厤缃鎵硅妭鐐瑰拰瀹℃壒浜恒��
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index 046ab2a..cb9ad56 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -122,6 +122,11 @@
@ApiAccessLog(operateType = EXPORT)
public void exportProjectTrackingWord(@RequestParam("id") Long id,
HttpServletResponse response) throws IOException {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(1_040_990_001, "璺熻釜琛ㄧ敤鍗伴』鍏堟彁浜ゅ鎵癸紝璇蜂娇鐢ㄧ敤鍗扮敵璇�");
+ }
+
+ /** 浠呬緵鐢ㄥ嵃鐢宠鐢熸垚涓嶅彲鍙樺揩鐓с�� */
+ public byte[] createTrackingSnapshot(Long id) throws IOException {
MesPdProjectDO project = projectService.getProject(id);
if (project == null) {
throw exception(PD_PROJECT_NOT_EXISTS);
@@ -141,13 +146,8 @@
fields.put("remark", project.getRemark());
var companyConfig = companyConfigService.getCompanyConfig();
- byte[] content = MesWmDocumentRenderer.renderProjectTracking(fields,
+ return MesWmDocumentRenderer.renderProjectTracking(fields,
companyConfig != null ? companyConfig.getCompanyName() : null);
- String filename = "椤圭洰璺熻釜琛�-" + project.getTaskCode() + ".docx";
- String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");
- response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
- response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encoded);
- response.getOutputStream().write(content);
}
private String resolveStatusName(Integer status) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/seal/PdSealController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/seal/PdSealController.java
new file mode 100644
index 0000000..4ad968d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/seal/PdSealController.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pd.seal;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.MesPdProjectController;
+import cn.iocoder.yudao.module.mes.service.pd.project.MesPdProjectService;
+import cn.iocoder.yudao.module.mes.service.pd.seal.PdSealService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.*;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@RestController
+@RequestMapping("/mes/pd/seal")
+public class PdSealController {
+ @Resource private PdSealService service;
+ @Resource private MesPdProjectService projectService;
+ @Resource private MesPdProjectController projectController;
+ @GetMapping("/list") @PreAuthorize("@ss.hasPermission('mes:pd-seal:manage')")
+ public CommonResult<List<Map<String,Object>>> list(){ return success(service.seals(false)); }
+ @GetMapping("/available") @PreAuthorize("@ss.hasPermission('mes:pd-project:export')")
+ public CommonResult<List<Map<String,Object>>> available(){ return success(service.seals(true)); }
+ @PostMapping("/upload") @PreAuthorize("@ss.hasPermission('mes:pd-seal:manage')")
+ public CommonResult<Long> upload(@RequestParam String name,@RequestParam MultipartFile file) throws Exception { return success(service.upload(name,file,getLoginUserId())); }
+ @PutMapping("/enabled") @PreAuthorize("@ss.hasPermission('mes:pd-seal:manage')")
+ public CommonResult<Boolean> enabled(@RequestParam long id,@RequestParam boolean enabled){service.setEnabled(id,enabled);return success(true);}
+ public record ApplyReq(Long projectId, Long sealId, String reason) {}
+ @PostMapping("/apply") @PreAuthorize("@ss.hasPermission('mes:pd-project:export')")
+ public CommonResult<Long> apply(@RequestBody ApplyReq req) throws Exception {
+ if(req.projectId()==null || req.sealId()==null) throw new cn.iocoder.yudao.framework.common.exception.ServiceException(1_040_990_001,"璇烽�夋嫨椤圭洰鍜屽嵃绔�");
+ var project=projectService.getProject(req.projectId());
+ if(project==null) throw new cn.iocoder.yudao.framework.common.exception.ServiceException(1_040_990_001,"椤圭洰涓嶅瓨鍦�");
+ return success(service.apply(req.projectId(),project.getTaskCode(),req.sealId(),req.reason(),getLoginUserId(),projectController.createTrackingSnapshot(req.projectId())));
+ }
+ @GetMapping("/applications") @PreAuthorize("@ss.hasPermission('mes:pd-project:export')")
+ public CommonResult<List<Map<String,Object>>> applications(@RequestParam(required=false) Long projectId){ return success(service.applications(getLoginUserId(),projectId)); }
+ @GetMapping("/download") @PreAuthorize("@ss.hasPermission('mes:pd-project:export')")
+ public void download(@RequestParam long id,HttpServletResponse response) throws Exception {byte[] bytes=service.download(id,getLoginUserId()); response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); response.setHeader("Content-Disposition","attachment; filename=tracking.docx"); response.getOutputStream().write(bytes);}
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java
new file mode 100644
index 0000000..a8f4255
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealService.java
@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.mes.service.pd.seal;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import jakarta.annotation.Resource;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import javax.imageio.ImageIO;
+import java.io.*;
+import java.sql.Statement;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.zip.*;
+
+@Service
+public class PdSealService {
+ public static final String PROCESS_KEY = "hrm-seal-use-approval";
+ @Resource private JdbcTemplate jdbc;
+ @Resource private BpmProcessInstanceApi bpm;
+ @Resource private cn.iocoder.yudao.module.bpm.service.definition.BpmProcessAutoApproveService autoApprove;
+ @Resource private cn.iocoder.yudao.module.bpm.service.task.BpmTaskService taskService;
+ private long tenant() { Long id = cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder.getTenantId(); return id == null ? 0L : id; }
+ private ServiceException fail(String text) { return new ServiceException(1_040_990_001, text); }
+
+ public List<Map<String,Object>> seals(boolean activeOnly) {
+ return jdbc.queryForList("SELECT id,name,enabled,create_time FROM pd_seal WHERE tenant_id=? AND deleted=0" + (activeOnly ? " AND enabled=1" : "") + " ORDER BY id DESC", tenant());
+ }
+ public long upload(String name, MultipartFile file, Long userId) throws Exception {
+ if (name == null || name.isBlank() || name.length() > 100) throw fail("鍗扮珷鍚嶇О涓嶈兘涓虹┖涓斾笉鑳借秴杩�100瀛�");
+ if (file == null || file.isEmpty() || file.getSize() > 2 * 1024 * 1024) throw fail("璇蜂笂浼犱笉瓒呰繃2MB鐨凱NG鍗扮珷鍥剧墖");
+ byte[] data = file.getBytes();
+ byte[] sig = {(byte)137,80,78,71,13,10,26,10};
+ if (data.length < 8 || !Arrays.equals(sig, Arrays.copyOf(data, 8))) throw fail("浠呮敮鎸丳NG鍥剧墖");
+ try (var input = ImageIO.createImageInputStream(new ByteArrayInputStream(data))) {
+ var readers = ImageIO.getImageReaders(input);
+ if (!readers.hasNext()) throw fail("鍥剧墖鏃犳硶璇诲彇");
+ var reader = readers.next();
+ try { reader.setInput(input); if (reader.getWidth(0) > 2048 || reader.getHeight(0) > 2048) throw fail("鍥剧墖灏哄涓嶈兘瓒呰繃2048脳2048"); reader.read(0); }
+ finally { reader.dispose(); }
+ }
+ String hash = HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(data));
+ var keys = new GeneratedKeyHolder();
+ jdbc.update(c -> { var ps=c.prepareStatement("INSERT INTO pd_seal(name,image_data,image_hash,enabled,created_by,tenant_id) VALUES(?,?,?,1,?,?)", Statement.RETURN_GENERATED_KEYS); ps.setString(1,name.trim()); ps.setBytes(2,data); ps.setString(3,hash); ps.setLong(4,userId); ps.setLong(5,tenant()); return ps; }, keys);
+ return Objects.requireNonNull(keys.getKey()).longValue();
+ }
+ public void setEnabled(long id, boolean enabled) {
+ if (jdbc.update("UPDATE pd_seal SET enabled=? WHERE id=? AND tenant_id=? AND deleted=0", enabled, id, tenant()) != 1) throw fail("鍗扮珷涓嶅瓨鍦�");
+ }
+ @Transactional(rollbackFor=Exception.class)
+ public long apply(long projectId, String projectCode, long sealId, String reason, Long userId, byte[] snapshot) {
+ if (reason == null || reason.isBlank() || reason.length() > 500) throw fail("璇峰~鍐欎笉瓒呰繃500瀛楃殑鐢ㄥ嵃浜嬬敱");
+ if (autoApprove.isAutoApprove(PROCESS_KEY)) throw fail("鐢ㄥ嵃娴佺▼寮�鍚簡鍏嶅鎵癸紝璇峰厛鍏抽棴鍚庡啀鎻愪氦");
+ List<Map<String,Object>> seals=jdbc.queryForList("SELECT name,image_data FROM pd_seal WHERE id=? AND tenant_id=? AND enabled=1 AND deleted=0 FOR UPDATE",sealId,tenant());
+ if (seals.isEmpty()) throw fail("鍗扮珷涓嶅瓨鍦ㄦ垨宸插仠鐢�");
+ var seal=seals.get(0); var keys=new GeneratedKeyHolder();
+ jdbc.update(c -> { var ps=c.prepareStatement("INSERT INTO pd_seal_application(project_id,project_code,seal_id,seal_name,seal_image,document_snapshot,reason,applicant_id,status,tenant_id) VALUES(?,?,?,?,?,?,?,?,1,?)",Statement.RETURN_GENERATED_KEYS); ps.setLong(1,projectId); ps.setString(2,projectCode); ps.setLong(3,sealId); ps.setString(4,(String)seal.get("name")); ps.setBytes(5,(byte[])seal.get("image_data")); ps.setBytes(6,snapshot); ps.setString(7,reason.trim()); ps.setLong(8,userId); ps.setLong(9,tenant()); return ps; },keys);
+ long id=Objects.requireNonNull(keys.getKey()).longValue();
+ var variables=new HashMap<String,Object>(); variables.put("projectCode", projectCode); variables.put("sealName",seal.get("name")); variables.put("reason",reason.trim());
+ String instance=bpm.createProcessInstance(userId,new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(id)).setVariables(variables));
+ jdbc.update("UPDATE pd_seal_application SET process_instance_id=? WHERE id=? AND tenant_id=? AND (process_instance_id IS NULL OR process_instance_id=?)",instance,id,tenant(),instance);
+ return id;
+ }
+ public void status(BpmProcessInstanceStatusEvent event) {
+ if (!PROCESS_KEY.equals(event.getProcessDefinitionKey()) || event.getStatus() == null || event.getStatus() < 2 || event.getStatus() > 4) return;
+ try { long id=Long.parseLong(event.getBusinessKey()); jdbc.update("UPDATE pd_seal_application SET status=?,process_instance_id=?,finish_time=NOW() WHERE id=? AND tenant_id=? AND status=1 AND (process_instance_id IS NULL OR process_instance_id=?)",event.getStatus(),event.getId(),id,tenant(),event.getId()); } catch (NumberFormatException ignored) { }
+ }
+ public List<Map<String,Object>> applications(long userId, Long projectId) {
+ return jdbc.queryForList("SELECT id,project_id,project_code,seal_name,reason,status,process_instance_id,create_time,finish_time FROM pd_seal_application WHERE tenant_id=? AND applicant_id=?"+(projectId == null ? "" : " AND project_id="+projectId)+" ORDER BY id DESC LIMIT 200",tenant(),userId);
+ }
+ @Transactional(rollbackFor=Exception.class)
+ public byte[] download(long id,long userId) throws IOException {
+ var rows=jdbc.queryForList("SELECT document_snapshot,seal_image,process_instance_id FROM pd_seal_application WHERE id=? AND tenant_id=? AND applicant_id=? AND status=2",id,tenant(),userId);
+ if(rows.isEmpty()) throw fail("鐢宠涓嶅瓨鍦ㄣ�佹棤鏉冧笅杞芥垨瀹℃壒灏氭湭閫氳繃");
+ String instance=(String) rows.get(0).get("process_instance_id");
+ if (instance == null || instance.isBlank()) throw fail("瀹℃壒璁板綍涓嶅畬鏁达紝鏃犳硶涓嬭浇");
+ boolean humanApproval = taskService.getTaskListByProcessInstanceId(instance, true).stream().anyMatch(task -> {
+ var vars = task.getTaskLocalVariables();
+ if (vars == null || !Integer.valueOf(2).equals(vars.get("TASK_STATUS")) || task.getAssignee() == null || task.getAssignee().equals(String.valueOf(userId))) return false;
+ Object reason = vars.get("TASK_REASON");
+ return Arrays.stream(cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum.values()).noneMatch(item -> Objects.equals(item.getReason(), reason));
+ });
+ if (!humanApproval) throw fail("鏈壘鍒板叾浠栧鎵逛汉鐨勪汉宸ラ�氳繃璁板綍锛屾棤娉曚笅杞�");
+ byte[] snapshot=(byte[])rows.get(0).get("document_snapshot"), image=(byte[])rows.get(0).get("seal_image");
+ var out=new ByteArrayOutputStream(); boolean found=false;
+ try(var zin=new ZipInputStream(new ByteArrayInputStream(snapshot)); var zout=new ZipOutputStream(out)) { ZipEntry entry; while((entry=zin.getNextEntry())!=null){byte[] bytes=zin.readAllBytes(); if(entry.getName().equals("word/media/seal.png")){bytes=image;found=true;} zout.putNextEntry(new ZipEntry(entry.getName())); zout.write(bytes); zout.closeEntry();} }
+ if(!found) throw fail("璺熻釜琛ㄦā鏉跨己灏戝嵃绔犱綅缃�");
+ jdbc.update("INSERT INTO pd_seal_download_log(application_id,user_id,tenant_id) VALUES(?,?,?)",id,userId,tenant());
+ return out.toByteArray();
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealStatusListener.java
new file mode 100644
index 0000000..f3d1ee4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealStatusListener.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.mes.service.pd.seal;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+@Component
+public class PdSealStatusListener extends BpmProcessInstanceStatusEventListener {
+ @Resource private PdSealService service;
+ @Override protected String getProcessDefinitionKey() { return PdSealService.PROCESS_KEY; }
+ @Override protected void onEvent(BpmProcessInstanceStatusEvent event) { service.status(event); }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java
new file mode 100644
index 0000000..02fb810
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/seal/PdSealServiceTest.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.service.pd.seal;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.jdbc.core.JdbcTemplate;
+import java.io.*;
+import java.util.*;
+import java.util.zip.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class PdSealServiceTest {
+ @InjectMocks PdSealService service;
+ @Mock JdbcTemplate jdbc;
+ @Mock BpmTaskService tasks;
+ @Test void refusesDownloadWithoutApprovedApplication() {
+ when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(List.of());
+ assertThrows(ServiceException.class, () -> service.download(1, 7));
+ verifyNoInteractions(tasks);
+ }
+ @Test void refusesAutomaticApproval() throws Exception {
+ when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(List.of(Map.of("process_instance_id", "p", "document_snapshot", new byte[]{1}, "seal_image", new byte[]{2})));
+ HistoricTaskInstance task=mock(HistoricTaskInstance.class);
+ when(task.getAssignee()).thenReturn("8");
+ when(task.getTaskLocalVariables()).thenReturn(Map.of("TASK_STATUS",2,"TASK_REASON","娴佺▼宸查厤缃厤瀹℃壒锛屾彁浜ゅ悗鑷姩閫氳繃"));
+ when(tasks.getTaskListByProcessInstanceId("p",true)).thenReturn(List.of(task));
+ assertThrows(ServiceException.class, () -> service.download(1,7));
+ }
+ @Test void approvedDownloadEmbedsSelectedImage() throws Exception {
+ var buffer=new ByteArrayOutputStream();
+ try(var zip=new ZipOutputStream(buffer)){zip.putNextEntry(new ZipEntry("word/media/seal.png"));zip.write(new byte[]{1});zip.closeEntry();}
+ when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(List.of(Map.of("process_instance_id","p","document_snapshot",buffer.toByteArray(),"seal_image",new byte[]{2,3})));
+ HistoricTaskInstance task=mock(HistoricTaskInstance.class);
+ when(task.getAssignee()).thenReturn("8");
+ when(task.getTaskLocalVariables()).thenReturn(Map.of("TASK_STATUS",2,"TASK_REASON","鍚屾剰"));
+ when(tasks.getTaskListByProcessInstanceId("p",true)).thenReturn(List.of(task));
+ byte[] result=service.download(1,7);
+ try(var zip=new ZipInputStream(new ByteArrayInputStream(result))){assertEquals("word/media/seal.png",zip.getNextEntry().getName());assertArrayEquals(new byte[]{2,3},zip.readAllBytes());}
+ }
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java
index ef804c8..09ef8cf 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java
@@ -73,6 +73,14 @@
return success(BeanUtils.toBean(list, SrmInquiryRespVO.class));
}
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦璇环瀹℃牳")
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:confirm')")
+ public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id) {
+ inquiryService.submitApproval(id, cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
+ return success(true);
+ }
+
@PutMapping("/publish")
@Operation(summary = "鍙戝竷璇环鍗曪細鑽夌 -> 璇环涓�")
@Parameter(name = "id", description = "缂栧彿", required = true)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java
index ff9d82b..0a0d069 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java
@@ -23,6 +23,7 @@
@Schema(description = "鐘舵�侊細0 鑽夌銆�10 璇环涓��20 宸茶浆璁㈠崟銆�30 宸插彇娑�")
private Integer status;
+ private String processInstanceId;
@Schema(description = "璇环鏃ユ湡")
private LocalDate inquiryDate;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java
index 26fd8a5..320a183 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java
@@ -49,5 +49,6 @@
*/
private Long purchaserUserId;
private String remark;
+ private String processInstanceId;
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java
index 7273cf8..269460e 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java
@@ -22,6 +22,10 @@
.orderByDesc(SrmInquiryDO::getId));
}
+ default SrmInquiryDO selectByIdForUpdate(Long id) {
+ return selectOne(new LambdaQueryWrapperX<SrmInquiryDO>().eq(SrmInquiryDO::getId, id).last("FOR UPDATE"));
+ }
+
default SrmInquiryDO selectByNo(String no) {
return selectOne(SrmInquiryDO::getNo, no);
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java
index fab075f..1b91fdf 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java
@@ -16,7 +16,10 @@
DRAFT(0, "鑽夌"),
QUOTING(10, "璇环涓�"),
CONFIRMED(20, "宸茶浆璁㈠崟"),
- CANCELLED(30, "宸插彇娑�");
+ CANCELLED(30, "宸插彇娑�"),
+ APPROVING(40, "瀹℃牳涓�"),
+ APPROVED(50, "瀹℃牳閫氳繃"),
+ REJECTED(60, "瀹℃牳鏈�氳繃");
public static final Integer[] ARRAYS = Arrays.stream(values())
.map(InquiryStatusEnum::getStatus).toArray(Integer[]::new);
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalListener.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalListener.java
new file mode 100644
index 0000000..c05e8d3
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalListener.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.srm.service.inquiry;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SrmInquiryApprovalListener extends BpmProcessInstanceStatusEventListener {
+ @Resource
+ private SrmInquiryService inquiryService;
+
+ @Override
+ protected String getProcessDefinitionKey() { return "srm_inquiry_approve"; }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ inquiryService.updateApprovalStatus(Long.valueOf(event.getBusinessKey()), event.getId(), event.getStatus());
+ }
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java
index c3d4a71..334c853 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java
@@ -36,6 +36,8 @@
* 鍙戝竷璇环鍗曪細鑽夌 -> 璇环涓�
*/
void publishInquiry(Long id);
+ void submitApproval(Long id, Long userId);
+ void updateApprovalStatus(Long id, String processInstanceId, Integer status);
/**
* 鍙栨秷璇环鍗曪細鑽夌/璇环涓� -> 宸插彇娑�
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
index 10ebb6d..a750fba 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
@@ -7,6 +7,9 @@
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
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.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderCreateReqDTO;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
@@ -48,6 +51,8 @@
@Resource
private SrmInquiryMapper inquiryMapper;
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
@Resource
private SrmInquiryItemMapper inquiryItemMapper;
@Resource
@@ -91,8 +96,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateInquiry(SrmInquirySaveReqVO updateReqVO) {
- SrmInquiryDO inquiry = validateInquiryExists(updateReqVO.getId());
- if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())) {
+ SrmInquiryDO inquiry = validateInquiryForUpdate(updateReqVO.getId());
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.REJECTED.getStatus().equals(inquiry.getStatus())) {
throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_EDITABLE.getCode(),
"璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ "銆戯紝浠呰崏绋跨姸鎬佸彲缂栬緫銆傚闇�璋冩暣浜у搧琛屾垨渚涘簲鍟嗭紝璇峰彇娑堝悗閲嶆柊鍒涘缓璇环鍗曘��");
@@ -123,7 +129,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteInquiry(Long id) {
- SrmInquiryDO inquiry = validateInquiryExists(id);
+ SrmInquiryDO inquiry = validateInquiryForUpdate(id);
if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())) {
throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_EDITABLE.getCode(),
"璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
@@ -161,8 +167,52 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void submitApproval(Long id, Long userId) {
+ SrmInquiryDO inquiry = validateInquiryForUpdate(id);
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.REJECTED.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CONFIRMABLE.getCode(), "褰撳墠鐘舵�佷笉鍙彁浜ゅ鏍�");
+ }
+ List<SrmInquiryItemDO> items = inquiryItemMapper.selectListByInquiryId(id);
+ if (CollUtil.isEmpty(items)) throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_ITEM_EMPTY);
+ Map<Long, SrmInquiryQuoteDO> quotes = inquiryQuoteMapper.selectListByInquiryId(id).stream()
+ .collect(Collectors.toMap(SrmInquiryQuoteDO::getId, Function.identity()));
+ Set<Long> suppliers = inquirySupplierMapper.selectListByInquiryId(id).stream()
+ .map(SrmInquirySupplierDO::getSupplierId).collect(Collectors.toSet());
+ for (SrmInquiryItemDO item : items) {
+ SrmInquiryQuoteDO quote = quotes.get(item.getSelectedQuoteId());
+ if (quote == null || !item.getId().equals(quote.getInquiryItemId())
+ || !suppliers.contains(quote.getSupplierId()) || quote.getPrice() == null
+ || quote.getPrice().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_REQUIRED.getCode(), "璇峰厛涓烘瘡涓骇鍝侀�夋嫨鏈夋晥鐨勪腑鏍囨姤浠�");
+ }
+ inquiryItemMapper.updateById(new SrmInquiryItemDO().setId(item.getId())
+ .setSelectedSupplierId(quote.getSupplierId()).setSelectedPrice(quote.getPrice()));
+ }
+ inquiryMapper.updateById(new SrmInquiryDO().setId(id).setStatus(InquiryStatusEnum.APPROVING.getStatus()).setProcessInstanceId(""));
+ String processId = processInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey("srm_inquiry_approve").setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("inquiryNo", inquiry.getNo(), "inquiryTitle", inquiry.getTitle())));
+ inquiryMapper.updateById(new SrmInquiryDO().setId(id).setProcessInstanceId(processId));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateApprovalStatus(Long id, String processInstanceId, Integer status) {
+ SrmInquiryDO inquiry = validateInquiryForUpdate(id);
+ if (!InquiryStatusEnum.APPROVING.getStatus().equals(inquiry.getStatus())
+ || (StrUtil.isNotEmpty(inquiry.getProcessInstanceId()) && !Objects.equals(inquiry.getProcessInstanceId(), processInstanceId))) return;
+ Integer next = null;
+ if (BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(status)) next = InquiryStatusEnum.APPROVED.getStatus();
+ if (BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(status) || BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(status)) next = InquiryStatusEnum.REJECTED.getStatus();
+ if (next != null) inquiryMapper.updateById(new SrmInquiryDO().setId(id).setStatus(next));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void publishInquiry(Long id) {
- SrmInquiryDO inquiry = validateInquiryExists(id);
+ SrmInquiryDO inquiry = validateInquiryForUpdate(id);
if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())) {
throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_QUOTING.getCode(),
"璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
@@ -175,9 +225,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelInquiry(Long id) {
- SrmInquiryDO inquiry = validateInquiryExists(id);
+ SrmInquiryDO inquiry = validateInquiryForUpdate(id);
if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
- && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())) {
+ && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.REJECTED.getStatus().equals(inquiry.getStatus())) {
throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CANCELLABLE.getCode(),
"璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ "銆戯紝浠呰崏绋挎垨璇环涓姸鎬佸彲鍙栨秷銆�");
@@ -189,9 +240,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveQuotes(SrmInquiryQuoteSaveReqVO saveReqVO) {
- SrmInquiryDO inquiry = validateInquiryExists(saveReqVO.getInquiryId());
+ SrmInquiryDO inquiry = validateInquiryForUpdate(saveReqVO.getInquiryId());
if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
- && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())) {
+ && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.REJECTED.getStatus().equals(inquiry.getStatus())) {
throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_QUOTING.getCode(),
"璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ "銆戯紝浠呰崏绋挎垨璇环涓姸鎬佸彲褰曞叆鎶ヤ环銆�");
@@ -269,12 +321,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public SrmInquiryConfirmRespVO confirmInquiry(SrmInquiryConfirmReqVO confirmReqVO) {
- SrmInquiryDO inquiry = validateInquiryExists(confirmReqVO.getId());
- if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
- && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())) {
- throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CONFIRMABLE.getCode(),
- "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
- + "銆戯紝浠呰崏绋挎垨璇环涓姸鎬佸彲纭杞鍗曘��");
+ SrmInquiryDO inquiry = validateInquiryForUpdate(confirmReqVO.getId());
+ if (!InquiryStatusEnum.APPROVED.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CONFIRMABLE.getCode(), "璇环鍗曞鏍搁�氳繃鍚庢墠鑳借浆璁㈠崟");
+ }
+ if (CollUtil.isNotEmpty(confirmReqVO.getSelections())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CONFIRMABLE.getCode(), "瀹℃牳閫氳繃鍚庝笉鑳芥洿鏀逛腑鏍囩粨鏋�");
}
List<SrmInquiryItemDO> items = inquiryItemMapper.selectListByInquiryId(inquiry.getId());
if (CollUtil.isEmpty(items)) {
@@ -647,6 +699,12 @@
// ========== 鏍¢獙 ==========
+ private SrmInquiryDO validateInquiryForUpdate(Long id) {
+ SrmInquiryDO inquiry = inquiryMapper.selectByIdForUpdate(id);
+ if (inquiry == null) throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_NOT_EXISTS);
+ return inquiry;
+ }
+
private SrmInquiryDO validateInquiryExists(Long id) {
SrmInquiryDO inquiry = inquiryMapper.selectById(id);
if (inquiry == null) {
diff --git a/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalTest.java b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalTest.java
new file mode 100644
index 0000000..d15c326
--- /dev/null
+++ b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryApprovalTest.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.srm.service.inquiry;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo.SrmInquiryConfirmReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryDO;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmInquiryMapper;
+import cn.iocoder.yudao.module.srm.enums.InquiryStatusEnum;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+class SrmInquiryApprovalTest extends BaseMockitoUnitTest {
+ @InjectMocks private SrmInquiryServiceImpl service;
+ @Mock private SrmInquiryMapper mapper;
+
+ @Test void cannotConvertBeforeApproval() {
+ when(mapper.selectByIdForUpdate(1L)).thenReturn(new SrmInquiryDO().setId(1L).setStatus(InquiryStatusEnum.DRAFT.getStatus()));
+ SrmInquiryConfirmReqVO req = new SrmInquiryConfirmReqVO().setId(1L);
+ assertThrows(ServiceException.class, () -> service.confirmInquiry(req));
+ }
+
+ @Test void ignoresOldProcessAndAcceptsCurrentApproval() {
+ when(mapper.selectByIdForUpdate(1L)).thenReturn(new SrmInquiryDO().setId(1L)
+ .setStatus(InquiryStatusEnum.APPROVING.getStatus()).setProcessInstanceId("current"));
+ service.updateApprovalStatus(1L, "old", BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ verify(mapper, never()).updateById(any(SrmInquiryDO.class));
+ service.updateApprovalStatus(1L, "current", BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ verify(mapper).updateById(argThat((SrmInquiryDO update) -> InquiryStatusEnum.APPROVED.getStatus().equals(update.getStatus())));
+ }
+}
--
Gitblit v1.9.3