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 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 14 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 c27da39..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
@@ -14,21 +14,29 @@
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;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
/**
* SRM 瀹氭爣绠＄悊 Service 瀹炵幇绫�
*/
@Service
@Validated
+@Slf4j
public class SrmBidAwardServiceImpl implements SrmBidAwardService {
@Resource
@@ -55,13 +63,37 @@
@Resource
private ErpPurchaseOrderApi erpPurchaseOrderApi;
+ @Resource
+ private SrmSupplierApplyService supplierApplyService;
+
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = LOG_AWARD_TYPE, subType = LOG_AWARD_CREATE_SUB_TYPE,
+ bizNo = "{{#createReqVO.awardNo}}", success = LOG_AWARD_CREATE_SUCCESS)
public Long createAward(SrmBidAwardSaveReqVO createReqVO) {
+ // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細浠� EVALUATING 鍏佽鍒涘缓瀹氭爣
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(createReqVO.getTenderProjectId());
+ if (project == null || !TenderStatusEnum.canAward(project.getTenderStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
+ }
// 鏍￠獙鏄惁宸插瓨鍦ㄥ畾鏍�
SrmBidAwardDO existing = bidAwardMapper.selectByTenderProjectId(createReqVO.getTenderProjectId());
if (existing != null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_EXISTS);
+ }
+ // 鏍￠獙鎶曟爣璁板綍锛氬繀椤诲睘浜庤椤圭洰銆佹湭琚挙鏍囥�佷笖渚涘簲鍟嗕竴鑷�
+ SrmTenderBidDO bid = tenderBidMapper.selectById(createReqVO.getBidId());
+ if (bid == null) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_NOT_EXISTS);
+ }
+ if (!bid.getTenderProjectId().equals(createReqVO.getTenderProjectId())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_NOT_IN_PROJECT);
+ }
+ if (BidStatusEnum.WITHDRAWN.getCode().equals(bid.getBidStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_WITHDRAWN);
+ }
+ if (!bid.getSupplierId().equals(createReqVO.getSupplierId())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_MATCH_BID);
}
SrmBidAwardDO award = BeanUtils.toBean(createReqVO, SrmBidAwardDO.class);
award.setAwardStatus(AwardStatusEnum.PENDING_APPROVAL.getCode());
@@ -69,11 +101,8 @@
bidAwardMapper.insert(award);
// 鏇存柊鎶曟爣鐘舵�佷负涓爣
- SrmTenderBidDO bid = tenderBidMapper.selectById(createReqVO.getBidId());
- if (bid != null) {
- bid.setBidStatus(BidStatusEnum.WIN.getCode());
- tenderBidMapper.updateById(bid);
- }
+ bid.setBidStatus(BidStatusEnum.WIN.getCode());
+ tenderBidMapper.updateById(bid);
return award.getId();
}
@@ -90,18 +119,31 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void deleteAward(Long id) {
+ SrmBidAwardDO award = validateAwardExists(id);
+ // 浠呭緟瀹℃壒鐘舵�佸彲鍒犻櫎
+ if (!AwardStatusEnum.PENDING_APPROVAL.getCode().equals(award.getAwardStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
+ }
+ bidAwardMapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void approveAward(Long id) {
SrmBidAwardDO award = validateAwardExists(id);
+ // 鏍￠獙鎷涙爣椤圭洰鐘舵�佷负璇勬爣涓�
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(award.getTenderProjectId());
+ if (project == null || !TenderStatusEnum.canAward(project.getTenderStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
+ }
award.setAwardStatus(AwardStatusEnum.AWARDED.getCode());
award.setApprovalTime(LocalDateTime.now());
bidAwardMapper.updateById(award);
// 鏇存柊鎷涙爣椤圭洰鐘舵�佷负宸插畾鏍�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(award.getTenderProjectId());
- if (project != null) {
- project.setTenderStatus(TenderStatusEnum.AWARDED.getCode());
- tenderProjectMapper.updateById(project);
- }
+ project.setTenderStatus(TenderStatusEnum.AWARDED.getCode());
+ tenderProjectMapper.updateById(project);
}
@Override
@@ -112,12 +154,20 @@
if (!AwardStatusEnum.AWARDED.getCode().equals(award.getAwardStatus())) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_STATUS_NOT_AWARDED);
}
+ // 鏍￠獙鎷涙爣椤圭洰鐘舵�佷负宸插畾鏍�
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(award.getTenderProjectId());
+ if (project == null || !TenderStatusEnum.AWARDED.getCode().equals(project.getTenderStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
+ }
// 2. 鏌� SRM 渚涘簲鍟�
SrmSupplierDO srmSupplier = supplierMapper.selectById(award.getSupplierId());
if (srmSupplier == null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
}
+
+ // 渚涘簲鍟嗘湭鍑嗗叆鍒欒嚜鍔ㄥ噯鍏ュ苟閫氳繃锛屼繚璇侀噰璐鍗曟祦绋嬪彲鐢�
+ supplierApplyService.ensureSupplierApproved(srmSupplier.getId());
// 3. 鏌ユ嫑鏍囩墿鏂欏垪琛�
List<SrmTenderMaterialDO> materials = tenderMaterialMapper
@@ -144,22 +194,43 @@
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
.stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
- // 6. 鏋勫缓璁㈠崟椤�
+ // 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)
+ : BigDecimal.ONE;
+
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 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(quote.getQuotePrice());
- item.setCount(material.getQuantity());
+ item.setProductPrice(unitPrice);
+ item.setCount(quantity);
item.setTaxPercent(quote.getTaxRate());
item.setRemark("鎷涙爣缂栧彿: " + award.getAwardNo());
orderItems.add(item);
@@ -169,15 +240,30 @@
ErpPurchaseOrderCreateReqDTO createReq = new ErpPurchaseOrderCreateReqDTO();
createReq.setSupplierId(srmSupplier.getId());
createReq.setOrderTime(LocalDateTime.now());
+ createReq.setDepositPrice(BigDecimal.ZERO);
createReq.setItems(orderItems);
createReq.setRemark("SRM 瀹氭爣鑷姩鐢熸垚, 瀹氭爣缂栧彿: " + award.getAwardNo());
Long purchaseOrderId = erpPurchaseOrderApi.createPurchaseOrder(createReq).getCheckedData();
+ // 鑾峰彇閲囪喘璁㈠崟鍙�
+ String purchaseOrderNo = null;
+ try {
+ purchaseOrderNo = erpPurchaseOrderApi.getPurchaseOrder(purchaseOrderId)
+ .getCheckedData().getNo();
+ } catch (Exception e) {
+ log.warn("[generatePurchaseOrder] 鑾峰彇閲囪喘璁㈠崟鍙峰け璐ワ紝purchaseOrderId={}", purchaseOrderId, e);
+ }
+
// 8. 鏇存柊瀹氭爣璁板綍
award.setPurchaseOrderId(purchaseOrderId);
+ award.setPurchaseOrderNo(purchaseOrderNo);
award.setAwardStatus(AwardStatusEnum.ORDER_GENERATED.getCode());
bidAwardMapper.updateById(award);
+
+ // 9. 鏇存柊鎷涙爣椤圭洰鐘舵��
+ project.setTenderStatus(TenderStatusEnum.CLOSED.getCode());
+ tenderProjectMapper.updateById(project);
}
private SrmBidAwardDO validateAwardExists(Long id) {
--
Gitblit v1.9.3