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 +++++++++----
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java | 40 ++++++++++++-------
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java | 10 +++++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java | 21 ++++++++++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java | 12 ++++++
5 files changed, 87 insertions(+), 23 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java
index 54e23a7..52efe3b 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java
+++ b/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")
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);
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java
index d57352d..8251bf3 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java
+++ b/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);
+
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java
index 4dd6b76..7c83815 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java
+++ b/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 瀛楁锛宯ull 瑙嗕负涓嶆敼锛�
+ if (bidTotalAmount != null) {
+ bid.setBidTotalAmount(bidTotalAmount);
+ tenderBidMapper.updateById(bid);
+ }
+ }
+
// ========== 鏍￠獙鏂规硶 ==========
private SrmTenderBidDO validateBidExists(Long id) {
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..d6ce3f9 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);
}
@@ -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());
--
Gitblit v1.9.3