修改表格打印的数控程序编号

yangys

2025-09-13 3ffe33aaa24386337e3638558eca731c62f25521

修改表格打印的数控程序编号

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

@@ -48,12 +48,12 @@
            packageNode = ncNodeService.getById(props.getCuredNodeId());

            if(FlowContants.N.equals(props.getCureProgramUseable())) {
                //程序不可用
                //原来的固化节点锁定
                //程序不可用，原来的固化节点锁定
                packageNode.lock();
                ncNodeService.updateById(packageNode);

                Integer newVersion = packageNode.genNewVersionNumber();
                //TODO 版本号根据零组件号+工序号，工序版次，机床组 直接查询数量，+1获取
                packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
            }else{
                //可用，升版（修改其工序版次），原来的节点清除
@@ -65,7 +65,7 @@
        }

        addApproveTable(packageNode,props);
        //updateApproveRecordNodeId(instId, packageNode.getId());
		
        log.info("普通流程已完成in DispatchFinishListener");
    }


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

@@ -121,7 +121,7 @@
        programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
        programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));

        programProperties.setProgramNo(Func.toStr(vars.get(FlowContants.PROGRAM_NO)));
        programProperties.setProgramNo(programProperties.getDrawingNo()+"-"+programProperties.getProcessNo()+"-"+programProperties.getProcessEdition());

        programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
        programProperties.setActCheckerId(Func.toLong(vars.get(FlowVariableContants.ACT_CHECKER)));

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

@@ -44,16 +44,16 @@
    @Override
    public void completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
        Task task = currentTask(taskId);

        // 非空判断
        if (Func.isEmpty(variables)) {
            variables = Kv.create();
        }
        String operateResult = this.getApproveResult(variables);

        FlowProgramProperties props = flowCommonService.getProgramProperties(processInstanceId);
        if(!variables.containsKey("assignee")) {
            throw new ServiceException("请指定流程下一步处理人");
        }

        // 非空判断
        if (Func.isEmpty(variables)) {
            variables = Kv.create();
        }

        if(task.getTaskDefinitionKey().equals("programmingTask") ) {//编制节点

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java

@@ -105,7 +105,7 @@
            dataMap.put("bz", WordReplaceUtil.CHECKED);
        }

        dataMap.put("programNo",dispatch.getProgramNo());
        dataMap.put("programNo",props.getProgramNo());

        dataMap.put("fzy",WordReplaceUtil.CHECKED); //仿真 是
        dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//仿真 否

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java

@@ -91,7 +91,7 @@
            //防止老数据报错
            dispatch = new TaskDispatch();
        }
        dataMap.put("bh",node.getProgramNo());//编号，就是数控程序编号
        dataMap.put("bh",props.getProgramNo());//编号，就是数控程序编号

        dataMap.put("drawingNo", props.getDrawingNo());
        dataMap.put("processNo", props.getProcessNo());
@@ -125,7 +125,7 @@
        }else{
            dataMap.put("czz", "");
        }
        dataMap.put("programNo",dispatch.getProgramNo());
        dataMap.put("programNo",props.getProgramNo());
        if(StringUtils.isNotBlank(dispatch.getInspector())) {
            dataMap.put("jyy",dispatch.getInspector()+"/"+formatTimeForTable(dispatch.getCheckTime()));//实际检验员和检验时间