From 813f0f6d391b7f24682204c22c059ef69b124fa6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 23:59:15 +0800
Subject: [PATCH] 增加流程与程序关联查询
---
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 06d74da..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