From 9c483e9be881783af14ad68906e78ee557005eb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 22:01:45 +0800
Subject: [PATCH] 修复dnc导出无header问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 0d5fdfb..8f1d071 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,9 @@
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;
@@ -15,16 +18,11 @@
/**
* 鑾峰彇鏈�鏂板浐鍖栫▼搴�
- * @param partNo 闆剁粍浠跺彿
+ * @param drawingNo 闆剁粍浠跺彿
* @param machineGroupCode 鏈哄簥缁勪唬鐮�
* @return
*/
- List<NcProgram> getCuredNcProgram( @Param("partNo")String partNo,@Param("machineGroupCode")String machineGroupCode);
+ List<NcProgram> getCuredNcProgram( @Param("drawingNo")String drawingNo,@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