From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java
index 9b22cd9..0df03e7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java
@@ -8,17 +8,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.gkw.programnode.service.ProgramNodeService;
import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
-import org.springblade.mdm.program.vo.CompareDataVO;
-import org.springblade.mdm.program.vo.NcNodeQueryVO;
-import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -46,8 +37,15 @@
@GetMapping("/load-tree")
@Operation(summary = "宸ユ帶缃憈ree", description = "宸ユ帶缃戠洰褰曟爲褰㈢粨鏋�-鍏ㄩ噺")
- public R<List<ProgramNodeVO>> loadTree() {
- List<ProgramNodeVO> list = programNodeService.loadTree();
+ public R<List<ProgramNodeVO>> loadTree(@Parameter(name="鍖呭惈send鏂囦欢澶癸紝1鍖呭惈锛�0涓嶅寘鍚�")String includeSend) {
+ List<ProgramNodeVO> list = programNodeService.loadTree(includeSend);
+ return R.data(list);
+ }
+
+ @GetMapping("/search-tree")
+ @Operation(summary = "宸ユ帶缃憈ree", description = "宸ユ帶缃戠洰褰曟爲褰㈢粨鏋�-鍏ㄩ噺")
+ public R<List<String>> treeSearch(String keyword) {
+ List<String> list = programNodeService.treeSearch(keyword);
return R.data(list);
}
--
Gitblit v1.9.3