From bc31cda78817c62aa552be40f39eccaa03262923 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:22 +0800
Subject: [PATCH] feat: 补齐排产约束与缺料校验，新增风险监测，优化隐患通知与招投标联动
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 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 4865831..c5838c9 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,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);
}
@@ -338,11 +342,7 @@
if (CollUtil.isEmpty(quotes)) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_QUOTE_NOT_EXISTS);
}
- Map<Long, SrmSupplierQuoteDO> quoteMap = quotes.stream()
- .collect(Collectors.toMap(
- SrmSupplierQuoteDO::getTenderMaterialId,
- Function.identity(),
- (a, b) -> a));
+ Map<Long, SrmSupplierQuoteDO> quoteMap = SrmPurchaseQuoteValidator.validate(materials, quotes);
// 鏌� MDM 鐗╂枡
Set<Long> productIds = materials.stream()
@@ -350,12 +350,22 @@
.collect(Collectors.toSet());
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
.stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
+ if (productIds.stream().anyMatch(id -> !itemMap.containsKey(id))) {
+ throw ServiceExceptionUtil.invalidParamException("瀛樺湪鏃犳硶鍖归厤鐨勭墿鏂欙紝璇峰厛缁存姢鐗╂枡鍚庡啀鐢熸垚閲囪喘璁㈠崟");
+ }
- // 璁＄畻浠锋牸
- 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 +390,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());
--
Gitblit v1.9.3