From 46929f181707162f21eb6e7735350969097fe21d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 23 七月 2025 20:52:34 +0800
Subject: [PATCH] 增加字典查询接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 05a1a36..8a64c8c 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
@@ -14,7 +14,9 @@
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcNodeProgramVO;
import org.springblade.mdm.program.vo.NcNodeVO;
@@ -34,7 +36,7 @@
@Tag(name = "绋嬪簭鑺傜偣", description = "绋嬪簭鑺傜偣")
@Slf4j
public class NcNodeController {
-
+ private final NcProgramService ncProgramService;
private final NcNodeService ncNodeService;
/**
@@ -66,18 +68,32 @@
@Operation(summary = "鎳掑姞杞藉垪琛�", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯")
public R<List<NcNodeVO>> lazyList(Long parentId) {
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
+ if(list != null && !list.isEmpty()) {
+ for(NcNodeVO ncNodeVO : list) {
+ if(!"70".equals(ncNodeVO.getNodeType())){
+ break;
+ }
+ NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
+ if(program != null) {
+ ncNodeVO.setProcessEdition(program.getProcessEdition());
+ ncNodeVO.setDrawingNo(program.getDrawingNo());
+ ncNodeVO.setMachineCode(program.getMachineCode());
+ ncNodeVO.setProcessName(program.getProcessName());
+ ncNodeVO.setVersionNumber(program.getVersionNumber());
+ }
+ }
+
+ }
return R.data(list);
}
- /**
- * 鍒嗛〉
- */
+ /*
@Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
@GetMapping("/programpickpage")
public R<IPage<NcNodeProgramVO>> page(NcNodeProgramQueryVO query) {
IPage<NcNodeProgramVO> pages = ncNodeService.programPageQuery(query);
return R.data(pages);
}
-
+*/
}
--
Gitblit v1.9.3