From 227eff61120aaca63e068035d745d86452e6499a Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:12 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 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 962feb8..f005359 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 com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -21,10 +22,13 @@
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 瀹炵幇绫�
@@ -60,11 +64,32 @@
@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());
@@ -72,11 +97,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();
}
@@ -95,6 +117,10 @@
@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);
}
@@ -102,16 +128,18 @@
@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
@@ -121,6 +149,11 @@
SrmBidAwardDO award = validateAwardExists(id);
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 渚涘簲鍟�
@@ -154,7 +187,15 @@
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
.stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
- // 6. 鏋勫缓璁㈠崟椤�
+ // 6. 鏋勫缓璁㈠崟椤癸紙鎶ヤ环涓烘�讳环锛岄渶闄や互鏁伴噺寰楀埌鍗曚环锛�
+ BigDecimal totalQuoteAmount = quotes.stream()
+ .map(SrmSupplierQuoteDO::getQuotePrice)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ 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());
@@ -165,10 +206,12 @@
if (mdmItem == null) {
continue;
}
+ BigDecimal materialTotal = quote.getQuotePrice().multiply(ratio);
+ BigDecimal unitPrice = materialTotal.divide(material.getQuantity(), 4, RoundingMode.HALF_UP);
ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item();
item.setProductId(material.getProductId());
item.setProductUnitId(mdmItem.getUnitMeasureId());
- item.setProductPrice(quote.getQuotePrice());
+ item.setProductPrice(unitPrice);
item.setCount(material.getQuantity());
item.setTaxPercent(quote.getTaxRate());
item.setRemark("鎷涙爣缂栧彿: " + award.getAwardNo());
@@ -201,11 +244,8 @@
bidAwardMapper.updateById(award);
// 9. 鏇存柊鎷涙爣椤圭洰鐘舵��
- SrmTenderProjectDO project = tenderProjectMapper.selectById(award.getTenderProjectId());
- if (project != null) {
- project.setTenderStatus(TenderStatusEnum.CLOSED.getCode());
- tenderProjectMapper.updateById(project);
- }
+ project.setTenderStatus(TenderStatusEnum.CLOSED.getCode());
+ tenderProjectMapper.updateById(project);
}
private SrmBidAwardDO validateAwardExists(Long id) {
--
Gitblit v1.9.3