From 490c159fb94aa1b3f7514ac8d9fb1e24ef11fe06 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 21 八月 2025 20:43:42 +0800
Subject: [PATCH] 勤哲修改接口增加
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 5200df1..ffe2552 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -15,6 +15,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
@@ -42,6 +43,7 @@
private final NcNodeService ncNodeService;
private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private final FlowProgramFileService flowProgramFileService;
+ private final QinzheFgbService qinzheFgbService;
/**
* 鏂板
*/
@@ -87,7 +89,7 @@
}
return R.data(list);
}
-
+ /*
@GetMapping("/search-list")
@Operation(summary = "鏌ヨ鏍戠姸鍒楄〃", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯锛堟煡璇笓鐢級")
public R<List<NcNodeVO>> searchList(NcNodeQueryVO queryVO) {
@@ -97,6 +99,22 @@
List<NcNodeVO> list = ncNodeService.searchList(queryVO);
return R.data(list);
+ }*/
+ @GetMapping("/search")
+ @Operation(summary = "棣栭〉鎼滅储", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
+ public R<List<Long>> search(NcNodeQueryVO queryVO) {
+ if(Func.isEmpty(queryVO.getDrawingNo())){
+ return R.fail("璇疯緭鍏ラ浂缁勪欢鍙�");
+ }
+ List<Long> list = ncNodeService.searchDrawing(queryVO);
+
+ return R.data(list);
+ }
+
+ @GetMapping("/drawing-no-pick")
+ @Operation(summary = "棣栭〉鎼滅储闆剁粍浠朵笅鎷夋暟鎹�", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
+ public R<List<String>> drawingNoPick(String drawingNo) {
+ return R.data(qinzheFgbService.seletDropList(drawingNo));
}
@GetMapping("/history-by-nodeid")
--
Gitblit v1.9.3