From cf7234b1fc2c5827fdb126ba2f7db2456f2c1da6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 19:16:20 +0800
Subject: [PATCH] 修改字段错误
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 5dc2482..0429718 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
@@ -37,8 +37,10 @@
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.ProgramSeq;
import org.springblade.mdm.program.mapper.NcProgramMapper;
import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.mapper.ProgramSeqMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
@@ -50,6 +52,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -67,6 +70,8 @@
private final OssTemplate ossTemplate;
private final NcNodeService nodeService;
+
+ private final ProgramSeqMapper seqMapper;
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
* @param partNo
@@ -84,16 +89,20 @@
* @param uploadVO 涓婁紶鏂囦欢琛ㄥ崟鏁版嵁
*/
public void uploadProgramFile(NcProgramUploadVO uploadVO) {
+
+
MultipartFile file = uploadVO.getFile();
BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
String link = bfile.getLink();
//淇濆瓨profame
NcProgram prog = new NcProgram();
+ prog.setCode(generageCode());
prog.setName(file.getOriginalFilename());
prog.setNcNodeId(uploadVO.getNodeId());
prog.setOssName(bfile.getName());
prog.setPartNo(uploadVO.getPartNo());
prog.setProcessEdition(uploadVO.getProcessEdition());
+ prog.setIsLastEdition(1);
boolean isTextFile = false;
try {
isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -107,6 +116,13 @@
this.save(prog);
}
+ String generageCode(){
+ ProgramSeq program = new ProgramSeq();
+ seqMapper.insert(program);
+
+ DecimalFormat df = new DecimalFormat("0000000000");
+ return df.format(program.getId());
+ }
/**
* 鍒犻櫎涓�涓▼搴�
* @param id
--
Gitblit v1.9.3