From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java | 130 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 124 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
index 72a9f3d..904b168 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
@@ -2,8 +2,11 @@
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.miscreceipt.vo.MesWmMiscReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscreceipt.MesWmMiscReceiptDO;
@@ -14,6 +17,9 @@
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.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -21,10 +27,15 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
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.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -35,6 +46,13 @@
@Slf4j
public class MesWmMiscReceiptServiceImpl implements MesWmMiscReceiptService {
+ /**
+ * 鏉傞」鍏ュ簱鍗曞鎵圭殑涓氬姟绫诲瀷缂栫爜
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String MISC_RECEIPT_APPROVE_BIZ_TYPE = "misc_receipt_approve";
+
@Resource
private MesWmMiscReceiptMapper miscReceiptMapper;
@@ -43,6 +61,10 @@
private MesWmMiscReceiptLineService miscReceiptLineService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
@Override
public Long createMiscReceipt(MesWmMiscReceiptSaveReqVO createReqVO) {
@@ -92,18 +114,63 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitMiscReceipt(Long id) {
- // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ public void submitMiscReceiptApproval(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateMiscReceiptExistsAndPrepare(id);
- // 鏍￠獙鑷冲皯鏈変竴鏉¤
+ // 2. 鏍￠獙鑷冲皯鏈変竴鏉¤
List<MesWmMiscReceiptLineDO> lines = miscReceiptLineService.getMiscReceiptLineListByReceiptId(id);
if (CollUtil.isEmpty(lines)) {
throw exception(WM_MISC_RECEIPT_NO_LINE);
}
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(MISC_RECEIPT_APPROVE_BIZ_TYPE);
+ // 4. 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 瀹℃壒涓級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ miscReceiptMapper.submitAndResetAuditInfo(id, MesWmMiscReceiptStatusEnum.APPROVING.getStatus());
+ }
- // 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 宸插鎵癸級
- miscReceiptMapper.updateById(new MesWmMiscReceiptDO()
- .setId(id).setStatus(MesWmMiscReceiptStatusEnum.APPROVED.getStatus()));
+ @Override
+ public Set<Long> getMiscReceiptApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(MISC_RECEIPT_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditMiscReceipt(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ MesWmMiscReceiptDO receipt = validateMiscReceiptExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
+ if (!MesWmMiscReceiptStatusEnum.APPROVING.getStatus().equals(receipt.getStatus())) {
+ throw exception(WM_MISC_RECEIPT_NOT_APPROVING);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鏍镐汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(MISC_RECEIPT_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜�
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(WM_MISC_RECEIPT_REJECT_REASON_REQUIRED);
+ }
+ miscReceiptMapper.auditMiscReceipt(id, MesWmMiscReceiptStatusEnum.PREPARE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄凡瀹℃壒锛堝彲鎵ц鍏ュ簱锛�
+ miscReceiptMapper.auditMiscReceipt(id, MesWmMiscReceiptStatusEnum.APPROVED.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
@Override
@@ -128,6 +195,7 @@
wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(line.getItemId())
.setQuantity(line.getQuantity()) // 鍏ュ簱鏁伴噺涓烘鏁�
+ .setBatchCode(line.getBatchCode()) // 鎵规绠＄悊鐗╂枡闇�鎼哄甫鎵规鍙�
.setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId())
.setBizType(MesBizTypeConstants.WM_MISC_RECPT).setBizId(receipt.getId()).setBizCode(receipt.getCode()).setBizLineId(line.getId())));
}
@@ -185,4 +253,54 @@
validateMiscReceiptExistsAndPrepare(id);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmMiscReceiptImportRespVO importMiscReceiptList(List<MesWmMiscReceiptImportExcelVO> importList, boolean updateSupport) {
+ // 鏍￠獙瀵煎叆鏁版嵁涓嶈兘涓虹┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_MISC_RECEIPT_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmMiscReceiptImportRespVO respVO = MesWmMiscReceiptImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ // 绱㈠紩锛岀敤浜庨敊璇彁绀�
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String code = importItem.getCode();
+ String key = StrUtil.blankToDefault(code, "绗� " + currentIndex + " 琛�");
+ // 鏍￠獙缂栫爜蹇呭～
+ if (StrUtil.isBlank(code)) {
+ respVO.getFailureCodes().put(key, "鍗曞彿涓嶈兘涓虹┖");
+ return;
+ }
+ // 鏍￠獙鍚嶇О蹇呭～
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ MesWmMiscReceiptDO existing = miscReceiptMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmMiscReceiptStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmMiscReceiptDO updateObj = BeanUtils.toBean(importItem, MesWmMiscReceiptDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ miscReceiptMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmMiscReceiptDO createObj = BeanUtils.toBean(importItem, MesWmMiscReceiptDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmMiscReceiptStatusEnum.PREPARE.getStatus());
+ miscReceiptMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3