From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 28 五月 2025 15:41:41 +0800 Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java | 46 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 7 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java index 598ba2c..4a73048 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java @@ -1,12 +1,12 @@ package org.jeecg.modules.dnc.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.dnc.entity.PartsInfo; +import org.jeecg.modules.dnc.entity.DocInfo; import org.jeecg.modules.dnc.entity.ProcessStream; -import org.jeecg.modules.dnc.entity.WorkStep; import org.jeecg.modules.dnc.request.ProcessStreamRequest; -import org.jeecg.modules.dnc.ucenter.Department; +import org.jeecg.modules.dnc.request.TreeInfoRequest; import org.jeecg.modules.system.entity.MdcProduction; +import org.jeecg.modules.system.entity.SysUser; import java.util.Collection; import java.util.List; @@ -57,18 +57,18 @@ /** * 鑾峰彇闆朵欢鍏宠仈鐨勫伐搴忎俊鎭� - * @param partsId + * @param psvId * @return */ - List<ProcessStream> findByPartsId(String partsId); + List<ProcessStream> findBypsvId(String psvId); /** * 鑾峰彇闆朵欢涓嬬殑宸ュ簭鍙� * @param processNo - * @param partsId + * @param psvsId * @return */ - ProcessStream findByProcessNoAndPartsId(String processNo, String partsId); + ProcessStream findByProcessNoAndPartsId(String processNo, String psvsId); /** * 鑾峰彇閮ㄤ欢涓嬬殑宸ュ簭鍙� * @param processNo @@ -125,4 +125,36 @@ * @return */ boolean assignRemoveDepart(ProcessStream processStream, Collection<MdcProduction> departmentList); + + + /** + * 鍒嗛厤鐢ㄦ埛鏉冮檺 + * @param processStream + * @param userList + * @return + */ + boolean assignAddUser(ProcessStream processStream, Collection<SysUser> userList); + + /** + * 绉婚櫎鐢ㄦ埛鏉冮檺 + * @param processStream + * @param userList + * @return + */ + boolean assignRemoveUser(ProcessStream processStream, Collection<SysUser> userList); + + /** + * 閫氳繃宸ュ簭鍙枫�佸伐搴忓悕绉扮瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘 + * @param treeInfoRequest + * @return + */ + List<DocInfo> getByProcessStreamOtherFile(TreeInfoRequest treeInfoRequest); + + /** + * 閫氳繃宸ュ簭鍙枫�佸伐搴忓悕绉扮瓑鏌ヨ瀵瑰簲NC鏂囦欢 + * NC鏂囦欢瀛樺湪璁惧绫讳笅闈� + * @param treeInfoRequest + * @return + */ + List<DocInfo> getByProcessStreamNCFile(TreeInfoRequest treeInfoRequest); } -- Gitblit v1.9.3