Merge remote-tracking branch 'origin/dev_business' into dev_business

liu

7 天以前 ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba

 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;
@@ -61,6 +62,9 @@

    @Resource
    private ErpPurchaseOrderApi erpPurchaseOrderApi;

    @Resource
    private SrmSupplierApplyService supplierApplyService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -162,6 +166,9 @@
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
        }

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

        // 3. 查招标物料列表
        List<SrmTenderMaterialDO> materials = tenderMaterialMapper
                .selectListByTenderProjectId(award.getTenderProjectId());