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

liu

2026-10-23 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java

@@ -5,6 +5,8 @@
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;
@@ -25,8 +27,11 @@
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;
@@ -190,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())));
    }
@@ -247,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;
    }

}