ncNode增加字段

yangys

2025-06-21 30cb19306570b0838bbc5ec7e01377f3d17b4281

ncNode增加字段

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package org.springblade.mdm.flow.service;

import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.Map;

/**
 * å›ºåŒ–流程服务
 */
@Service
public class CureFlowService {

    @Autowired
    private RuntimeService runtimeService;
    @Autowired
    private AutoAssignUsersService autoAssignUsersService;
    @Autowired
    private IdentityService identityService;

    @Autowired
    private NcProgramService ncProgramService;
    /**
     * å›ºåŒ–流程的key
     */
    private static final String PROCESS_KEY = "program-cure";

    public void start(long programId){
        Map<String, Object> vars = new HashMap<>();
        /*
        Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
        Map<String, Object> vars = new HashMap<>(preAssignee);

        vars.put("machineCode",startVO.getMachineCode());
        vars.put("machineMode",startVO.getMachineMode());

        vars.put("processNo",startVO.getProcessNo());
        vars.put("processName",startVO.getProcessName());
        vars.put("processEdition",startVO.getProcessEdition());

        vars.put("craftEdition",startVO.getCraftEdition());
        vars.put("planStartTime",startVO.getPlanStartTime());
        vars.put("drawingNo",startVO.getDrawingNo());
        vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
        vars.put("planLockDays",startVO.getPlanLockDays());

        //零组件代码
        String partNo = generatePartNo(startVO);
        vars.put("partNo",partNo);

        NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
        vars.put("curedNcProgram",curedNcProgram);

        //设置是否有固化程序标记
        vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
        */
        String businessKey = "0";//业务表key

        identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
        ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);

        int a=1;
        //log.info()
    }

    /**
     * ç”Ÿæˆé›¶ç»„件编号
     * å›¾å·ã€å›¾å·ç‰ˆæ¬¡ã€å·¥åºå·ã€å·¥åºåç§°ã€å·¥è‰ºç‰ˆæ¬¡ã€å·¥åºç‰ˆæ¬¡ ç»„合起来获得零组件号
     * @param startVO
     * @return
     */
    String generatePartNo(TaskAssignVO startVO){
        //TODO è¿™ä¸ªæ ¼å¼æœªç¡®å®šï¼Œéœ€è¦ç¡®è®¤
        return String.format("%s-%s-%s-%s-%s-%s",
            startVO.getDrawingNo(),
            startVO.getDrawingNoEdition(),
            startVO.getProcessNo(),
            startVO.getProcessName(),
            startVO.getCraftEdition(),
            startVO.getProcessEdition());
    }
}

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

@@ -29,22 +29,6 @@
public class DncSendBackController {

    private final DncSendBackService dncSendBackService;

    /**
     * dnc回传文件导入
     *
     * @param file æµç¨‹æ–‡ä»¶
     */
    /*
    @PostMapping("dnc-sendback-upload")
    @ApiOperationSupport(order = 4)
    @Operation(summary = "dnc回传文件导入", description = "dnc回传文件导入")
    public R dncSendBackUpload(@RequestParam MultipartFile file) {
        boolean temp = Objects.requireNonNull(file.getOriginalFilename()).endsWith("pkg");
        temp = true;//临时放行
        return R.data(Kv.create().set("name", file.getOriginalFilename()).set("success", temp));
    }
    */
    /**
     * ä¸Šä¼ DNC回传文件
     *

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

@@ -1,7 +1,6 @@

package org.springblade.mdm.program.controller;

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@@ -10,7 +9,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.NcNodeService;
@@ -18,7 +16,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 * ç¨‹åºèŠ‚点
@@ -49,7 +46,7 @@
    @PostMapping("/update")
    @Operation(summary = "修改节点", description = "节点信息,必须传入ID")
    public R<Boolean> update(@RequestBody NcNodeVO vo) {
        ncNodeService.updateNcCode(vo);
        ncNodeService.updateNcNode(vo);
        return R.<Boolean>status(true);
    }


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

@@ -35,6 +35,7 @@
import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
import org.flowable.engine.*;
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -133,13 +134,19 @@
        return datas;
    }
    /**
     * å…¥åº“回传文件
     * å…¥åº“回传文件,并启动固化流程
     * @param ids
     * @return
     */
    public void dncFileAccept(String ids) {
        List<Long> idList = Func.toLongList(ids);
        for (Long id : idList) {
            //启动固化流程
        }

    }


}

class ZipFileDirectoryScanner {

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

@@ -1,15 +1,10 @@

package org.springblade.mdm.program.service;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.*;
import org.springblade.core.mp.base.BizServiceImpl;
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.program.entity.NcNode;
import org.springblade.mdm.program.mapper.NcNodeMapper;
import org.springblade.mdm.program.vo.NcNodeVO;
@@ -38,8 +33,11 @@
        this.save(ncNode);
    }


    public void updateNcCode(NcNodeVO vo) {
    /**
     * æ›´æ–°èŠ‚点
     * @param vo
     */
    public void updateNcNode(NcNodeVO vo) {
        NcNode ncNode = this.getById(vo.getId());
        ncNode.setName(vo.getName());
        ncNode.setNodeType(vo.getNodeType());