偏离回传 流程改名

yangys

2025-08-22 18d9c0bdc04e71cf3903c30c139f59dab744cf3f

偏离回传 流程改名

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

@@ -61,8 +61,7 @@
        NcNode programPackage = this.ncNodeService.getById(nodeId);
        vars.put(FlowContants.NODE_ID,programPackage.getId());
        vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
        //机床型号
        //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);

        //机床型号
        Machine machine = machineService.getByCode(programPackage.getMachineCode());
        if(machine != null) {
@@ -82,13 +81,7 @@
        vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

        vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
        /*

        vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
        vars.put(FlowContants.CHECKER,div.getCheckerId());
        vars.put(FlowContants.SENIOR,div.getSeniorId());
        vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
        */
        flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
        //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
        vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
@@ -99,8 +92,11 @@
        vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
        vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题

        vars.put(FlowContants.MY_PROCESS_NAME, "固化流程");

        if(programPackage.getDeviation() != null) {
            vars.put(FlowContants.MY_PROCESS_NAME, "偏离回传");
        }else {
            vars.put(FlowContants.MY_PROCESS_NAME, "固化流程");
        }
        ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);

        //更新程序包名节点的流程实例id

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

@@ -78,7 +78,6 @@
            bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));

            try(InputStream zipFileInputStream = ossTemplate.statFileStream(bfile.getName());) {
                //InputStream zipFileInputStream = file.getInputStream();//test
                list = parseProgramListFromZip(zipFileInputStream);
            }
        } catch (IOException e) {
@@ -211,27 +210,8 @@
        String zipFileName = bladeRedis.get(filekey);
        log.info("filekey={},文件名={}",filekey,zipFileName);

        //Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();

        Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);

        ///List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
        //updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
        /*
        log.info("需要启动固化流程的程序包名数量:{}",newProgramPackageList.size());
        for(NcNode pkgNode :newProgramPackageList){
            exchange = new NcProgramExchange();
            exchange.setName(pkgNode.getName());
            exchange.setExchangeType(2);//回传
            exchange.setNcNodeId(pkgNode.getId());

            this.save(exchange);
        }*/
        //bladeRedis.del(filekey);
        //this.ossTemplate.removeFile(zipFileName);
        //log.info("删除oss文件:{}",zipFileName);

        //cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
        cureFlowService.startCureNew(pkgIdFileMap);

    }