From cc0e9036de6e922e8fe254fef01d8de9996024b7 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 18:16:03 +0800
Subject: [PATCH] 获取报警描述修改

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
index db7ebac..59e70c2 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -48,6 +48,10 @@
     @Autowired
     private IProcessSpecVersionService processSpecVersionService;
     @Autowired
+    private IProcessStreamService processStreamService;
+    @Autowired
+    private IWorkStepService workStepService;
+    @Autowired
     private IDocRelativeService iDocRelativeService;
     @Autowired
     private IProductPermissionService productPermissionService;
@@ -147,8 +151,8 @@
         boolean b = super.updateById(partsInfo);
         //鍚屾淇敼缁撴瀯鏍�
         ProductMix productMix = productMixService.getById(Long.parseLong(id));
-        productMix.setName(partsInfo.getPartsName());
-        productMix.setCode(partsInfo.getPartsCode());
+        productMix.setTreeName(partsInfo.getPartsName());
+        productMix.setTreeCode(partsInfo.getPartsCode());
         productMixService.updateById(productMix);
         if(!b)
             return false;
@@ -481,9 +485,33 @@
             List<String> id =new ArrayList<>();
             id.add(treeInfoRequest.getAttributionId());
             treeInfoRequest.setPartsIds(id);
+            //宸ヨ壓瑙勭▼鐗堟湰
             List<DocInfo> processSpecVersions = processSpecVersionService.getByProcessSpecVersion(treeInfoRequest);
             docInfos.addAll(processSpecVersions);
+            //宸ュ簭
+            List<DocInfo> processStreams = processStreamService.getByProcessStreamOtherFile(treeInfoRequest);
+            docInfos.addAll(processStreams);
+            //宸ユ
+            List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest);
+            docInfos.addAll(workSteps);
         }
         return docInfos;
     }
+
+    @Override
+    public boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd){
+        if (isAdd) {
+            return assignAddUser((PartsInfo) entity, userList);
+        } else {
+            return assignRemoveUser((PartsInfo) entity, userList);
+        }
+    }
+    @Override
+    public boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd) {
+        if (isAdd) {
+            return assignAddDepart((PartsInfo) entity, departments);
+        } else {
+            return assignRemoveDepart((PartsInfo) entity, departments);
+        }
+    }
 }

--
Gitblit v1.9.3