fix: 完善审批流程与业务状态校验

liu

2026-10-23 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8

 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;
    }

}