From 0ef4cc755bddd87799b8bfdd65c8123df6e149d0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 23:52:51 +0800
Subject: [PATCH] 锁定流程完成
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 593a510..c26cc30 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,24 +2,31 @@
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.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.gkw.programnode.service.MachineFileService;
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> {
-
+ private final MachineFileService macineFileService;
+ private final OssTemplate ossTemplate;
/**
* 鎺ュ彈
* @param ids
@@ -27,12 +34,17 @@
public void accept(String ids) {
List<Long> idList = Func.toLongList(ids);
-
+ MachineFile mf;
for(Long id : idList){
+ mf = macineFileService.getById(id);
+ mf.accept();
+ macineFileService.updateById(mf);
+ /*
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
+ */
}
}
@@ -44,11 +56,19 @@
public void reject(String ids) {
List<Long> idList = Func.toLongList(ids);
+ MachineFile mf;
+ for(Long id : idList){
+ mf = macineFileService.getById(id);
+ mf.reject();
+ macineFileService.updateById(mf);
+ }
+ /*
for(Long id : idList){
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_REJECTED);
+ backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
- }
+ }*/
}
@@ -57,14 +77,22 @@
* @param query 鏌ヨ鍙傛暟
* @return 鍒嗛〉鏁版嵁
*/
+ /*
public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {
IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
-
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