From 438b6be5ea9ed484b50a45a0f210b80180473491 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 11:51:45 +0800
Subject: [PATCH] dnc与mdc部门进行整合 使用Mdc部门进行处理  修改所属部门为所属车间  修改yml文件数据库地址

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..cfbbd53 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
@@ -71,7 +71,7 @@
             processNode.setLabel("[" + processStream.getProcessCode()+ "]" + processStream.getProcessName());
             processNode.setParentId(null);
             processNode.setIconClass("");
-            processNode.setType(4);
+            processNode.setType(5);
             if (StrUtil.isEmpty(processStream.getPartsId())) {
                 //娌℃湁partsId锛岄儴浠朵笅鐨勫伐搴�
                 processNode.setRField(processStream.getComponentId());
@@ -97,11 +97,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