From f26051cf29997af1a0c0862f583ea477163ab77e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 14:19:09 +0800
Subject: [PATCH] 代码格式整理；机床回传文件
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
index df099c5..1218ad1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
@@ -13,6 +13,7 @@
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
@@ -32,7 +33,8 @@
@Autowired
private MachineBackFileService service;
-
+ @Autowired
+ private MachineFileService machineFileService;
/**
* 鎺ユ敹
@@ -65,7 +67,7 @@
@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
@GetMapping("/page")
public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
- IPage<MachineBackFileVO> pages = service.pageQuery(query);
+ IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
return R.data(pages);
}
@@ -78,7 +80,8 @@
query.setCurrent(1);
query.setSize(Integer.MAX_VALUE);
- IPage<MachineBackFileVO> pages = service.pageQuery(query);
+ //IPage<MachineBackFileVO> pages = service.pageQuery(query);
+ IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
List<MachineBackFileExcelVO> list = new ArrayList<>();
pages.getRecords().forEach(m ->{
MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();
--
Gitblit v1.9.3