From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
index 48f83b5..018112f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
@@ -56,6 +56,10 @@
if(file.getSize() == 0){
throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
}
+ if(exists(file.getOriginalFilename(),uploadVO.getProcessInstanceId())){
+ throw new ServiceException("鍚屽悕鏂囦欢宸插瓨鍦細"+file.getOriginalFilename());
+ }
+
if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(), progProps);
}
@@ -66,13 +70,21 @@
progFile.setName(file.getOriginalFilename());
progFile.setOssName(bfile.getName());
progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
- progFile.setProgramName(NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo()));
+ progFile.setProgramName(NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo(),progProps.getProcessEdition()));
progFile.setFileType(uploadVO.getFileType());
save(progFile);
}
-
+ /**
+ * 鍒ゆ柇閭ｆ祦绋嬩笅鏄惁鏈夊悓鍚嶉棶棰�
+ * @param filename 鏂囦欢鍚�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 鏄惁
+ */
+ boolean exists(String filename,String processInstanceId){
+ return lambdaQuery().eq(FlowProgramFile::getName, filename).eq(FlowProgramFile::getProcessInstanceId, processInstanceId).count()>0;
+ }
/**
* 鑾峰彇鏂囦欢鍐呭
* @param id 鏂囦欢id
@@ -134,4 +146,14 @@
IOUtils.copy(ins,response.getOutputStream());
}
}
+
+ /**
+ * 鑾峰彇鍏充簬娴佺▼鐨勬墍鏈夋枃浠�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 娴佺▼鍏宠仈鐨勬枃浠跺垪琛�
+ */
+ public List<FlowProgramFile> listByProcessInstanceId(String processInstanceId){
+ return lambdaQuery()
+ .eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
+ }
}
--
Gitblit v1.9.3