From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java
index 97acf15..f1c5a49 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java
@@ -10,7 +10,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.contants.ParamConstants;
import org.springblade.mdm.commons.service.ParamService;
-import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.entity.ProgramNode;
import org.springblade.mdm.gkw.programnode.entity.TreeDept;
import org.springblade.mdm.gkw.programnode.mapper.ProgramNodeMapper;
@@ -55,20 +55,29 @@
* 鐢熸垚宸ユ帶缃戞爲
* @return 鏍戞牴鑺傜偣闆嗗悎
*/
- public List<ProgramNodeVO> loadTree() {
- Integer workshoptDictVal = Func.toInt(paramService.getParamValue(ParamConstants.WORKSHOP_DICT_KEY,DEFAULT_WORKSHOP_VALUE));
+ public List<ProgramNodeVO> loadTree(String includeSend) {
+ Integer workshoptDictVal = Func.toInt(paramService.getParamValue(ParamConstants.WORKSHOP_DICT_KEY,DEFAULT_WORKSHOP_VALUE));
+ Long rootDeptId = Func.toLong(paramService.rootDetpId());
+ TreeDept root = treeDeptService.getById(rootDeptId);
List<ProgramNodeVO> roots = new ArrayList<>();
+ ProgramNodeVO rootVO = new ProgramNodeVO();
+ rootVO.setNodeType("factory");
+ rootVO.setName(root.getDeptName());
+ rootVO.setId(rootVO.getId());
+ roots.add(rootVO);
+
List<TreeDept> workshops = treeDeptService.lambdaQuery().eq(TreeDept::getDeptCategory,workshoptDictVal)
.orderByAsc(TreeDept::getSort).list();
+ List<ProgramNodeVO> workshopsVOList = new ArrayList<>();
for(TreeDept workshop : workshops) {
ProgramNodeVO node = new ProgramNodeVO();
node.setId(String.valueOf(workshop.getId()));
node.setName(workshop.getDeptName());
node.setNodeType("workshop");
- roots.add(node);
-
+ // roots.add(node);
+ workshopsVOList.add(node);
//鍔犲叆杞﹂棿涓嬬殑宸ユ
List<TreeDept> gongduanList = treeDeptService.lambdaQuery().eq(TreeDept::getParentId,workshop.getId())
.orderByAsc(TreeDept::getSort).list();
@@ -87,12 +96,14 @@
nodeMachine.setId(String.valueOf(machine.getId()));
nodeMachine.setMachineCode(machine.getCode());
nodeMachine.setNodeType("machine");
- addFolderNodes(nodeMachine);
+ addFolderNodes(nodeMachine,includeSend);
nodeGd.addChildren(nodeMachine);
});
}
}
+
+ rootVO.setChildren(workshopsVOList);
return roots;
}
@@ -101,15 +112,20 @@
* 鍔犲叆3涓枃浠跺す鑺傜偣
* @param nodeMachine 鏈哄簥鑺傜偣
*/
- void addFolderNodes(ProgramNodeVO nodeMachine){
+ void addFolderNodes(ProgramNodeVO nodeMachine,String includeSend){
- ProgramNodeVO sendNode = new ProgramNodeVO();
- sendNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_SEND);
- sendNode.setName("SEND");
- sendNode.setMachineCode(nodeMachine.getMachineCode());
- sendNode.setDirType(MachineFile.DIR_TYPE_SEND);
- sendNode.setNodeType("dir");
- //sendNode.setParentId(nodeMachine.getId());
+ List<ProgramNodeVO> dirNodes = new ArrayList<>();
+ if(!"0".equals(includeSend)){
+ ProgramNodeVO sendNode = new ProgramNodeVO();
+ sendNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_SEND);
+ sendNode.setName("SEND");
+ sendNode.setMachineCode(nodeMachine.getMachineCode());
+ sendNode.setDirType(MachineFile.DIR_TYPE_SEND);
+ sendNode.setNodeType("dir");
+
+ dirNodes.add(sendNode);
+ }
+
ProgramNodeVO recNode = new ProgramNodeVO();
recNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_REC);
@@ -117,6 +133,7 @@
recNode.setMachineCode(nodeMachine.getMachineCode());
recNode.setDirType(MachineFile.DIR_TYPE_REC);
recNode.setNodeType("dir");
+ dirNodes.add(recNode);
ProgramNodeVO tempNode = new ProgramNodeVO();
tempNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_TEMP);
@@ -124,7 +141,9 @@
tempNode.setMachineCode(nodeMachine.getMachineCode());
tempNode.setDirType(MachineFile.DIR_TYPE_TEMP);
tempNode.setNodeType("dir");
- nodeMachine.setChildren(Arrays.asList(sendNode,recNode,tempNode));
+ dirNodes.add(tempNode);
+
+ nodeMachine.setChildren(dirNodes);
}
/**
--
Gitblit v1.9.3