增加审批界面任务车间的查询和显示

yangys

2025-08-10 8318e40770d53c87e2d5921d2d11f8de47c61e76

增加审批界面任务车间的查询和显示

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java

@@ -12,6 +12,7 @@
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +35,7 @@
    private final NcNodeService ncNodeService;

    private final FlowProgramFileService flowProgramFileService;

    private final NodeDeptQueryService nodeDeptQueryService;
    //public static final String PROCESS_KEY = "dispatch";

    /**
@@ -52,9 +53,12 @@
        vars.put(FlowContants.TITLE,startVO.getTitle());
        //机床编号
        vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());

        String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
        vars.put("workshop",workshop);
        //机床型号
        vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());


        vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());
        vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());
        vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java

@@ -18,6 +18,7 @@
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
@@ -39,7 +40,7 @@
    private final IdentityService identityService;
    private final FlowProgramFileService flowProgramFileService;
    private final ReplaceProgramFileService replaceProgramFileService;
    private final MachineService machineService;
    private final NodeDeptQueryService nodeDeptQueryService;

    public static final String NODE_ID = "nodeId";
    /**
@@ -97,6 +98,8 @@
        BeanUtils.copyProperties(node, vo);
        vo.setProcessInstanceId(tempInstanceId);

        vo.setWorkshop(nodeDeptQueryService.getWorkshopNameByMachineCode(node.getMachineCode()));

        return vo;
    }


 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NodeDeptQueryService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@

package org.springblade.mdm.program.service;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.mapper.NcNodeMapper;
import org.springblade.mdm.program.vo.NcNodeQueryVO;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

/**
 * ç¨‹åºèŠ‚点机构查询服务
 *
 * @author yangys
 */
@Slf4j
@Service
@AllArgsConstructor
public class NodeDeptQueryService{
    private final MachineService machineService;
    private final ISysClient sysClient;


    /**
     *车间类型字典key
     */
    private static final String WORKSHOP_DICT_KEY = "workShopDictKey";
    /**
     * è½¦é—´ç±»åž‹é»˜è®¤å€¼
     */
    private static final int DEF_WORKSHOP_DICT_VALUE = 4;

    @Transactional(readOnly = true)
    public String getWorkshopNameByMachineCode(String machineCode){
        String workshopName = "";

        try {
            Machine machine = machineService.getByCode(machineCode);
            if (machine != null) {
                int workShopDictValue = DEF_WORKSHOP_DICT_VALUE;
                R<String> paramR = sysClient.getParamValue(WORKSHOP_DICT_KEY);
                if (paramR.isSuccess()) {
                    workShopDictValue = Func.toInt(paramR.getData());
                }
                R<Dept> deptObj = sysClient.getDept(machine.getOwnerDept());
                while (deptObj.isSuccess() && deptObj.getData().getDeptCategory() != workShopDictValue) {
                    deptObj = sysClient.getDept(deptObj.getData().getParentId());
                }

                if (deptObj.isSuccess()) {
                    workshopName = deptObj.getData().getDeptName();
                }
            }
        }catch (Exception e){
            log.error("获取车间名称错误",e);
        }
        return workshopName;
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java

@@ -56,6 +56,9 @@
    private List<NcNodeVO> children;
    @Schema(description = "流程实例id，程序包节点有此属性")
    private String processInstanceId;
    @Schema(description = "任务车间")
    private String workshop;

    public void addChildren(NcNodeVO node){
        if(children == null){
            children = new ArrayList<NcNodeVO>();