From a0e37c52980249847ac896d320ef097fda49ad3a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 26 八月 2025 21:30:47 +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..2026872 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;
/**
* 鏂板
*/
@@ -90,7 +92,7 @@
@GetMapping("/search-list")
@Operation(summary = "鏌ヨ鏍戠姸鍒楄〃", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯锛堟煡璇笓鐢級")
- public R<List<NcNodeVO>> searchList(NcNodeQueryVO queryVO) {
+ public R<List<NcNodeVO>> searchList(NcNodeOldQueryVO queryVO) {
if(Func.isEmpty(queryVO.getName())){
return R.fail("璇疯緭鍏ュ悕绉�");
}
@@ -98,6 +100,22 @@
return R.data(list);
}
+ @GetMapping("/search-list2")
+ @Operation(summary = "娑夊瘑缃戦椤垫悳绱�", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
+ public R<List<NcNodeVO>> search(NcNodeQueryVO queryVO) {
+ if(Func.isEmpty(queryVO.getDrawingNo())){
+ return R.fail("璇疯緭鍏ラ浂缁勪欢鍙�");
+ }
+ List<NcNodeVO> list = ncNodeService.searchList2(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")
@Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��70鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
--
Gitblit v1.9.3