fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）

xiaoyi

9 天以前 481d8165f26fc7e37f0e87f6444ac0340bb563a3

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java

@@ -3,25 +3,39 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
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.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpAccountMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpSupplierMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.api.arrivalnotice.MesArrivalNoticeApi;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -62,6 +76,11 @@
     */
    private static final String PURCHASE_ORDER_APPROVE_BIZ_TYPE = "erp_purchase_order_approve";

    /**
     * 采购订单审批的 BPM 流程定义 Key
     */
    private static final String PURCHASE_ORDER_PROCESS_KEY = "purchase_approve";

    @Resource
    private ErpPurchaseOrderMapper purchaseOrderMapper;
    @Resource
@@ -74,9 +93,19 @@
    private ErpSupplierService supplierService;
    @Resource
    private ErpAccountService accountService;
    @Resource
    private ErpSupplierMapper supplierMapper;
    @Resource
    private ErpAccountMapper accountMapper;
    @Resource
    private MdmItemApi mdmItemApi;
    @Resource
    private MdmUnitMeasureApi mdmUnitMeasureApi;

    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private AdminUserApi adminUserApi;

@@ -222,7 +251,15 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_ORDER_APPROVE_BIZ_TYPE);

        // 3. 置为审批中，并清空上一轮审核信息，避免驳回原因残留
        purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus());
        if (purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_ALLOWED);
        }

        // 4. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(PURCHASE_ORDER_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
    }

    @Override
@@ -247,14 +284,18 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(PURCHASE_ORDER_AUDIT_REJECT_REASON_REQUIRED);
            }
            purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }

        // 3. 审核通过
        purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
        }
    }

    /**
@@ -286,12 +327,23 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updatePurchaseOrderAuditStatus(Long id, Integer bpmStatus, String reason) {
        // 1. BPM 审批结果映射为采购订单状态：通过=20 / 不通过=30 / 取消=40
        Integer newStatus = convertBpmResultToAuditStatus(bpmStatus);
        if (newStatus == null) {
            return;
        }
        // 2. 仅当仍处于「审批中」时回写，避免重复覆盖
        if (purchaseOrderMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
            log.warn("[updatePurchaseOrderAuditStatus] 采购订单({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    /**
     * 转换 BPM 审批结果为审核状态
     *
     * 已废弃：采购订单不再走 BPM 流程，本方法仅为历史代码保留，不再被调用。
     */
    @Deprecated
    private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
            return ErpPurchaseOrderStatusEnum.APPROVE.getStatus();
@@ -384,8 +436,12 @@
            return;
        }
        purchaseOrders.forEach(purchaseOrder -> {
            if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
            if (ErpPurchaseOrderStatusEnum.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
                throw exception(PURCHASE_ORDER_DELETE_FAIL_APPROVE, purchaseOrder.getNo());
            }
            // 审批中禁止删除，需先由审批人「审核不通过」退回
            if (ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
                throw exception(PURCHASE_ORDER_UPDATE_FAIL_PROCESS, purchaseOrder.getNo());
            }
        });

@@ -590,4 +646,133 @@
        return arrivalNoticeId;
    }

    @Override
    public ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> rows,
                                                                ErpPurchaseOrderImportReqVO req) {
        if (CollUtil.isEmpty(rows)) throw exception(PURCHASE_ORDER_IMPORT_LIST_IS_EMPTY);
        if (Boolean.TRUE.equals(req.getUpdateSupport())) throw exception(PURCHASE_ORDER_IMPORT_INVALID, "仅支持新增，不支持覆盖");
        ErpPurchaseOrderImportRespVO result = ErpPurchaseOrderImportRespVO.builder()
                .createPurchaseOrderNos(new ArrayList<>()).failurePurchaseOrderNos(new LinkedHashMap<>()).build();
        List<List<ErpPurchaseOrderImportExcelVO>> groups = new ArrayList<>();
        List<String> labels = new ArrayList<>();
        Map<String, Integer> indexes = new LinkedHashMap<>();
        for (int i = 0; i < rows.size(); i++) {
            ErpPurchaseOrderImportExcelVO row = rows.get(i);
            if (row == null || cn.hutool.core.bean.BeanUtil.beanToMap(row).values().stream()
                    .noneMatch(value -> value != null && (!(value instanceof String) || StrUtil.isNotBlank((String) value)))) continue;
            if (StrUtil.isBlank(row.getNo())) {
                groups.add(new ArrayList<>(Collections.singletonList(row)));
                labels.add("第" + (i + 2) + "行");
                continue;
            }
            String key = row.getNo().trim();
            Integer index = indexes.get(key);
            if (index == null) {
                index = groups.size(); indexes.put(key, index);
                groups.add(new ArrayList<>()); labels.add(key);
            }
            groups.get(index).add(row);
        }
        if (groups.isEmpty()) throw exception(PURCHASE_ORDER_IMPORT_LIST_IS_EMPTY);
        for (int i = 0; i < groups.size(); i++) {
            try {
                Long id = cn.hutool.extra.spring.SpringUtil.getBean(ErpPurchaseOrderServiceImpl.class)
                        .createImportedPurchaseOrder(groups.get(i));
                result.getCreatePurchaseOrderNos().add(purchaseOrderMapper.selectById(id).getNo());
            } catch (ServiceException ex) {
                result.getFailurePurchaseOrderNos().put(labels.get(i), ex.getMessage());
            } catch (RuntimeException ex) {
                log.error("[importPurchaseOrderList] 采购订单导入失败，分组={}", labels.get(i), ex);
                result.getFailurePurchaseOrderNos().put(labels.get(i), "导入失败，请检查基础资料和订单明细");
            }
        }
        return result;
    }

    @Transactional(rollbackFor = Exception.class)
    public Long createImportedPurchaseOrder(List<ErpPurchaseOrderImportExcelVO> group) {
        return createPurchaseOrder(buildPurchaseOrderImportSaveReqVO(group));
    }


    /**
     * 将同一张采购订单的多行明细转换成创建 Request VO
     */
    private ErpPurchaseOrderSaveReqVO buildPurchaseOrderImportSaveReqVO(List<ErpPurchaseOrderImportExcelVO> group) {
        ErpPurchaseOrderImportExcelVO first = group.get(0);
        // 1. 校验并解析供应商
        if (StrUtil.isBlank(first.getSupplierName())) {
            throw exception(PURCHASE_ORDER_IMPORT_SUPPLIER_NOT_EXISTS, "");
        }
        ErpSupplierDO supplier = supplierMapper.selectByName(first.getSupplierName());
        if (supplier == null) {
            throw exception(PURCHASE_ORDER_IMPORT_SUPPLIER_NOT_EXISTS, first.getSupplierName());
        }
        if (first.getOrderTime() == null) {
            throw exception(PURCHASE_ORDER_IMPORT_ORDER_TIME_REQUIRED);
        }
        if (first.getDiscountPercent() != null && (first.getDiscountPercent().signum() < 0 || first.getDiscountPercent().compareTo(new BigDecimal("100")) > 0)
                || first.getDepositPrice() != null && first.getDepositPrice().signum() < 0) {
            throw exception(PURCHASE_ORDER_IMPORT_INVALID, "优惠率须在 0 至 100 之间，定金不能为负数");
        }
        for (ErpPurchaseOrderImportExcelVO row : group) {
            if (StrUtil.isNotBlank(row.getSupplierName()) && !StrUtil.equals(first.getSupplierName(), row.getSupplierName())
                    || row.getOrderTime() != null && !row.getOrderTime().equals(first.getOrderTime())
                    || StrUtil.isNotBlank(row.getAccountName()) && !StrUtil.equals(first.getAccountName(), row.getAccountName())
                    || row.getDiscountPercent() != null && (first.getDiscountPercent() == null || row.getDiscountPercent().compareTo(first.getDiscountPercent()) != 0)
                    || row.getDepositPrice() != null && (first.getDepositPrice() == null || row.getDepositPrice().compareTo(first.getDepositPrice()) != 0)
                    || StrUtil.isNotBlank(row.getRemark()) && !StrUtil.equals(first.getRemark(), row.getRemark())) {
                throw exception(PURCHASE_ORDER_IMPORT_INVALID, "同一采购订单的主表信息不一致");
            }
            if (StrUtil.isBlank(row.getProductCode()) || StrUtil.isBlank(row.getProductUnitCode()) || row.getCount() == null || row.getCount().signum() <= 0
                    || row.getProductPrice() == null || row.getProductPrice().signum() < 0
                    || row.getTaxPercent() != null && (row.getTaxPercent().signum() < 0 || row.getTaxPercent().compareTo(new BigDecimal("100")) > 0)) {
                throw exception(PURCHASE_ORDER_IMPORT_INVALID, "每行须填写物料、单位、正数数量、非负单价；税率须在 0 至 100 之间");
            }
        }
        // 2. 解析结算账户（可选）
        Long accountId = null;
        if (StrUtil.isNotBlank(first.getAccountName())) {
            ErpAccountDO account = accountMapper.selectByName(first.getAccountName());
            if (account == null) {
                throw exception(PURCHASE_ORDER_IMPORT_ACCOUNT_NOT_EXISTS, first.getAccountName());
            }
            accountId = account.getId();
        }
        // 3. 组装明细
        List<ErpPurchaseOrderSaveReqVO.Item> items = new ArrayList<>();
        for (ErpPurchaseOrderImportExcelVO row : group) {
            MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode().trim()).getCheckedData();
            if (product == null) {
                throw exception(PURCHASE_ORDER_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
            }
            MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode().trim()).getCheckedData();
            if (unit == null) {
                throw exception(PURCHASE_ORDER_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
            }
            if (product.getStatus() != null && product.getStatus() != 0 || unit.getStatus() != null && unit.getStatus() != 0) {
                throw exception(PURCHASE_ORDER_IMPORT_INVALID, "物料或计量单位已停用");
            }
            ErpPurchaseOrderSaveReqVO.Item item = new ErpPurchaseOrderSaveReqVO.Item()
                    .setProductId(product.getId())
                    .setProductUnitId(unit.getId())
                    .setProductPrice(row.getProductPrice())
                    .setCount(row.getCount())
                    .setTaxPercent(row.getTaxPercent())
                    .setQcCheckFlag(row.getQcCheckFlag())
                    .setRemark(row.getItemRemark());
            items.add(item);
        }
        // 4. 组装主表
        ErpPurchaseOrderSaveReqVO createReqVO = new ErpPurchaseOrderSaveReqVO()
                .setSupplierId(supplier.getId())
                .setAccountId(accountId)
                .setOrderTime(first.getOrderTime())
                .setDiscountPercent(ObjectUtil.defaultIfNull(first.getDiscountPercent(), BigDecimal.ZERO))
                .setDepositPrice(ObjectUtil.defaultIfNull(first.getDepositPrice(), BigDecimal.ZERO))
                .setRemark(first.getRemark())
                .setItems(items);
        return createReqVO;
    }

}