From 7b13a2271ed27f83688b7d11823ed66570283cb8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 七月 2025 01:13:38 +0800
Subject: [PATCH] node返回增加字段

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 bd6f030..824c5e3 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,6 +68,21 @@
 	@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());
+				}
+			}
+
+		}
 		return R.data(list);
 	}
 

--
Gitblit v1.9.3