From 58879e5f5889882db6f5279de89b478afb3a1892 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 07 七月 2025 21:00:51 +0800
Subject: [PATCH] bangding 流程

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
index c788397..0233b9f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
@@ -8,6 +8,11 @@
 import org.springblade.mdm.basesetting.machine.entity.Machine;
 import org.springblade.mdm.basesetting.machine.vo.MachineVO;
 import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
+import org.springblade.mdm.program.vo.NcNodeProgramVO;
+import org.springblade.mdm.program.vo.NcProgramVO;
+
+import java.util.List;
 
 public interface NcProgramMapper extends BladeMapper<NcProgram> {
 
@@ -17,12 +22,7 @@
 	 * @param machineGroupCode 鏈哄簥缁勪唬鐮�
 	 * @return
 	 */
-	NcProgram getCuredNcProgram(@Param("partNo")String partNo,@Param("machineGroupCode")String machineGroupCode);
+	List<NcProgram> getCuredNcProgram( @Param("partNo")String partNo,@Param("machineGroupCode")String machineGroupCode);
 
-	/**
-	 * 鏍规嵁绋嬪簭鍚嶇О锛岃幏鍙栨渶鏂扮殑绋嬪簭瀹炰綋
-	 * @param name 绋嬪簭鍚嶇О
-	 * @return nc绋嬪簭
-	 */
-	NcProgram getLastNcProgram(String name);
+	IPage<NcProgramVO> pageQuery(@Param("page")IPage<NcNodeProgramVO> page, @Param("query") NcNodeProgramQueryVO query);
 }

--
Gitblit v1.9.3