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/SrmBidAwardServiceImpl.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 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 f005359..776739d 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
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.srm.enums.BidStatusEnum;
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
+import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -61,6 +62,9 @@
@Resource
private ErpPurchaseOrderApi erpPurchaseOrderApi;
+
+ @Resource
+ private SrmSupplierApplyService supplierApplyService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -162,6 +166,9 @@
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
}
+ // 渚涘簲鍟嗘湭鍑嗗叆鍒欒嚜鍔ㄥ噯鍏ュ苟閫氳繃锛屼繚璇侀噰璐鍗曟祦绋嬪彲鐢�
+ supplierApplyService.ensureSupplierApproved(srmSupplier.getId());
+
// 3. 鏌ユ嫑鏍囩墿鏂欏垪琛�
List<SrmTenderMaterialDO> materials = tenderMaterialMapper
.selectListByTenderProjectId(award.getTenderProjectId());
@@ -174,11 +181,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);
// 5. 鎵归噺鏌� MDM 鐗╂枡锛岃幏鍙栬閲忓崟浣�
Set<Long> productIds = materials.stream()
@@ -186,11 +189,22 @@
.collect(Collectors.toSet());
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
.stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
+ if (productIds.stream().anyMatch(productId -> !itemMap.containsKey(productId))) {
+ throw ServiceExceptionUtil.invalidParamException("瀛樺湪鏃犳硶鍖归厤鐨勭墿鏂欙紝璇峰厛缁存姢鐗╂枡鍚庡啀鐢熸垚閲囪喘璁㈠崟");
+ }
- // 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)
@@ -199,20 +213,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