From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java | 164 +++++++++++++++++++++++++-----------------------------
1 files changed, 77 insertions(+), 87 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
index c419242..09ae4b4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+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.module.mes.controller.admin.wm.stocktaking.task.vo.MesWmStockTakingTaskPageReqVO;
@@ -20,15 +21,11 @@
import cn.iocoder.yudao.module.mes.service.wm.stocktaking.plan.MesWmStockTakingPlanService;
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.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-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 cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -38,11 +35,14 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -55,13 +55,15 @@
@Slf4j
public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskService {
- @Resource
- private MesWmStockTakingTaskMapper stockTakingTaskMapper;
+ /**
+ * 鐩樼偣缁撴灉瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE = "stock_taking_result_approve";
@Resource
- private BpmProcessInstanceApi processInstanceApi;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private MesWmStockTakingTaskMapper stockTakingTaskMapper;
@Resource
private MesWmMaterialStockService materialStockService;
@@ -82,6 +84,9 @@
@Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -186,9 +191,8 @@
throw exception(WM_STOCK_TAKING_TASK_NO_LINE);
}
- // 2. 鏇存柊浠诲姟鐘舵�佷负瀹℃壒涓�
- stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
- .setStatus(MesWmStockTakingTaskStatusEnum.APPROVING.getStatus()));
+ // 2. 鏇存柊浠诲姟鐘舵�佷负鐩樼偣涓紝骞舵竻绌哄鏍告爣璁�
+ stockTakingTaskMapper.submitAndResetAuditInfo(id, MesWmStockTakingTaskStatusEnum.APPROVING.getStatus());
// 3. 鏍规嵁鍐荤粨鏍囪瘑锛屽鐗╄祫杩涜鍐荤粨
if (Boolean.TRUE.equals(task.getFrozen())) {
@@ -198,11 +202,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitStockTakingResultApproval(Long id, String processDefinitionKey) {
+ public void submitStockTakingResultApproval(Long id) {
// 1.1 鏍￠獙浠诲姟瀛樺湪涓斿浜庣洏鐐逛腑鐘舵��
MesWmStockTakingTaskDO task = validateStockTakingTaskExistsAndApproving(id);
- // 1.2 鏍￠獙缁撴灉瀹℃壒鏈彁浜よ繃锛堥伩鍏嶉噸澶嶆彁浜わ級
- if (task.getProcessInstanceId() != null) {
+ // 1.2 鏍￠獙鏈疆缁撴灉瀹℃壒鏈彁浜よ繃锛堥伩鍏嶉噸澶嶆彁浜わ級
+ if (isResultApprovalPending(task)) {
throw exception(WM_STOCK_TAKING_TASK_ALREADY_SUBMIT_APPROVAL);
}
// 1.3 鏍￠獙鑷冲皯鏈変竴鏉＄洏鐐圭粨鏋�
@@ -210,94 +214,80 @@
if (CollUtil.isEmpty(results)) {
throw exception(WM_STOCK_TAKING_TASK_NO_RESULT);
}
+ // 1.4 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE);
- // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
- String processInstanceId = processInstanceApi.createProcessInstance(getCurrentUserId(),
- new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鍥炲啓娴佺▼瀹炰緥缂栧彿锛堜换鍔′繚鎸佺洏鐐逛腑锛岀瓑寰呭鎵癸級
- stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO()
- .setId(id).setProcessInstanceId(processInstanceId));
+ // 2. 璁板綍鎻愪氦鏃堕棿骞舵竻绌轰笂涓�杞鏍哥粨鏋滐紙浠诲姟淇濇寔鐩樼偣涓紝绛夊緟瀹℃牳锛�
+ stockTakingTaskMapper.markResultApprovalSubmitted(id);
}
@Override
- public List<Map<String, Object>> getStockTakingTaskResultApprovalProcessDefinitionList() {
- return getProcessDefinitionListByCategory(APPROVE_CATEGORY_CODE);
+ public Set<Long> getStockTakingTaskApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateStockTakingTaskResultAuditStatus(Long id, Integer bpmResult) {
+ public void auditStockTakingResult(Long id, Boolean pass, String reviewRemark) {
// 1. 鏍￠獙浠诲姟瀛樺湪
MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
+ // 2. 鏍￠獙澶勪簬鐩樼偣涓紙鍚粨鏋滃鎵逛腑锛夌姸鎬�
if (!MesWmStockTakingTaskStatusEnum.APPROVING.getStatus().equals(task.getStatus())) {
- log.warn("[updateStockTakingTaskResultAuditStatus] 鐩樼偣浠诲姟({}) 涓嶅浜庣洏鐐逛腑鐘舵�侊紝蹇界暐瀹℃壒浜嬩欢", id);
- return;
+ throw exception(WM_STOCK_TAKING_TASK_NOT_APPROVING);
}
- // 2. 瀹℃壒閫氳繃锛氬厛缃负宸插畬鎴愶紝鍐嶈В鍐诲苟鍚屼簨鍔¤嚜鍔ㄦ牳閿�宸紓
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
- // 2.1 鍏堢疆涓哄凡瀹屾垚锛氫换鍔＄姸鎬佸彉鏇村悗锛屽悗缁噸澶嶇殑瀹℃壒浜嬩欢璇诲彇鍒� FINISHED 鍗宠蹇界暐锛岄伩鍏嶉噸澶嶆牳閿�
- stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
- .setStatus(MesWmStockTakingTaskStatusEnum.FINISHED.getStatus()));
- // 2.2 瑙ｅ喕搴撳瓨锛氶』鍦ㄥ樊寮傛牳閿�鍓嶈В鍐伙紝鍚﹀垯鏍搁攢浜嬪姟浼氳搴撳瓨鍐荤粨鏍￠獙鎷︽埅
- if (Boolean.TRUE.equals(task.getFrozen())) {
- updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
+ // 3. 鏍￠獙鏈疆缁撴灉瀹℃壒宸叉彁浜や笖灏氭湭瀹℃牳
+ if (!isResultApprovalPending(task)) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_NOT_SUBMITTED);
+ }
+ // 4. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鏍镐汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE, userId);
+ // 5. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝浠诲姟淇濇寔鐩樼偣涓紝鍙慨鏀瑰疄鐩樺悗閲嶆柊鎻愪氦缁撴灉瀹℃壒
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(WM_STOCK_TAKING_TASK_REJECT_REASON_REQUIRED);
}
- // 2.3 鑷姩鏍搁攢鐩樼偣宸紓锛氱洏鐩堝叆搴� / 鐩樹簭鍑哄簱锛屽悓浜嬪姟鍐呮洿鏂板簱瀛樺彴璐︼紱浠讳竴姝ュけ璐ユ暣浣撳洖婊氾紝浠诲姟鍥為��涓虹洏鐐逛腑
- doProcessStockTakingDifference(task);
+ stockTakingTaskMapper.auditStockTakingTask(id, MesWmStockTakingTaskStatusEnum.APPROVING.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
return;
}
- // 3. 瀹℃壒椹冲洖锛氭竻绌烘祦绋嬪疄渚嬬紪鍙凤紝浠诲姟淇濇寔鐩樼偣涓紝鍙慨鏀瑰疄鐩樺悗閲嶆柊鎻愪氦缁撴灉瀹℃壒
- if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
- stockTakingTaskMapper.clearProcessInstanceId(id);
- return;
+ // 6. 瀹℃牳閫氳繃锛氬厛缃负宸插畬鎴愬苟璁板綍瀹℃牳浜轰笌瀹℃牳鎰忚
+ stockTakingTaskMapper.auditStockTakingTask(id, MesWmStockTakingTaskStatusEnum.FINISHED.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ // 7. 瑙ｅ喕搴撳瓨锛氶』鍦ㄥ樊寮傛牳閿�鍓嶈В鍐伙紝鍚﹀垯鏍搁攢浜嬪姟浼氳搴撳瓨鍐荤粨鏍￠獙鎷︽埅
+ if (Boolean.TRUE.equals(task.getFrozen())) {
+ updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
}
- // 4. 瀹℃壒鍙栨秷锛氳В鍐诲簱瀛樺苟缃负宸插彇娑�
- if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
- if (Boolean.TRUE.equals(task.getFrozen())) {
- updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
- }
- stockTakingTaskMapper.clearProcessInstanceId(id);
- stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
- .setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus()));
- }
+ // 8. 鑷姩鏍搁攢鐩樼偣宸紓锛氱洏鐩堝叆搴� / 鐩樹簭鍑哄簱锛屽悓浜嬪姟鍐呮洿鏂板簱瀛樺彴璐︼紱浠讳竴姝ュけ璐ユ暣浣撳洖婊氾紝浠诲姟鍥為��涓虹洏鐐逛腑
+ doProcessStockTakingDifference(task);
}
/**
- * 鑾峰彇鍒嗙被涓嬬殑鍙敤 BPM 娴佺▼瀹氫箟锛堣繃婊ゆ寕璧锋祦绋嬶紝鍚� Key 淇濈暀鏈�鏂扮増鏈級
+ * 鍒ゆ柇鏈疆鐩樼偣缁撴灉瀹℃壒鏄惁宸叉彁浜や笖灏氭湭瀹℃牳
*
- * @param categoryCode 娴佺▼鍒嗙被缂栫爜
- * @return 娴佺▼瀹氫箟鍒楄〃锛坕d/key/name锛�
+ * 浠诲姟鐘舵�� 2锛堢洏鐐逛腑锛夊悓鏃舵壙杞姐�岀洏鐐逛腑銆嶄笌銆岀洏鐐圭粨鏋滃鎵逛腑銆嶄袱涓樁娈碉紝
+ * 浠� reviewTime 闈炵┖涓� reviewerId 涓虹┖浣滀负銆屽凡鎻愪氦銆佺瓑寰呭鏍搞�嶇殑鍒ゅ畾鏉′欢锛�
+ * 瀹℃牳涓嶉�氳繃鍚� reviewerId 闈炵┖锛屼换鍔″洖鍒板彲閲嶆柊鎻愪氦缁撴灉瀹℃壒鐨勭姸鎬併��
+ *
+ * @param task 鐩樼偣浠诲姟
+ * @return 鏄惁澶勪簬缁撴灉瀹℃壒涓�
*/
- private List<Map<String, Object>> getProcessDefinitionListByCategory(String categoryCode) {
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(categoryCode);
- if (CollUtil.isEmpty(definitionInfoList)) {
- return Collections.emptyList();
+ private boolean isResultApprovalPending(MesWmStockTakingTaskDO task) {
+ return task.getReviewerId() == null && task.getReviewTime() != null;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
}
- // 杩囨护婵�娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
- 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;
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
private Long getCurrentUserId() {
@@ -318,8 +308,8 @@
}
task.setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus());
stockTakingTaskMapper.updateById(task);
- // 鍙栨秷鍚庢竻绌烘祦绋嬪疄渚嬬紪鍙凤紝閬垮厤娈嬬暀瀹℃壒鏍囪褰卞搷鍚庣画閲嶆柊寮�濮嬬洏鐐�
- stockTakingTaskMapper.clearProcessInstanceId(id);
+ // 鍙栨秷鍚庢竻绌哄鏍告爣璁帮紝閬垮厤娈嬬暀瀹℃壒鏍囪褰卞搷鍚庣画閲嶆柊寮�濮嬬洏鐐�
+ stockTakingTaskMapper.clearAuditInfo(id);
if (Boolean.TRUE.equals(task.getFrozen())) {
updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
}
@@ -384,7 +374,7 @@
/**
* 鑷姩鏍搁攢鐩樼偣宸紓锛氭寜鐩樼偣缁撴灉閫愯鐢熸垚 IN/OUT 搴撳瓨浜嬪姟鏇存柊搴撳瓨鍙拌处
*
- * <p>浠呯敱 {@link #updateStockTakingTaskResultAuditStatus} 鐨勫鎵归�氳繃鍒嗘敮鍦ㄥ悓浜嬪姟鍐呰皟鐢紱
+ * <p>浠呯敱 {@link #auditStockTakingResult} 鐨勫鏍搁�氳繃鍒嗘敮鍦ㄥ悓浜嬪姟鍐呰皟鐢紱
* 澶辫触鏁翠綋鍥炴粴锛屼换鍔″洖閫�涓虹洏鐐逛腑鐘舵�侊紝閬垮厤閲嶅璋冩暣銆�
*
* @param task 宸茬疆涓哄凡瀹屾垚銆佸凡瑙ｅ喕鐨勭洏鐐逛换鍔�
--
Gitblit v1.9.3