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/SrmBidEvaluationServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java
index c0f3b72..f211793 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java
@@ -11,6 +11,7 @@
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +22,8 @@
import java.time.LocalDateTime;
import java.util.Comparator;
import java.util.List;
+
+import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
/**
* SRM 璇勬爣绠＄悊 Service 瀹炵幇绫�
@@ -42,7 +45,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = LOG_EVALUATION_TYPE, subType = LOG_EVALUATION_CREATE_SUB_TYPE,
+ bizNo = "{{#createReqVO.tenderProjectId}}", success = LOG_EVALUATION_CREATE_SUCCESS)
public Long createEvaluation(SrmBidEvaluationSaveReqVO createReqVO) {
+ // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細BIDDING 鎴� EVALUATING 鎵嶅厑璁歌瘎鏍�
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(createReqVO.getTenderProjectId());
+ if (project == null) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
+ }
+ Integer status = project.getTenderStatus();
+ if (!TenderStatusEnum.BIDDING.getCode().equals(status)
+ && !TenderStatusEnum.EVALUATING.getCode().equals(status)) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_EVALUATION_FORBIDDEN);
+ }
+
SrmBidEvaluationDO evaluation = BeanUtils.toBean(createReqVO, SrmBidEvaluationDO.class);
// 寮哄埗缃┖ id锛岄伩鍏嶅墠绔紶鍏ュ凡鏈� id 瀵艰嚧涓婚敭鍐茬獊锛岀敱鏁版嵁搴撳簭鍒楄嚜鍔ㄧ敓鎴�
evaluation.setId(null);
@@ -60,8 +76,7 @@
evaluation.setEvaluationTime(LocalDateTime.now());
bidEvaluationMapper.insert(evaluation);
// 棣栨璇勬爣鏃舵洿鏂版嫑鏍囬」鐩姸鎬佷负璇勬爣涓�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(createReqVO.getTenderProjectId());
- if (project != null && TenderStatusEnum.BIDDING.getCode().equals(project.getTenderStatus())) {
+ if (TenderStatusEnum.BIDDING.getCode().equals(project.getTenderStatus())) {
project.setTenderStatus(TenderStatusEnum.EVALUATING.getCode());
tenderProjectMapper.updateById(project);
}
@@ -74,6 +89,11 @@
SrmBidEvaluationDO existing = bidEvaluationMapper.selectById(updateReqVO.getId());
if (existing == null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.EVALUATION_NOT_EXISTS_TENDER);
+ }
+ // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細浠� EVALUATING 鍏佽鏇存柊璇勬爣
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(existing.getTenderProjectId());
+ if (project == null || !TenderStatusEnum.canEvaluate(project.getTenderStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_EVALUATION_FORBIDDEN);
}
SrmBidEvaluationDO evaluation = BeanUtils.toBean(updateReqVO, SrmBidEvaluationDO.class);
BigDecimal price = nvl(evaluation.getPriceScore());
@@ -98,6 +118,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void calculateRanking(Long tenderProjectId) {
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(tenderProjectId);
+ if (project == null || !TenderStatusEnum.canEvaluate(project.getTenderStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_EVALUATION_FORBIDDEN);
+ }
List<SrmBidEvaluationDO> list = bidEvaluationMapper.selectListByTenderProjectId(tenderProjectId);
// 鎸夌患鍚堣瘎鍒嗛檷搴忔帓鍚�
list.sort(Comparator.comparing(e -> e.getCompositeScore() != null ? e.getCompositeScore() : BigDecimal.ZERO, Comparator.reverseOrder()));
@@ -113,15 +137,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createBidOpen(Long tenderProjectId) {
+ // 鏍￠獙鎷涙爣椤圭洰瀛樺湪涓旂姸鎬佷负鍙戝竷涓�
+ SrmTenderProjectDO project = tenderProjectMapper.selectById(tenderProjectId);
+ if (project == null) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
+ }
+ if (!TenderStatusEnum.PUBLISHED.getCode().equals(project.getTenderStatus())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_PUBLISHED);
+ }
if (bidOpenMapper.selectByTenderProjectId(tenderProjectId) != null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_PUBLISHED);
}
// 寮�鏍囧悗鑷姩鏇存柊鎷涙爣椤圭洰鐘舵�佷负鎶曟爣涓�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(tenderProjectId);
- if (project != null && TenderStatusEnum.PUBLISHED.getCode().equals(project.getTenderStatus())) {
- project.setTenderStatus(TenderStatusEnum.BIDDING.getCode());
- tenderProjectMapper.updateById(project);
- }
+ project.setTenderStatus(TenderStatusEnum.BIDDING.getCode());
+ tenderProjectMapper.updateById(project);
SrmBidOpenDO open = new SrmBidOpenDO();
open.setTenderProjectId(tenderProjectId);
open.setOpenTime(LocalDateTime.now());
--
Gitblit v1.9.3