From 532611ebe6ccecd6d17930c33a24ddfd5b1c2610 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 14:34:26 +0800
Subject: [PATCH] 增加程序文件列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 3429974..5dc2482 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -73,7 +73,7 @@
* @param machineCode
* @return
*/
- public NcProgram getCuredNcProgram(String partNo,String machineCode) {
+ public List<NcProgram> getCuredNcProgram(String partNo,String machineCode) {
Machine machine = machineService.getByCode(machineCode);
return this.getBaseMapper().getCuredNcProgram(partNo,machine.getMachineGroupCode());
}
@@ -81,9 +81,7 @@
/**
* 涓婁紶绋嬪簭鏂囦欢鍒版寚瀹氳妭鐐�
- * @param file
- * @param nodeId
- * @param category 鏂囦欢鍒嗙被锛堢▼搴忔枃浠�/鍏朵粬鏂囦欢锛�
+ * @param uploadVO 涓婁紶鏂囦欢琛ㄥ崟鏁版嵁
*/
public void uploadProgramFile(NcProgramUploadVO uploadVO) {
MultipartFile file = uploadVO.getFile();
@@ -94,7 +92,8 @@
prog.setName(file.getOriginalFilename());
prog.setNcNodeId(uploadVO.getNodeId());
prog.setOssName(bfile.getName());
- prog.setDrawingNo(uploadVO.getDrawingNo());
+ prog.setPartNo(uploadVO.getPartNo());
+ prog.setProcessEdition(uploadVO.getProcessEdition());
boolean isTextFile = false;
try {
isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -136,7 +135,7 @@
public List<NcProgramVO> listByNode(Long nodeId) {
NcNode node = nodeService.getById(nodeId);
- List<NcProgram> pList = this.list(Wrappers.lambdaQuery(NcProgram.class).eq(NcProgram::getNcNodeId, nodeId).orderByDesc(NcProgram::getCreateTime));
+ List<NcProgram> pList = this.list(Wrappers.lambdaQuery(NcProgram.class).eq(NcProgram::getNcNodeId, nodeId).eq(NcProgram::getIsLastEdition,1).orderByDesc(NcProgram::getCreateTime));
List<NcProgramVO> result = new ArrayList<>();
@@ -149,4 +148,23 @@
return result;
}
+
+ /**
+ * 鍗囩増(鍗囩骇宸ュ簭鐗堟),鍗囩骇宸ュ簭鐗堟湰锛堝寘鎷▼搴忓拰鍏朵粬闄勪欢锛�
+ * @param id 绋嬪簭鏂囦欢id
+ * @param newProcessEdition 鏂扮増娆�
+ */
+ public void upgradeProcessEdition(long id,String newProcessEdition) {
+ NcProgram prog = this.getById(id);
+ //灏嗙幇鏈夌▼搴忔洿鏂颁负闈炴渶鏂扮増鏈�
+ this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getId,id).set(NcProgram::getIsLastEdition,0));
+
+ NcProgram newVerProg = new NcProgram();
+ BeanUtils.copyProperties(prog, newVerProg);
+ newVerProg.setId(null);
+ newVerProg.setIsLastEdition(1);
+ newVerProg.setProcessEdition(newProcessEdition);
+
+ this.save(newVerProg);
+ }
}
--
Gitblit v1.9.3