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/AiKnowledgeDocumentController.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeDocumentController.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeDocumentController.java
index 68fe49a..e138821 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeDocumentController.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeDocumentController.java
@@ -4,7 +4,7 @@
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.*;
-import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgeDocumentCreateReqVO;
+import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.segment.AiKnowledgeSegmentProcessRespVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.knowledge.AiKnowledgeDocumentDO;
import cn.iocoder.yudao.module.ai.service.knowledge.AiKnowledgeDocumentService;
import io.swagger.v3.oas.annotations.Operation;
@@ -12,7 +12,6 @@
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;
@@ -22,69 +21,70 @@
@Tag(name = "绠＄悊鍚庡彴 - AI 鐭ヨ瘑搴撴枃妗�")
@RestController
@RequestMapping("/ai/knowledge/document")
-@Validated
public class AiKnowledgeDocumentController {
@Resource
private AiKnowledgeDocumentService documentService;
- @GetMapping("/page")
- @Operation(summary = "鑾峰彇鏂囨。鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
- public CommonResult<PageResult<AiKnowledgeDocumentRespVO>> getKnowledgeDocumentPage(
- @Valid AiKnowledgeDocumentPageReqVO pageReqVO) {
- PageResult<AiKnowledgeDocumentDO> pageResult = documentService.getKnowledgeDocumentPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, AiKnowledgeDocumentRespVO.class));
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇鏂囨。璇︽儏")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
- public CommonResult<AiKnowledgeDocumentRespVO> getKnowledgeDocument(@RequestParam("id") Long id) {
- AiKnowledgeDocumentDO document = documentService.getKnowledgeDocument(id);
- return success(BeanUtils.toBean(document, AiKnowledgeDocumentRespVO.class));
- }
-
- @PostMapping("/create")
- @Operation(summary = "鏂板缓鏂囨。锛堝崟涓級")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:create')")
- public CommonResult<Long> createKnowledgeDocument(@RequestBody @Valid AiKnowledgeDocumentCreateReqVO reqVO) {
- Long id = documentService.createKnowledgeDocument(reqVO);
- return success(id);
- }
-
@PostMapping("/create-list")
- @Operation(summary = "鏂板缓鏂囨。锛堝涓級")
+ @Operation(summary = "鍒涘缓鏂囨。锛堟壒閲忥級")
@PreAuthorize("@ss.hasPermission('ai:knowledge:create')")
- public CommonResult<List<Long>> createKnowledgeDocumentList(
- @RequestBody @Valid AiKnowledgeDocumentCreateListReqVO reqVO) {
- List<Long> ids = documentService.createKnowledgeDocumentList(reqVO);
- return success(ids);
+ public CommonResult<List<Long>> createDocumentList(@Valid @RequestBody AiKnowledgeDocumentCreateReqVO createReqVO) {
+ return success(documentService.createDocuments(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鏂囨。")
@PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
- public CommonResult<Boolean> updateKnowledgeDocument(@Valid @RequestBody AiKnowledgeDocumentUpdateReqVO reqVO) {
- documentService.updateKnowledgeDocument(reqVO);
- return success(true);
- }
-
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊鏂囨。鐘舵��")
- @PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
- public CommonResult<Boolean> updateKnowledgeDocumentStatus(
- @Valid @RequestBody AiKnowledgeDocumentUpdateStatusReqVO reqVO) {
- documentService.updateKnowledgeDocumentStatus(reqVO);
+ public CommonResult<Boolean> updateDocument(@Valid @RequestBody AiKnowledgeDocumentUpdateReqVO updateReqVO) {
+ documentService.updateDocument(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鏂囨。")
@PreAuthorize("@ss.hasPermission('ai:knowledge:delete')")
- public CommonResult<Boolean> deleteKnowledgeDocument(@RequestParam("id") Long id) {
- documentService.deleteKnowledgeDocument(id);
+ public CommonResult<Boolean> deleteDocument(@RequestParam("id") Long id) {
+ documentService.deleteDocument(id);
return success(true);
}
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰彇鏂囨。")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
+ public CommonResult<AiKnowledgeDocumentRespVO> getDocument(@RequestParam("id") Long id) {
+ return success(BeanUtils.toBean(documentService.getDocument(id), AiKnowledgeDocumentRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰彇鏂囨。鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
+ public CommonResult<PageResult<AiKnowledgeDocumentRespVO>> getDocumentPage(@Valid AiKnowledgeDocumentPageReqVO pageReqVO) {
+ PageResult<AiKnowledgeDocumentDO> pageResult = documentService.getDocumentPage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, AiKnowledgeDocumentRespVO.class));
+ }
+
+ @PutMapping("/update-status")
+ @Operation(summary = "鏇存柊鏂囨。鐘舵��")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
+ public CommonResult<Boolean> updateDocumentStatus(@Valid @RequestBody AiKnowledgeDocumentUpdateStatusReqVO updateStatusReqVO) {
+ documentService.updateDocumentStatus(updateStatusReqVO);
+ return success(true);
+ }
+
+ @PostMapping("/process/{id}")
+ @Operation(summary = "澶勭悊鏂囨。锛堝垎娈�+鍚戦噺鍖栵級")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
+ public CommonResult<Boolean> processDocument(@PathVariable("id") Long id) {
+ documentService.processDocumentSegments(id);
+ return success(true);
+ }
+
+ @GetMapping("/progress")
+ @Operation(summary = "鑾峰彇鏂囨。澶勭悊杩涘害")
+ @PreAuthorize("@ss.hasPermission('ai:knowledge:query')")
+ public CommonResult<List<AiKnowledgeSegmentProcessRespVO>> getProcessingProgress(@RequestParam("documentIds") List<Long> documentIds) {
+ return success(documentService.getDocumentProcessingProgress(documentIds));
+ }
+
}
--
Gitblit v1.9.3