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/controller/admin/knowledge/AiKnowledgeController.java | 81 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java
index b9daa95..22cd05e 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java
@@ -1,36 +1,65 @@
package cn.iocoder.yudao.module.ai.controller.admin.knowledge;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.document.AiKnowledgeDocumentCreateReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgePageReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgeRespVO;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgeSaveReqVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.knowledge.AiKnowledgeDO;
+import cn.iocoder.yudao.module.ai.service.knowledge.AiKnowledgeDocumentService;
import cn.iocoder.yudao.module.ai.service.knowledge.AiKnowledgeService;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "绠＄悊鍚庡彴 - AI 鐭ヨ瘑搴�")
@RestController
@RequestMapping("/ai/knowledge")
-@Validated
public class AiKnowledgeController {
@Resource
private AiKnowledgeService knowledgeService;
+ @Resource
+ private AiKnowledgeDocumentService documentService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓鐭ヨ瘑搴�")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:create')")
+ public CommonResult<Long> createKnowledge(@Valid @RequestBody AiKnowledgeSaveReqVO createReqVO) {
+ return success(knowledgeService.createKnowledge(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊鐭ヨ瘑搴�")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
+ public CommonResult<Boolean> updateKnowledge(@Valid @RequestBody AiKnowledgeSaveReqVO updateReqVO) {
+ knowledgeService.updateKnowledge(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鐭ヨ瘑搴�")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:delete')")
+ public CommonResult<Boolean> deleteKnowledge(@RequestParam("id") Long id) {
+ knowledgeService.deleteKnowledge(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰彇鐭ヨ瘑搴�")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
+ public CommonResult<AiKnowledgeRespVO> getKnowledge(@RequestParam("id") Long id) {
+ return success(BeanUtils.toBean(knowledgeService.getKnowledge(id), AiKnowledgeRespVO.class));
+ }
@GetMapping("/page")
@Operation(summary = "鑾峰彇鐭ヨ瘑搴撳垎椤�")
@@ -40,45 +69,11 @@
return success(BeanUtils.toBean(pageResult, AiKnowledgeRespVO.class));
}
- @GetMapping("/get")
- @Operation(summary = "鑾峰緱鐭ヨ瘑搴�")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
- public CommonResult<AiKnowledgeRespVO> getKnowledge(@RequestParam("id") Long id) {
- AiKnowledgeDO knowledge = knowledgeService.getKnowledge(id);
- return success(BeanUtils.toBean(knowledge, AiKnowledgeRespVO.class));
- }
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鐭ヨ瘑搴�")
+ @PostMapping("/document/create")
+ @Operation(summary = "鍒涘缓鏂囨。")
@PreAuthorize("@ss.hasPermission('ai:knowledge:create')")
- public CommonResult<Long> createKnowledge(@RequestBody @Valid AiKnowledgeSaveReqVO createReqVO) {
- return success(knowledgeService.createKnowledge(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊鐭ヨ瘑搴�")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
- public CommonResult<Boolean> updateKnowledge(@RequestBody @Valid AiKnowledgeSaveReqVO updateReqVO) {
- knowledgeService.updateKnowledge(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鐭ヨ瘑搴�")
- @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:delete')")
- public CommonResult<Boolean> deleteKnowledge(@RequestParam("id") Long id) {
- knowledgeService.deleteKnowledge(id);
- return success(true);
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "鑾峰緱鐭ヨ瘑搴撶殑绮剧畝鍒楄〃")
- public CommonResult<List<AiKnowledgeRespVO>> getKnowledgeSimpleList() {
- List<AiKnowledgeDO> list = knowledgeService.getKnowledgeSimpleListByStatus(CommonStatusEnum.ENABLE.getStatus());
- return success(convertList(list, knowledge -> new AiKnowledgeRespVO()
- .setId(knowledge.getId()).setName(knowledge.getName())));
+ public CommonResult<List<Long>> createDocument(@Valid @RequestBody AiKnowledgeDocumentCreateReqVO createReqVO) {
+ return success(documentService.createDocuments(createReqVO));
}
}
--
Gitblit v1.9.3