From 103f52ade0f77e420dec306ea3b51d0a3c0ac3ee Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:23:12 +0800
Subject: [PATCH] art: 设备管理-系统业务编码生成，工艺参数维护功能修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java
index c07d48b..7e2d0c5 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java
@@ -14,15 +14,18 @@
public class ProductTreeWrapper {
public static List<CommonGenericTree> loadTree(List<ProductInfo> productInfoList, List<ComponentExt> componentInfoList,
- List<PartsInfo> partsInfoList,List<ProcessStream> processStreams, List<WorkStep> workStepList) {
+ List<PartsInfo> partsInfoList,List<ProcessSpecVersion> processSpecVersionList,
+ List<ProcessStream> processStreams, List<WorkStep> workStepList) {
List<CommonGenericTree> tree = new ArrayList<CommonGenericTree>();// TreeNode闆嗗悎锛屽瓨鏀炬墍鏈夋爲瀵硅薄銆�
Map<String, CommonGenericTree> productMap = new HashMap<>();
Map<String, CommonGenericTree> componentMap = new HashMap<>();
Map<String, CommonGenericTree> partsMap = new HashMap<>();
+ Map<String, CommonGenericTree> pvsMap = new HashMap<>();
Map<String, CommonGenericTree> processMap = new HashMap<>();
CommonGenericTree<ProductInfo> node;
CommonGenericTree<ComponentInfo> componentNode;
CommonGenericTree<PartsInfo> partsNode;
+ CommonGenericTree<ProcessSpecVersion> pvsNode;
CommonGenericTree<ProcessStream> processNode;
CommonGenericTree<WorkStep> workStepNode;
for(ProductInfo productInfo : productInfoList) {
@@ -64,15 +67,33 @@
partsMap.put(parts.getPartsId(), partsNode);
}
- //宸ュ簭瀛樺湪閮ㄤ欢鎴栬�呴浂浠朵笅
+ //宸ヨ壓瑙勭▼鐗堟湰瀛樺湪闆朵欢涓�
+ for(ProcessSpecVersion processSpecVersion : processSpecVersionList) {
+ pvsNode = new CommonGenericTree();
+ pvsNode.setId(processSpecVersion.getId());
+ pvsNode.setLabel("[" + processSpecVersion.getProcessSpecVersionCode()+ "]" + processSpecVersion.getProcessSpecVersionName());
+ pvsNode.setParentId(null);
+ pvsNode.setIconClass("");
+ pvsNode.setType(4);
+ pvsNode.setRField(processSpecVersion.getPartsId());
+ pvsNode.setEntity(processSpecVersion);
+ if(partsMap.containsKey(pvsNode.getRField())) {
+ partsNode = partsMap.get(pvsNode.getRField());
+ pvsNode.setParentId(partsNode.getId());
+ partsNode.addChildren(pvsNode);
+ }
+ pvsMap.put(processSpecVersion.getId(),pvsNode);
+ }
+
+ //宸ュ簭瀛樺湪閮ㄤ欢鎴栬�呭伐鑹鸿绋嬬増鏈笅
for(ProcessStream processStream : processStreams) {
processNode = new CommonGenericTree();
processNode.setId(processStream.getProcessId());
processNode.setLabel("[" + processStream.getProcessCode()+ "]" + processStream.getProcessName());
processNode.setParentId(null);
processNode.setIconClass("");
- processNode.setType(4);
- if (StrUtil.isEmpty(processStream.getPartsId())) {
+ processNode.setType(5);
+ if (StrUtil.isEmpty(processStream.getPsvId())) {
//娌℃湁partsId锛岄儴浠朵笅鐨勫伐搴�
processNode.setRField(processStream.getComponentId());
processNode.setEntity(processStream);
@@ -82,13 +103,13 @@
componentNode.addChildren(processNode);
}
}else {
- //鏈塸artsId锛岄浂浠朵笅鐨勫伐搴�
- processNode.setRField(processStream.getPartsId());
+ //鏈塸svId锛岄浂浠朵笅鐨勫伐搴�
+ processNode.setRField(processStream.getPsvId());
processNode.setEntity(processStream);
- if(partsMap.containsKey(processNode.getRField())) {
- partsNode = partsMap.get(processNode.getRField());
- processNode.setParentId(partsNode.getId());
- partsNode.addChildren(processNode);
+ if(pvsMap.containsKey(processNode.getRField())) {
+ pvsNode = pvsMap.get(processNode.getRField());
+ processNode.setParentId(pvsNode.getId());
+ pvsNode.addChildren(processNode);
}
}
processMap.put(processStream.getProcessId(),processNode);
@@ -97,11 +118,11 @@
//宸ユ瀛樺湪宸ュ簭涓�
for (WorkStep workStep : workStepList) {
workStepNode = new CommonGenericTree();
- workStepNode.setId(workStep.getStepId());
+ workStepNode.setId(workStep.getId());
workStepNode.setLabel("[" + workStep.getStepCode() + "]" + workStep.getStepName());
workStepNode.setParentId(null);
workStepNode.setIconClass("");
- workStepNode.setType(5);
+ workStepNode.setType(6);
workStepNode.setRField(workStep.getProcessId());
workStepNode.setEntity(workStep);
if (processMap.containsKey(workStepNode.getRField())) {
--
Gitblit v1.9.3