From 7551b1ae51da67627f7ed03276707127dfc9cdc6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 17 七月 2025 17:29:49 +0800
Subject: [PATCH] 机床回传文件调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
index 2a076f8..30c0d97 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
@@ -2,31 +2,33 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.servlet.ServletOutputStream;
+import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.tool.utils.DateUtil;
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.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
+import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
+import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.stereotype.Service;
-
import java.util.List;
+@AllArgsConstructor
@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
- /*
- @Transactional
- public void save(MachineSaveVO vo){
- //TODO
- Machine machine = new Machine();
- BeanUtil.copyProperties(vo, machine);
- this.save(machine);
- }
- */
-
+ private final NcProgramService progService;
+ private final OssTemplate ossTemplate;
+ /**
+ * 鎺ュ彈
+ * @param ids
+ */
public void accept(String ids) {
List<Long> idList = Func.toLongList(ids);
@@ -34,17 +36,25 @@
for(Long id : idList){
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
+ backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
+
+
}
}
+ /**
+ * 鎷掔粷
+ * @param ids
+ */
public void reject(String ids) {
List<Long> idList = Func.toLongList(ids);
for(Long id : idList){
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_REJECTED);
+ backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
}
@@ -60,4 +70,16 @@
return page;
}
+
+ /**
+ * 鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉鏌ヨ
+ * @param query 鏌ヨ鍙傛暟瀵硅薄
+ * @return 鍒嗛〉鏁版嵁
+ */
+ public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
+ IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
+ return page;
+ }
+
+
}
--
Gitblit v1.9.3