From 9dd7fff1e71be76b19a3e2e5b41bd236178df424 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 19:51:50 +0800
Subject: [PATCH] 修复文件名检查
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
index 0aa3b52..7fecd89 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
@@ -90,11 +90,15 @@
List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, programProperties.getProcessInstanceId()).list();
for (FlowProgramFile programFile : programFiles) {
- createProgramFileNode(programFile, programPkdNode, programProperties);
+ if(programFile.isProgram()) {
+ createProgramFileNode(programFile, programPkdNode, programProperties);
+ }
}
-
+ createOtherNode(programFiles);
}
-
+ void createOtherNode(List<FlowProgramFile> programFiles){
+//111mqita 鑺傜偣
+ }
/**
* 寤虹珛绋嬪簭鏂囦欢鑺傜偣
* @param programFile 娴佺▼鏂囦欢
@@ -107,8 +111,7 @@
NcNode node = new NcNode();
node.setNodeType(NcNode.TYPE_PROGRAM_FILE);
node.setName(programFile.getName());//鏂囦欢鍚嶏紝
- node.setParentId(programPkdNode.getId());
- node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());
+
node.setIsLastEdition(1);
node.setDrawingNo(programPkdNode.getDrawingNo());
node.setDrawingNoEdition(programProperties.getDrawingNoEdition());
@@ -120,6 +123,16 @@
node.setProductModel(programProperties.getProductModel());
node.setFlowProgramFileId(programFile.getId());
node.setVersionNumber(1);
+ node.setParentId(programPkdNode.getId());
+ node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());
+ /*
+ if("program".equals(programFile.getFileType())){
+
+ }else{
+ //鍏朵粬鏂囦欢锛屽拰绋嬪簭鍖呭悕鍚岀骇骞跺垪
+
+ }*/
+
ncNodeService.save(node);
}
@@ -182,7 +195,6 @@
ncNode.setProductModel(programProperties.getProductModel());
ncNode.setDeviation(programProperties.getDeviation());
- //ncNode.setMachineMode(programProperties.getMachineMode());
}
ncNode.setIsLastEdition(1);
--
Gitblit v1.9.3