From ed839069a1df066d9559263129e999de7e9c2ccc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 19 三月 2025 13:40:58 +0800
Subject: [PATCH] 修改产品结构树,修改指派程序至设备

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index 4415e17..90a1463 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -22,10 +22,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description: TODO
@@ -122,6 +119,7 @@
                 pd.setStepId(workStep.getId());
                 workStepDepartmentList.add(pd);
                 PermissionStreamNew perm = new PermissionStreamNew();
+                perm.setDepartId(item.getDepartId());
                 perm.setBusinessId(workStep.getId());
                 perm.setBusinessType("6");
                 permissionStreamList.add(perm);
@@ -144,14 +142,14 @@
         }
         //娣诲姞缁撴瀯鏍�
         ProductMix productMix = new ProductMix(Long.parseLong(workStep.getId()),Long.parseLong(workStep.getProcessId())
-                ,workStep.getStepName(),workStep.getStepCode(),6);
+                ,workStep.getStepName(),workStep.getStepCode(),6,new Date());
         productMixService.save(productMix);
         //娣诲姞鏉冮檺楠岃瘉
         PermissionStreamNew permissionStream = new PermissionStreamNew();
         permissionStream.setUserId(userId);
         permissionStream.setBusinessId(workStep.getId());
         permissionStream.setBusinessType("6");
-        return permissionStreamNewService.save(permissionStream);
+        return permissionStreamNewService.addPermissionStreamNew(permissionStream);
     }
 
     /**

--
Gitblit v1.9.3