From 917a88a4841da725db10a7a8cbaf22458abfa342 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 29 八月 2026 01:56:28 +0800
Subject: [PATCH] fix(srm): 修复简易版确认中标投标金额为空时系统异常
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
index 73b86db..4865831 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
@@ -281,7 +281,8 @@
award.setBidId(bidId);
award.setAwardNo("SMP" + System.currentTimeMillis());
award.setAwardStatus(AwardStatusEnum.AWARDED.getCode());
- award.setAwardAmount(bid.getBidTotalAmount());
+ // 鎶曟爣閲戦涓虹┖鏃讹紝鍥為��鍒拌鎶曟爣涓嬫墍鏈夋姤浠蜂箣鍜岋紝閬垮厤 award_amount 涓虹┖瀵艰嚧鍏ュ簱澶辫触
+ award.setAwardAmount(resolveAwardAmount(bidId, bid.getBidTotalAmount()));
award.setAwardTime(LocalDateTime.now());
award.setApprovalTime(LocalDateTime.now());
bidAwardMapper.insert(award);
@@ -296,6 +297,20 @@
// 6. 鏇存柊椤圭洰鐘舵��
project.setTenderStatus(TenderStatusEnum.CONFIRMED.getCode());
tenderProjectMapper.updateById(project);
+ }
+
+ /**
+ * 瑙ｆ瀽涓爣閲戦锛氭姇鏍囬噾棰濅负绌烘椂锛屾眹鎬昏鎶曟爣涓嬫墍鏈夋姤浠�
+ */
+ private BigDecimal resolveAwardAmount(Long bidId, BigDecimal bidTotalAmount) {
+ if (bidTotalAmount != null) {
+ return bidTotalAmount;
+ }
+ List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectListByBidId(bidId);
+ return quotes.stream()
+ .map(SrmSupplierQuoteDO::getQuotePrice)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
}
/**
@@ -339,6 +354,7 @@
// 璁＄畻浠锋牸
BigDecimal totalQuoteAmount = quotes.stream()
.map(SrmSupplierQuoteDO::getQuotePrice)
+ .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount;
BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0
@@ -352,17 +368,25 @@
if (quote == null) {
continue;
}
+ BigDecimal quotePrice = quote.getQuotePrice();
+ if (quotePrice == 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 materialTotal = quotePrice.multiply(ratio);
+ BigDecimal unitPrice = materialTotal.divide(quantity, 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);
--
Gitblit v1.9.3