Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java

@@ -1,11 +1,10 @@
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;

@@ -58,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
@@ -143,4 +142,23 @@
     * @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);

    boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd);

    boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd);
}