确认表增加程序编号

yangys

2025-08-29 b7af95d487f49490de16f9636147e5a40911e157

确认表增加程序编号

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/QinzheFgb.java

@@ -23,6 +23,10 @@
     */
    private String ljh;
    /**
     * 零件名称
     */
    private String ljmc;
    /**
     * 主管工艺(编程)
     */
    private String zggy;

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

@@ -8,6 +8,7 @@
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
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.basesetting.producedivision.entity.ProduceDivision;
@@ -71,6 +72,7 @@
        String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
        vars.put(FlowContants.WORKSHOP,workshop);

        vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
        vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
        vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
        vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());

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

@@ -60,7 +60,8 @@
        programProperties.setProcessInstanceId(processInstanceId);

        Map<String, Object> vars = runtimeService.getVariables(processInstanceId);

        this.copyFlowPropertiesFromMap(programProperties, vars);
        /*
        programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
        programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
        programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
@@ -84,12 +85,16 @@
        if(vars.containsKey(FlowContants.CURED_NODE_ID)){
            programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
        }
        if(vars.containsKey(FlowContants.NODE_ID)){
            programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
        }
        programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

        programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
        programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
        programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
        programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
        */
        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
            .processInstanceId(processInstanceId)
            .singleResult();
@@ -106,6 +111,46 @@
        programProperties.setProcessInstanceId(processInstanceId);

        Map<String, Object> vars =historicInstance.getProcessVariables();
        this.copyFlowPropertiesFromMap(programProperties,vars);
        /*
        programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
        programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
        programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
        programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
        programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));

        programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
        programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//工序版次
        programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
        programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));

        programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
        //数据处理名称为版次以前，零件号加工序号：YZL4-1100-01-50 零组件号：YZL4-1100-01 工序号 50

        programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
        programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
        programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
        if(vars.containsKey(FlowContants.DEVIATION)) {
            programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
        }
        if(vars.containsKey(FlowContants.CURED_NODE_ID)){
            programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
        }
        if(vars.containsKey(FlowContants.NODE_ID)){
            programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
        }
        programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

        programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
        programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
        programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
        programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
        */
        programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
        return programProperties;
    }

    void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){

        programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
        programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
@@ -130,6 +175,9 @@
        if(vars.containsKey(FlowContants.CURED_NODE_ID)){
            programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
        }
        if(vars.containsKey(FlowContants.NODE_ID)){
            programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
        }
        programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

        programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
@@ -137,8 +185,6 @@
        programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
        programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));

        programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
        return programProperties;
    }
    /**
     * 流程是否在进行

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

@@ -48,6 +48,9 @@
    @Schema(description = "固化程序程序节点id（如果有）")
    private Long curedNodeId;

    @Schema(description = "程序程序节点id,能确定节点id的流程会有该属性")
    private Long nodeId;

    @Schema(description = "流程实例id")
    private String processInstanceId;


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

@@ -12,6 +12,8 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.commons.contants.DictBizConstants;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.constants.FlowContants;
@@ -41,7 +43,7 @@
@Service
public class ProgramConfirmTableService {
    @Autowired
    private FlowCommonService flowCommonService;
    private QinzheFgbService qinzheFgbService;
    @Autowired
    private IDictBizClient dictBizClient;
    @Autowired
@@ -124,6 +126,12 @@
        data.put("productModel",props.getProductModel());
        data.put("craftEdition",props.getCraftEdition());

        //零组件名称
        data.put("drawingName",getDrawingName(props.getDrawingNo()));
        data.put("deviation",props.getDeviation());
        data.put("programNo",queryProgramNo(props.getNodeId()));


        data.put("fuheY","Y");
        data.put("keyongY","Y");
        Machine machine = this.machineService.getByCode(props.getMachineCode());
@@ -143,6 +151,38 @@
        return data;
    }

    /**
     * 查询程序编号
     * @param nodeId
     * @return
     */
    private String queryProgramNo(Long nodeId) {
        if(nodeId ==null) {
            return StringUtils.EMPTY;
        }
        NcNode programPkdNode = this.ncNodeService.getById(nodeId);
        if (programPkdNode != null) {
            return programPkdNode.getProgramNo();
        }else{
            return StringUtils.EMPTY;
        }

    }

    /**
     * 获取零组件名称
     * @param drawingNo 零件编号
     * @return 零组件名称
     */
    String getDrawingName(String drawingNo){
        QinzheFgb fgb = qinzheFgbService.getByLjh(drawingNo);
        if(fgb!= null){
            return fgb.getLjmc();
        }else{
            return StringUtils.EMPTY;
        }

    }

    String getNameByUserId(Long userId){
        if(userId == null){
@@ -158,4 +198,6 @@
        return name;
    }



}