From c723796f39021476247cf1adf8dc587939c95535 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 12:46:54 +0800
Subject: [PATCH] 机床增加导入接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 bea9b12..dd2d8c9 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
@@ -34,7 +34,7 @@
/**
* 鍒涘缓鏍戝埌鏈哄簥绾у埆
- * @param programProperties
+ * @param programProperties 绋嬪簭灞炴��
*/
@Transactional
public NcNode createNodeTreeToMachine(FlowProgramProperties programProperties) {
@@ -60,7 +60,6 @@
NcNode lastNode = null;
//鍒涘缓浜у搧鍨嬪彿鑺傜偣
- //NcNode productModelNode = createProductModelNode(programProperties.getProductModel(), root);
NcNode productModelNode = createNodeIfNotExists(programProperties.getProductModel(),NcNode.TYPE_PRODUCT_MODEL, root,programProperties);
//闆剁粍浠跺彿鑺傜偣
NcNode drawingNoNode = createNodeIfNotExists(programProperties.getDrawingNo(),NcNode.TYPE_DRAWING_NO, productModelNode,programProperties);
@@ -82,7 +81,8 @@
//,int rootNodeCatgory = 1:璇曞垏锛�2鍥哄寲锛�3鍋忕
NcNode programPkdNode = createTreeToPackage(programProperties);
//鍒犻櫎涔嬪墠鍒涘缓杩囩殑绋嬪簭鏂囦欢鑺傜偣(鍥犱负閲嶅鍦ㄧ紪鍒惰妭鐐瑰鎵�)锛岄伩鍏嶉噸澶嶆暟鎹�
- this.ncNodeService.lambdaUpdate().eq(NcNode::getParentId, programPkdNode.getId()).remove();
+ //this.ncNodeService.lambdaUpdate().eq(NcNode::getParentId, programPkdNode.getId()).remove();
+ ncNodeService.deleteSubNodes(programPkdNode.getId());
List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, programProperties.getProcessInstanceId()).list();
for (FlowProgramFile programFile : programFiles) {
@@ -91,6 +91,12 @@
}
+ /**
+ * 寤虹珛绋嬪簭鏂囦欢鑺傜偣
+ * @param programFile 娴佺▼鏂囦欢
+ * @param programPkdNode 绋嬪簭鍖呭悕 鑺傜偣锛岀▼搴忚妭鐐圭殑 涓婄骇
+ * @param programProperties 娴佺▼鍙戣捣鐨勭▼搴忕殑灞炴��
+ */
private void createProgramFileNode(FlowProgramFile programFile, NcNode programPkdNode, FlowProgramProperties programProperties) {
//姝ゅ搴旈伩鍏嶉噸澶嶅垱寤�
@@ -105,6 +111,7 @@
node.setCraftEdition(programProperties.getCraftEdition());
node.setProcessName(programProperties.getProcessName());
node.setProcessNo(programProperties.getProcessNo());
+ node.setProcessEdition(programProperties.getProcessEdition());
node.setMachineCode(programProperties.getMachineCode());
node.setProductModel(programProperties.getProductModel());
node.setFlowProgramFileId(programFile.getId());
@@ -114,13 +121,13 @@
/**
* 鍒涘缓鑺傜偣鍒扮▼搴忓寘绾у埆
- * @param programProperties
- * @param createProgramPkg
- * @return
+ * @param programProperties 绋嬪簭灞炴��
+ * @return 绋嬪簭鍖呭悕鑺傜偣锛堟渶鏈骇锛�
*/
+ @Transactional
public NcNode createTreeToPackage(FlowProgramProperties programProperties) {
NcNode machineCodeNode = createNodeTreeToMachine(programProperties);
- String programPkgName = programProperties.getDrawingNo()+"-"+programProperties.getProcessNo();//闆朵欢鍙峰姞宸ュ簭鍙�
+ String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo());
return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, machineCodeNode,programProperties);
}
@@ -160,7 +167,7 @@
ncNode.setProcessName(programProperties.getProcessName());
ncNode.setMachineCode(programProperties.getMachineCode());
ncNode.setProductModel(programProperties.getProductModel());
-
+ //ncNode.setMachineMode(programProperties.getMachineMode());
}
ncNode.setIsLastEdition(1);
--
Gitblit v1.9.3