refactor(erp): 采购申请与询价比价流程重构

gaoluyang

5 天以前 8168aef3c7557c9e1361892270a1ebe35dbddba5

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

@@ -4,7 +4,6 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.framework.operatelog.core.util.OperateLogUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@@ -30,9 +29,8 @@
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderSourceTypeEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -86,8 +84,6 @@
    @Resource
    private ErpSupplierService supplierService;
    @Resource
    private SrmSupplierApi srmSupplierApi;
    @Resource
    private MdmItemApi mdmItemApi;

    @Resource
@@ -114,10 +110,8 @@
            supplierService.validateSupplier(createReqVO.getSupplierId());
        }
        // 3. 生成申请单号
        String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
        if (purchaseRequestMapper.selectByNo(no) != null) {
            throw exception(PURCHASE_REQUEST_NO_EXISTS);
        }
        String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX,
                candidate -> purchaseRequestMapper.selectByNo(candidate) != null);

        // 4. 获取当前用户信息
        Long userId = Long.parseLong(getCurrentUserId());
@@ -130,7 +124,7 @@
                .setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
                .setRequestUserId(userId)
                .setRequestDeptId(deptId));
        calculateTotalPrice(purchaseRequest, requestItems);
        calculateTotalCount(purchaseRequest, requestItems);
        purchaseRequestMapper.insert(purchaseRequest);

        // 6. 绑定附件
@@ -158,7 +152,7 @@

        // 4. 更新申请单
        ErpPurchaseRequestDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseRequestDO.class);
        calculateTotalPrice(updateObj, requestItems);
        calculateTotalCount(updateObj, requestItems);
        purchaseRequestMapper.updateById(updateObj);

        // 5. 更新申请明细
@@ -184,39 +178,24 @@
            return respVO;
        }

        // 1. 预热“供应商名称/编码 -> 供应商编号”映射（供应商为可选）
        Map<String, Long> supplierIdMap = new HashMap<>();
        CommonResult<List<SrmSupplierRespDTO>> supplierResult = srmSupplierApi.getSupplierSimpleList();
        if (supplierResult != null && CollUtil.isNotEmpty(supplierResult.getData())) {
            supplierResult.getData().forEach(supplier -> {
                if (StrUtil.isNotBlank(supplier.getName())) {
                    supplierIdMap.putIfAbsent(supplier.getName().trim(), supplier.getId());
                }
                if (StrUtil.isNotBlank(supplier.getCode())) {
                    supplierIdMap.putIfAbsent(supplier.getCode().trim(), supplier.getId());
                }
            });
        }

        // 2. 按“采购申请单号”分组
        // 1. 按“采购申请单号”分组
        Map<String, List<ErpPurchaseRequestImportExcelVO>> groups = new LinkedHashMap<>();
        for (int i = 0; i < importList.size(); i++) {
            ErpPurchaseRequestImportExcelVO row = importList.get(i);
            if (row == null || (StrUtil.isBlank(row.getProductCode()) && StrUtil.isBlank(row.getSupplierName())
                    && StrUtil.isBlank(row.getNo()))) {
            if (row == null || (StrUtil.isBlank(row.getProductCode()) && StrUtil.isBlank(row.getNo()))) {
                continue; // 跳过空行
            }
            String key = StrUtil.isNotBlank(row.getNo()) ? row.getNo().trim() : "__row_" + (i + 2);
            groups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
        }

        // 3. 逐张申请导入
        // 2. 逐张申请导入
        for (Map.Entry<String, List<ErpPurchaseRequestImportExcelVO>> entry : groups.entrySet()) {
            List<ErpPurchaseRequestImportExcelVO> rows = entry.getValue();
            String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
                    : "第 " + entry.getKey().substring("__row_".length()) + " 行";
            try {
                ErpPurchaseRequestDO purchaseRequest = createPurchaseRequestByImport(rows, supplierIdMap);
                ErpPurchaseRequestDO purchaseRequest = createPurchaseRequestByImport(rows);
                respVO.getCreateList().add(purchaseRequest.getNo());
            } catch (Exception ex) {
                respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
@@ -230,21 +209,10 @@
    /**
     * 依据导入数据创建一张采购申请（含明细）。申请人/申请部门由当前登录用户自动填充；状态为“未提交(0)”。
     */
    private ErpPurchaseRequestDO createPurchaseRequestByImport(List<ErpPurchaseRequestImportExcelVO> rows,
                                                              Map<String, Long> supplierIdMap) {
    private ErpPurchaseRequestDO createPurchaseRequestByImport(List<ErpPurchaseRequestImportExcelVO> rows) {
        ErpPurchaseRequestImportExcelVO head = rows.get(0);

        // 1. 供应商（可选）：填了则按名称/编码匹配并校验
        Long supplierId = null;
        if (StrUtil.isNotBlank(head.getSupplierName())) {
            supplierId = supplierIdMap.get(head.getSupplierName().trim());
            if (supplierId == null) {
                throw new IllegalArgumentException("供应商不存在：" + head.getSupplierName());
            }
            supplierService.validateSupplier(supplierId);
        }

        // 2. 明细
        // 1. 明细
        List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
        for (ErpPurchaseRequestImportExcelVO row : rows) {
            if (StrUtil.isBlank(row.getProductCode())) {
@@ -264,22 +232,22 @@
            ErpPurchaseRequestSaveReqVO.Item itemVO = new ErpPurchaseRequestSaveReqVO.Item();
            itemVO.setProductId(item.getId());
            itemVO.setProductUnitId(item.getUnitMeasureId());
            // 单价：未填写时取物料的采购价
            itemVO.setProductPrice(row.getProductPrice() != null ? row.getProductPrice()
                    : (item.getPurchasePrice() != null ? item.getPurchasePrice() : BigDecimal.ZERO));
            itemVO.setCount(row.getCount());
            itemVO.setTaxPercent(row.getTaxPercent());
            itemVO.setDemandTime(parseImportDate(row.getDemandTime()));
            itemVO.setQcCheckFlag("是".equals(StrUtil.trim(row.getQcCheckFlag())));
            itemVO.setRemark(row.getRemark());
            items.add(itemVO);
        }

        // 3. 单号：填了就用（校验唯一），没填自动生成 CGSQ...
        String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
                : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
        if (purchaseRequestMapper.selectByNo(no) != null) {
            throw new IllegalArgumentException("采购申请单号已存在：" + no);
        String no;
        if (StrUtil.isNotBlank(head.getNo())) {
            no = head.getNo().trim();
            if (purchaseRequestMapper.selectByNo(no) != null) {
                throw new IllegalArgumentException("采购申请单号已存在：" + no);
            }
        } else {
            no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX,
                    candidate -> purchaseRequestMapper.selectByNo(candidate) != null);
        }

        // 4. 申请人 / 申请部门：取当前登录用户及其部门
@@ -290,17 +258,15 @@
        // 5. 组装主表（状态为“未提交”）
        ErpPurchaseRequestDO purchaseRequest = new ErpPurchaseRequestDO();
        purchaseRequest.setNo(no);
        purchaseRequest.setSupplierId(supplierId);
        purchaseRequest.setRequestTime(parseImportDateTime(head.getRequestTime()));
        purchaseRequest.setRequestReason(head.getRequestReason());
        purchaseRequest.setRemark(head.getRemark());
        purchaseRequest.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus());
        purchaseRequest.setRequestUserId(userId);
        purchaseRequest.setRequestDeptId(deptId);
        purchaseRequest.setDepositPrice(BigDecimal.ZERO);

        List<ErpPurchaseRequestItemDO> itemDOs = validatePurchaseRequestItems(items);
        calculateTotalPrice(purchaseRequest, itemDOs);
        calculateTotalCount(purchaseRequest, itemDOs);
        purchaseRequestMapper.insert(purchaseRequest);
        itemDOs.forEach(item -> item.setRequestId(purchaseRequest.getId()));
        purchaseRequestItemMapper.insertBatch(itemDOs);
@@ -356,30 +322,19 @@
        return StrUtil.blankToDefault(ex.getMessage(), "导入失败");
    }

    private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
    private void calculateTotalCount(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
        purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
        purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
        purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
        // 单价为含税单价：价税合计 = 单价 * 数量，税额已包含在单价中，不再额外加税
        purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice());
        // 计算优惠价格
        if (purchaseRequest.getDiscountPercent() == null) {
            purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
        }
        purchaseRequest.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseRequest.getTotalPrice(), purchaseRequest.getDiscountPercent()));
        purchaseRequest.setTotalPrice(purchaseRequest.getTotalPrice().subtract(purchaseRequest.getDiscountPrice()));
    }

    private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
        return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
            if (item.getProductPrice() != null && item.getCount() != null) {
                item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
                if (item.getTaxPercent() != null) {
                    // 单价为含税单价：税额从价税合计中反算，而不是在合计上再加税
                    item.setTaxPrice(MoneyUtils.taxPriceIncluded(item.getTotalPrice(), item.getTaxPercent()));
                }
        return convertList(list, o -> {
            ErpPurchaseRequestItemDO item = BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class);
            // 采购申请不再填写“是否质检”，默认需要来料检验，生成台账后可在台账中调整
            if (item.getQcCheckFlag() == null) {
                item.setQcCheckFlag(true);
            }
        }));
            return item;
        });
    }

    private void updatePurchaseRequestItemList(Long id, List<ErpPurchaseRequestItemDO> newList) {
@@ -535,23 +490,11 @@
        }

        // 2. 根据审批结果更新状态
        // 审批通过后不自动生成采购台账：由采购员在列表中决定「发起询价」或「直接生成采购台账」
        Integer newStatus = convertBpmResultToStatus(bpmResult);
        if (newStatus != null) {
            purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                    .setId(id).setStatus(newStatus));
        }

        // 3. 审批通过且有供应商，自动生成采购订单
        if (ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)
                && purchaseRequest.getSupplierId() != null
                && purchaseRequest.getOrderId() == null) {
            try {
                Long orderId = doGeneratePurchaseOrder(purchaseRequest);
                log.info("[updatePurchaseRequestAuditStatus] 采购申请({}) 自动生成采购订单({})", id, orderId);
            } catch (Exception e) {
                log.error("[updatePurchaseRequestAuditStatus] 采购申请({}) 自动生成采购订单失败", id, e);
                // 不抛出异常，避免影响状态更新
            }
        }
    }

@@ -567,15 +510,18 @@
        if (purchaseRequest.getOrderId() != null) {
            throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
        }
        // 3. 供应商以采购申请单为准：申请提交时已经选过供应商，生成订单不再要求重新选择
        //    兼容旧调用方仍显式传 supplierId 的情况，传了则以传入值为准
        Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
        if (targetSupplierId == null) {
            throw exception(PURCHASE_REQUEST_SUPPLIER_REQUIRED);
        // 3. 已发起询价的申请，必须等询价确认（确定价格）后才能生成采购台账
        if (purchaseRequest.getInquiryId() != null) {
            throw exception(PURCHASE_REQUEST_INQUIRY_EXISTS);
        }
        supplierService.validateSupplier(targetSupplierId);
        // 4. 供应商不在这里确定：采购申请本身不填供应商，直接生成台账时也允许为空，
        //    由采购员在采购台账草稿里补充供应商与价格后再提交审批
        Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
        if (targetSupplierId != null) {
            supplierService.validateSupplier(targetSupplierId);
        }

        // 4. 设置供应商并生成订单
        // 5. 生成订单（supplierId 可为空，留待台账补充）
        purchaseRequest.setSupplierId(targetSupplierId);
        return doGeneratePurchaseOrder(purchaseRequest);
    }
@@ -596,10 +542,8 @@
        }

        // 2. 生成采购订单号
        String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
        if (purchaseOrderMapper.selectByNo(orderNo) != null) {
            throw exception(PURCHASE_ORDER_NO_EXISTS);
        }
        String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX,
                candidate -> purchaseOrderMapper.selectByNo(candidate) != null);

        // 3. 创建采购订单
        ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
@@ -610,12 +554,17 @@
        purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
        purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
        purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
        purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
        purchaseOrder.setTotalProductPrice(purchaseRequest.getTotalProductPrice());
        purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
        purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
        purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
        purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
        // 采购申请不含价格：台账先以 0 金额生成草稿，由采购员在台账中补录单价/税率后再提交审批
        purchaseOrder.setTotalPrice(BigDecimal.ZERO);
        purchaseOrder.setTotalProductPrice(BigDecimal.ZERO);
        purchaseOrder.setTotalTaxPrice(BigDecimal.ZERO);
        purchaseOrder.setDiscountPercent(BigDecimal.ZERO);
        purchaseOrder.setDiscountPrice(BigDecimal.ZERO);
        purchaseOrder.setDepositPrice(BigDecimal.ZERO);
        purchaseOrder.setSourceType(ErpPurchaseOrderSourceTypeEnum.PURCHASE_REQUEST.getType());
        purchaseOrder.setSourceId(purchaseRequest.getId());
        purchaseOrder.setSourceNo(purchaseRequest.getNo());
        purchaseOrder.setPurchaseRequestId(purchaseRequest.getId());
        purchaseOrder.setRemark(purchaseRequest.getRemark());
        purchaseOrder.setInCount(BigDecimal.ZERO);
        purchaseOrder.setInStatus(0);
@@ -628,11 +577,12 @@
            orderItem.setRequestItemId(item.getId()); // 关联采购申请明细
            orderItem.setProductId(item.getProductId());
            orderItem.setProductUnitId(item.getProductUnitId());
            orderItem.setProductPrice(item.getProductPrice());
            // 单价/税率待采购员在台账中补录，先按 0 保存
            orderItem.setProductPrice(BigDecimal.ZERO);
            orderItem.setCount(item.getCount());
            orderItem.setTotalPrice(item.getTotalPrice());
            orderItem.setTaxPercent(item.getTaxPercent());
            orderItem.setTaxPrice(item.getTaxPrice());
            orderItem.setTotalPrice(BigDecimal.ZERO);
            orderItem.setTaxPercent(BigDecimal.ZERO);
            orderItem.setTaxPrice(BigDecimal.ZERO);
            orderItem.setRemark(item.getRemark());
            orderItem.setInCount(BigDecimal.ZERO);
            // 是否质检与采购申请保持一致：明细未明确标记时默认为「是」（历史申请单可能为 null）