yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java
@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.List; import java.util.Map; import java.util.Set; @@ -75,6 +76,17 @@ return success(true); } @PutMapping("/update-total") @Operation(summary = "更新投标总金额") @Parameter(name = "id", description = "投标ID", required = true) @Parameter(name = "bidTotalAmount", description = "投标总金额（报价合计自动带出后可人工调整）") @PreAuthorize("@ss.hasPermission('srm:tender-bid:update')") public CommonResult<Boolean> updateBidTotal(@RequestParam("id") Long id, @RequestParam(value = "bidTotalAmount", required = false) BigDecimal bidTotalAmount) { tenderBidService.updateBidTotal(id, bidTotalAmount); return success(true); } // ========== 供应商报价 ========== @PostMapping("/quote/create") yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
@@ -194,10 +194,18 @@ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData() .stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity())); // 6. 构建订单项（报价为总价，需除以数量得到单价） BigDecimal totalQuoteAmount = quotes.stream() .map(SrmSupplierQuoteDO::getQuotePrice) .reduce(BigDecimal.ZERO, BigDecimal::add); // 6. 构建订单项（报价为“单价”口径：行金额 = 报价单价 × 数量； // 定标金额与报价合计不一致时按行金额比例分摊，订单行单价仍取报价单价） BigDecimal totalQuoteAmount = BigDecimal.ZERO; for (SrmTenderMaterialDO material : materials) { SrmSupplierQuoteDO quote = quoteMap.get(material.getId()); BigDecimal quantity = material.getQuantity(); if (quote == null || quote.getQuotePrice() == null || quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) { continue; } totalQuoteAmount = totalQuoteAmount.add(quote.getQuotePrice().multiply(quantity)); } BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount; BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0 ? awardAmount.divide(totalQuoteAmount, 8, RoundingMode.HALF_UP) @@ -206,20 +214,23 @@ List<ErpPurchaseOrderCreateReqDTO.Item> orderItems = new ArrayList<>(); for (SrmTenderMaterialDO material : materials) { SrmSupplierQuoteDO quote = quoteMap.get(material.getId()); if (quote == null) { if (quote == null || quote.getQuotePrice() == null) { continue; } BigDecimal quantity = material.getQuantity(); if (quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) { continue; } MdmItemRespDTO mdmItem = itemMap.get(material.getProductId()); if (mdmItem == null) { continue; } BigDecimal materialTotal = quote.getQuotePrice().multiply(ratio); BigDecimal unitPrice = materialTotal.divide(material.getQuantity(), 4, RoundingMode.HALF_UP); BigDecimal unitPrice = quote.getQuotePrice().multiply(ratio).setScale(4, RoundingMode.HALF_UP); ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item(); item.setProductId(material.getProductId()); item.setProductUnitId(mdmItem.getUnitMeasureId()); item.setProductPrice(unitPrice); item.setCount(material.getQuantity()); item.setCount(quantity); item.setTaxPercent(quote.getTaxRate()); item.setRemark("招标编号: " + award.getAwardNo()); orderItems.add(item); yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderBidDO; import jakarta.validation.Valid; import java.math.BigDecimal; import java.util.List; /** @@ -52,4 +53,13 @@ */ List<SrmSupplierQuoteDO> getQuoteList(Long bidId); // ========== 投标总金额（人工维护） ========== /** * 更新投标总金额：报价明细填写后可由前端自动带出报价合计，再人工微调 * * @param bidTotalAmount 投标总金额；为 null 时不更新 */ void updateBidTotal(Long bidId, BigDecimal bidTotalAmount); } yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @@ -117,6 +118,7 @@ // ========== 报价管理 ========== @Override @Transactional(rollbackFor = Exception.class) @LogRecord(type = LOG_QUOTE_TYPE, subType = LOG_QUOTE_CREATE_SUB_TYPE, bizNo = "{{#createReqVO.bidId}}", success = LOG_QUOTE_CREATE_SUCCESS) public Long createQuote(SrmSupplierQuoteSaveReqVO createReqVO) { @@ -140,6 +142,7 @@ } @Override @Transactional(rollbackFor = Exception.class) public void updateQuote(SrmSupplierQuoteSaveReqVO updateReqVO) { // 校验投标状态（撤标后不允许报价） SrmTenderBidDO bid = validateBidNotWithdrawn(updateReqVO.getBidId()); @@ -164,6 +167,24 @@ return supplierQuoteMapper.selectListByBidId(bidId); } // ========== 投标总金额（人工维护，可自动带出报价合计后调整） ========== @Override public void updateBidTotal(Long bidId, BigDecimal bidTotalAmount) { // 校验投标状态（撤标后不允许修改） SrmTenderBidDO bid = validateBidNotWithdrawn(bidId); // 校验招标项目状态：仅允许维护报价的招标状态下可修改 SrmTenderProjectDO project = tenderProjectMapper.selectById(bid.getTenderProjectId()); if (project == null || !TenderStatusEnum.canCreateOrUpdateQuote(project.getTenderStatus())) { throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_QUOTE_FORBIDDEN); } // 仅在传入非 null 时更新（MyBatis-Plus updateById 会忽略 null 字段，null 视为不改） if (bidTotalAmount != null) { bid.setBidTotalAmount(bidTotalAmount); tenderBidMapper.updateById(bid); } } // ========== 校验方法 ========== private SrmTenderBidDO validateBidExists(Long id) { yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
@@ -281,8 +281,8 @@ award.setBidId(bidId); award.setAwardNo("SMP" + System.currentTimeMillis()); award.setAwardStatus(AwardStatusEnum.AWARDED.getCode()); // 投标金额为空时，回退到该投标下所有报价之和，避免 award_amount 为空导致入库失败 award.setAwardAmount(resolveAwardAmount(bidId, bid.getBidTotalAmount())); // 投标金额为空时，回退到该投标下所有报价行金额之和 = Σ（报价单价 × 物料数量），避免 award_amount 为空导致入库失败 award.setAwardAmount(resolveAwardAmount(id, bidId, bid.getBidTotalAmount())); award.setAwardTime(LocalDateTime.now()); award.setApprovalTime(LocalDateTime.now()); bidAwardMapper.insert(award); @@ -300,16 +300,20 @@ } /** * 解析中标金额：投标金额为空时，汇总该投标下所有报价 * 解析中标金额：投标金额为空时，汇总该投标下所有报价行金额 = Σ（报价单价 × 物料数量） */ private BigDecimal resolveAwardAmount(Long bidId, BigDecimal bidTotalAmount) { private BigDecimal resolveAwardAmount(Long tenderProjectId, Long bidId, BigDecimal bidTotalAmount) { if (bidTotalAmount != null) { return bidTotalAmount; } List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectListByBidId(bidId); return quotes.stream() .map(SrmSupplierQuoteDO::getQuotePrice) .filter(Objects::nonNull) List<SrmTenderMaterialDO> materials = tenderMaterialMapper.selectListByTenderProjectId(tenderProjectId); Map<Long, BigDecimal> quantityMap = materials.stream() .collect(Collectors.toMap(SrmTenderMaterialDO::getId, material -> material.getQuantity() == null ? BigDecimal.ZERO : material.getQuantity())); return supplierQuoteMapper.selectListByBidId(bidId).stream() .filter(quote -> quote.getQuotePrice() != null && quote.getTenderMaterialId() != null) .map(quote -> quote.getQuotePrice() .multiply(quantityMap.getOrDefault(quote.getTenderMaterialId(), BigDecimal.ZERO))) .reduce(BigDecimal.ZERO, BigDecimal::add); } @@ -351,11 +355,18 @@ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData() .stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity())); // 计算价格 BigDecimal totalQuoteAmount = quotes.stream() .map(SrmSupplierQuoteDO::getQuotePrice) .filter(Objects::nonNull) .reduce(BigDecimal.ZERO, BigDecimal::add); // 计算价格（报价为“单价”口径：行金额 = 报价单价 × 数量； // 定标金额与报价合计不一致时按行金额比例分摊，订单行单价仍取报价单价） BigDecimal totalQuoteAmount = BigDecimal.ZERO; for (SrmTenderMaterialDO material : materials) { SrmSupplierQuoteDO quote = quoteMap.get(material.getId()); BigDecimal quantity = material.getQuantity(); if (quote == null || quote.getQuotePrice() == null || quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) { continue; } totalQuoteAmount = totalQuoteAmount.add(quote.getQuotePrice().multiply(quantity)); } BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount; BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0 ? awardAmount.divide(totalQuoteAmount, 8, RoundingMode.HALF_UP) @@ -380,8 +391,7 @@ if (mdmItem == null) { continue; } BigDecimal materialTotal = quotePrice.multiply(ratio); BigDecimal unitPrice = materialTotal.divide(quantity, 4, RoundingMode.HALF_UP); BigDecimal unitPrice = quotePrice.multiply(ratio).setScale(4, RoundingMode.HALF_UP); ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item(); item.setProductId(material.getProductId()); item.setProductUnitId(mdmItem.getUnitMeasureId());
