Merge branch 'refs/heads/dev_business' into fix/hsy/20260811

hsy

4 天以前 bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b

 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java

@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.srm.enums.BidStatusEnum;
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,7 @@
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Function;
@@ -61,6 +63,9 @@
    @Resource
    private ErpPurchaseOrderApi erpPurchaseOrderApi;

    @Resource
    private SrmSupplierApplyService supplierApplyService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    @LogRecord(type = LOG_AWARD_TYPE, subType = LOG_AWARD_CREATE_SUB_TYPE,
@@ -76,17 +81,28 @@
        if (existing != null) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_EXISTS);
        }
        // 校验投标记录：必须属于该项目、未被撤标、且供应商一致
        SrmTenderBidDO bid = tenderBidMapper.selectById(createReqVO.getBidId());
        if (bid == null) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_NOT_EXISTS);
        }
        if (!bid.getTenderProjectId().equals(createReqVO.getTenderProjectId())) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_NOT_IN_PROJECT);
        }
        if (BidStatusEnum.WITHDRAWN.getCode().equals(bid.getBidStatus())) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_WITHDRAWN);
        }
        if (!bid.getSupplierId().equals(createReqVO.getSupplierId())) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_MATCH_BID);
        }
        SrmBidAwardDO award = BeanUtils.toBean(createReqVO, SrmBidAwardDO.class);
        award.setAwardStatus(AwardStatusEnum.PENDING_APPROVAL.getCode());
        award.setAwardTime(LocalDateTime.now());
        bidAwardMapper.insert(award);

        // 更新投标状态为中标
        SrmTenderBidDO bid = tenderBidMapper.selectById(createReqVO.getBidId());
        if (bid != null) {
            bid.setBidStatus(BidStatusEnum.WIN.getCode());
            tenderBidMapper.updateById(bid);
        }
        bid.setBidStatus(BidStatusEnum.WIN.getCode());
        tenderBidMapper.updateById(bid);

        return award.getId();
    }
@@ -150,6 +166,9 @@
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
        }

        // 供应商未准入则自动准入并通过，保证采购订单流程可用
        supplierApplyService.ensureSupplierApproved(srmSupplier.getId());

        // 3. 查招标物料列表
        List<SrmTenderMaterialDO> materials = tenderMaterialMapper
                .selectListByTenderProjectId(award.getTenderProjectId());
@@ -175,7 +194,15 @@
        Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
                .stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));

        // 6. 构建订单项
        // 6. 构建订单项（报价为总价，需除以数量得到单价）
        BigDecimal totalQuoteAmount = quotes.stream()
                .map(SrmSupplierQuoteDO::getQuotePrice)
                .reduce(BigDecimal.ZERO, BigDecimal::add);
        BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount;
        BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0
                ? awardAmount.divide(totalQuoteAmount, 8, RoundingMode.HALF_UP)
                : BigDecimal.ONE;

        List<ErpPurchaseOrderCreateReqDTO.Item> orderItems = new ArrayList<>();
        for (SrmTenderMaterialDO material : materials) {
            SrmSupplierQuoteDO quote = quoteMap.get(material.getId());
@@ -186,10 +213,12 @@
            if (mdmItem == null) {
                continue;
            }
            BigDecimal materialTotal = quote.getQuotePrice().multiply(ratio);
            BigDecimal unitPrice = materialTotal.divide(material.getQuantity(), 4, RoundingMode.HALF_UP);
            ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item();
            item.setProductId(material.getProductId());
            item.setProductUnitId(mdmItem.getUnitMeasureId());
            item.setProductPrice(quote.getQuotePrice());
            item.setProductPrice(unitPrice);
            item.setCount(material.getQuantity());
            item.setTaxPercent(quote.getTaxRate());
            item.setRemark("招标编号: " + award.getAwardNo());