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-ai/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 deletions(-)
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java
index 75b9943..163c2ad 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java
@@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.ai.service.knowledge;
-import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgePageReqVO;
@@ -8,102 +8,83 @@
import cn.iocoder.yudao.module.ai.dal.dataobject.knowledge.AiKnowledgeDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO;
import cn.iocoder.yudao.module.ai.dal.mysql.knowledge.AiKnowledgeMapper;
+import cn.iocoder.yudao.module.ai.enums.model.AiModelTypeEnum;
import cn.iocoder.yudao.module.ai.service.model.AiModelService;
import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.ai.enums.ErrorCodeConstants.KNOWLEDGE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.ai.enums.ErrorCodeConstants.*;
-/**
- * AI 鐭ヨ瘑搴�-鍩虹淇℃伅 Service 瀹炵幇绫�
- *
- * @author xiaoxin
- */
@Service
-@Slf4j
public class AiKnowledgeServiceImpl implements AiKnowledgeService {
@Resource
- private AiKnowledgeMapper knowledgeMapper;
-
+ private AiKnowledgeMapper mapper;
@Resource
private AiModelService modelService;
- @Resource
- private AiKnowledgeSegmentService knowledgeSegmentService;
- @Resource
- private AiKnowledgeDocumentService knowledgeDocumentService;
@Override
public Long createKnowledge(AiKnowledgeSaveReqVO createReqVO) {
- // 1. 鏍￠獙妯″瀷閰嶇疆
- AiModelDO model = modelService.validateModel(createReqVO.getEmbeddingModelId());
-
- // 2. 鎻掑叆鐭ヨ瘑搴�
- AiKnowledgeDO knowledge = BeanUtils.toBean(createReqVO, AiKnowledgeDO.class)
- .setEmbeddingModel(model.getModel());
- knowledgeMapper.insert(knowledge);
+ AiModelDO embeddingModel = modelService.validateModel(createReqVO.getEmbeddingModelId());
+ if (!AiModelTypeEnum.EMBEDDING.getType().equals(embeddingModel.getType())) {
+ throw exception(MODEL_USE_TYPE_ERROR);
+ }
+ AiKnowledgeDO knowledge = BeanUtils.toBean(createReqVO, AiKnowledgeDO.class);
+ knowledge.setEmbeddingModel(embeddingModel.getModel());
+ if (knowledge.getTopK() == null) knowledge.setTopK(3);
+ if (knowledge.getSimilarityThreshold() == null) knowledge.setSimilarityThreshold(0.7);
+ mapper.insert(knowledge);
return knowledge.getId();
}
@Override
public void updateKnowledge(AiKnowledgeSaveReqVO updateReqVO) {
- // 1.1 鏍￠獙鐭ヨ瘑搴撳瓨鍦�
- AiKnowledgeDO oldKnowledge = validateKnowledgeExists(updateReqVO.getId());
- // 1.2 鏍￠獙妯″瀷閰嶇疆
- AiModelDO model = modelService.validateModel(updateReqVO.getEmbeddingModelId());
-
- // 2. 鏇存柊鐭ヨ瘑搴�
- AiKnowledgeDO updateObj = BeanUtils.toBean(updateReqVO, AiKnowledgeDO.class)
- .setEmbeddingModel(model.getModel());
- knowledgeMapper.updateById(updateObj);
-
- // 3. 濡傛灉妯″瀷鍙樺寲锛岄渶瑕� reindex 鎵�鏈夌殑鏂囨。
- if (ObjUtil.notEqual(oldKnowledge.getEmbeddingModelId(), updateReqVO.getEmbeddingModelId())) {
- knowledgeSegmentService.reindexByKnowledgeIdAsync(updateReqVO.getId());
+ validateKnowledgeExists(updateReqVO.getId());
+ AiModelDO embeddingModel = modelService.validateModel(updateReqVO.getEmbeddingModelId());
+ if (!AiModelTypeEnum.EMBEDDING.getType().equals(embeddingModel.getType())) {
+ throw exception(MODEL_USE_TYPE_ERROR);
}
+ AiKnowledgeDO knowledge = BeanUtils.toBean(updateReqVO, AiKnowledgeDO.class);
+ knowledge.setEmbeddingModel(embeddingModel.getModel());
+ mapper.updateById(knowledge);
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteKnowledge(Long id) {
- // 1. 鏍￠獙瀛樺湪
validateKnowledgeExists(id);
-
- // 2. 鍒犻櫎鐭ヨ瘑搴撲笅鐨勬墍鏈夋枃妗ｅ強娈佃惤
- knowledgeDocumentService.deleteKnowledgeDocumentByKnowledgeId(id);
-
- // 3. 鍒犻櫎鐭ヨ瘑搴�
- // 鐗规畩锛氱煡璇嗗簱闇�瑕佹渶鍚庡垹闄わ紝涓嶇劧鐩稿叧鐨勯厤缃細鎵句笉鍒�
- knowledgeMapper.deleteById(id);
+ mapper.deleteById(id);
}
@Override
public AiKnowledgeDO getKnowledge(Long id) {
- return knowledgeMapper.selectById(id);
+ return mapper.selectById(id);
}
@Override
public AiKnowledgeDO validateKnowledgeExists(Long id) {
- AiKnowledgeDO knowledge = knowledgeMapper.selectById(id);
- if (knowledge == null) {
- throw exception(KNOWLEDGE_NOT_EXISTS);
- }
+ AiKnowledgeDO knowledge = mapper.selectById(id);
+ if (knowledge == null) throw exception(KNOWLEDGE_NOT_EXISTS);
+ return knowledge;
+ }
+
+ @Override
+ public AiKnowledgeDO validateKnowledge(Long id) {
+ AiKnowledgeDO knowledge = validateKnowledgeExists(id);
+ if (CommonStatusEnum.isDisable(knowledge.getStatus())) throw exception(KNOWLEDGE_NOT_EXISTS);
return knowledge;
}
@Override
public PageResult<AiKnowledgeDO> getKnowledgePage(AiKnowledgePageReqVO pageReqVO) {
- return knowledgeMapper.selectPage(pageReqVO);
+ return mapper.selectPage(pageReqVO);
}
@Override
- public List<AiKnowledgeDO> getKnowledgeSimpleListByStatus(Integer status) {
- return knowledgeMapper.selectListByStatus(status);
+ public List<AiKnowledgeDO> getEnabledKnowledgeList() {
+ return mapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus());
}
}
--
Gitblit v1.9.3