From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductInfoService.java |   50 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductInfoService.java
index 9e026c2..8b2ee7f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductInfoService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductInfoService.java
@@ -1,10 +1,13 @@
 package org.jeecg.modules.dnc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.dnc.entity.DocInfo;
 import org.jeecg.modules.dnc.entity.ProductInfo;
+import org.jeecg.modules.dnc.request.TreeInfoRequest;
 import org.jeecg.modules.dnc.response.CommonGenericTree;
-import org.jeecg.modules.dnc.ucenter.Department;
 import org.jeecg.modules.dnc.ucenter.UserDepartExt;
+import org.jeecg.modules.system.entity.MdcProduction;
 import org.jeecg.modules.system.entity.SysUser;
 
 import java.util.Collection;
@@ -84,7 +87,7 @@
      * @param paramId
      * @return
      */
-    List<Department> getDepartPermsList(Integer nodeType, String paramId);
+    List<MdcProduction> getDepartPermsList(Integer nodeType, String paramId);
 
     /**
      * 鑾峰彇鏈垎閰嶇殑閮ㄩ棬
@@ -92,7 +95,7 @@
      * @param paramId
      * @return
      */
-    List<Department> getDepartNonPermsList(Integer nodeType, String paramId);
+    List<MdcProduction> getDepartNonPermsList(Integer nodeType, String paramId);
 
     /**
      * 鎸囨淳浜у搧鏍戣妭鐐圭殑鐢ㄦ埛鏉冮檺
@@ -102,7 +105,7 @@
      * @param relativeFlag 1 鏄� 2 鍚�
      * @return
      */
-    boolean assignAddUser(Integer nodeType, String paramId, Integer relativeFlag, String[] userIds);
+    boolean assignAddUserAll(Integer nodeType, String paramId, Integer relativeFlag, String[] userIds);
 
     /**
      * 绉婚櫎浜у搧鏍戣妭鐐圭殑鐢ㄦ埛鏉冮檺
@@ -112,7 +115,7 @@
      * @param relativeFlag 1 鏄� 2 鍚�
      * @return
      */
-    boolean assignRemoveUser(Integer nodeType, String paramId, Integer relativeFlag, String[] userIds);
+    boolean assignRemoveUserAll(Integer nodeType, String paramId, Integer relativeFlag, String[] userIds);
 
     /**
      * 鎸囨淳浜у搧鏍戣妭鐐圭殑閮ㄩ棬鏉冮檺
@@ -122,7 +125,7 @@
      * @param relativeFlag 1 鏄� 2 鍚�
      * @return
      */
-    boolean assignAddDepartment(Integer nodeType, String paramId, Integer relativeFlag, String[] departmentIds);
+    boolean assignAddDepartmentAll(Integer nodeType, String paramId, Integer relativeFlag, String[] departmentIds);
 
     /**
      * 绉婚櫎浜у搧鏍戣妭鐐圭殑閮ㄩ棬鏉冮檺
@@ -132,7 +135,7 @@
      * @param relativeFlag 1 鏄� 2 鍚�
      * @return
      */
-    boolean assignRemoveDepartment(Integer nodeType, String paramId, Integer relativeFlag, String[] departmentIds);
+    boolean assignRemoveDepartmentAll(Integer nodeType, String paramId, Integer relativeFlag, String[] departmentIds);
 
 
     /**
@@ -158,7 +161,7 @@
      * @param departmentList
      * @return
      */
-    boolean assignAddDepartment(ProductInfo productInfo, Collection<Department> departmentList);
+    boolean assignAddDepartment(ProductInfo productInfo, Collection<MdcProduction> departmentList);
 
 
     /**
@@ -167,7 +170,7 @@
      * @param departmentList
      * @return
      */
-    boolean assignRemoveDepartment(ProductInfo productInfo, Collection<Department> departmentList);
+    boolean assignRemoveDepartment(ProductInfo productInfo, Collection<MdcProduction> departmentList);
 
     /**
      * 鑾峰彇鑺傜偣鐨勯儴闂ㄦ潈闄�
@@ -207,5 +210,34 @@
      * @return
      */
     List<CommonGenericTree> searchProductTree(String userId, String queryParam);
+
+    /**
+     * 浜у搧缁撴瀯鏍�-閫氳繃绫诲瀷灏辫鍒犻櫎
+     * @param id
+     * @param type
+     * @return
+     */
+    boolean deleteProductTree(String id, Integer type);
+
+    /**
+     * 鑾峰彇鍏蜂綋灞傜骇瀹炰綋
+     * @param id,treeType
+     * @return
+     */
+    Result<?> getTreeById(String id, Integer type);
+
+    /**
+     * 閫氳繃浠ｅ彿銆佸悕绉般�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘
+     * @param treeInfoRequest
+     * @return
+     */
+    List<DocInfo> getByTreeOtherFileInfo(TreeInfoRequest treeInfoRequest);
+
+    /**
+     * 閫氳繃浠ｅ彿銆佸悕绉般�佹潗璐ㄧ瓑鏌ヨ瀵瑰簲NC鏂囦欢
+     * @param treeInfoRequest
+     * @return
+     */
+    List<DocInfo> getByTreeNcFileInfo(TreeInfoRequest treeInfoRequest);
 }
 

--
Gitblit v1.9.3