From afd32af33acb4ab6f8e890c817d012cad75639c7 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 04 九月 2026 11:32:11 +0800
Subject: [PATCH] feat(SRM): 投标总金额支持人工维护，订单按报价单价口径生成
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
index aa836d3..a65fc6d 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
+++ b/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);
--
Gitblit v1.9.3