庆安mdm
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yangys
2025-09-10 dc01577b31204fd3c80645b45d81ff693f79a985 
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java


@@ -25,38 +25,16 @@


 */


package org.springblade.mdm.program.service;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import lombok.AllArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.IOUtils;


import org.springblade.core.mp.base.BizServiceImpl;


import org.springblade.core.mp.support.Condition;


import org.springblade.core.oss.OssTemplate;


import org.springblade.core.oss.model.BladeFile;


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.entity.NcProgram;


import org.springblade.mdm.flow.service.FlowCommonService;


import org.springblade.mdm.program.entity.ProcessProgRef;


import org.springblade.mdm.program.entity.ProgramSeq;


import org.springblade.mdm.program.mapper.NcProgramMapper;


import org.springblade.mdm.program.mapper.ProcessProgRefMapper;


import org.springblade.mdm.program.mapper.ProgramSeqMapper;


import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;


import org.springblade.mdm.program.vo.NcProgramUploadVO;


import org.springblade.mdm.program.vo.NcProgramVO;


import org.springblade.mdm.utils.FileContentUtil;


import org.springframework.beans.BeanUtils;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.multipart.MultipartFile;




import java.io.IOException;


import java.io.InputStream;


import java.nio.charset.StandardCharsets;


import java.text.DecimalFormat;


import java.util.ArrayList;


import java.util.List;




@@ -69,7 +47,7 @@


@Service


@AllArgsConstructor


public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> {




   private final FlowCommonService flowCommonService;


   /**


    * 查询现有固化的程序，暂定条件：零组件号相同，且是同一机床组


    * @param processInstanceId 流程实例id


@@ -82,13 +60,14 @@


         return;


      }




      String processDefinationKey = flowCommonService.getDefinitionKey(processInstanceId);


      this.lambdaUpdate().eq(ProcessProgRef::getProcessInstanceId, processInstanceId).remove();


      List<ProcessProgRef> entities = new ArrayList<>();


      for (Long programId : programIds) {


         ProcessProgRef entity = new ProcessProgRef();


         entity.setProcessInstanceId(processInstanceId);


         entity.setNcProgramId(programId);




         entity.setProcessDefinitionKey(processDefinationKey);


         entities.add(entity);


      }


      this.saveBatch(entities);


@@ -107,11 +86,13 @@


    *获取最后一调任务分派的数据，根据程序id


    * @param ncProgramId 数控程序id


    */


   /*


   public ProcessProgRef lastDispatchDataByNcProgramId(Long ncProgramId) {


      LambdaQueryWrapper<ProcessProgRef> query = Wrappers.lambdaQuery();


      query.eq(ProcessProgRef::getNcProgramId, ncProgramId).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 10");;




      query.eq(ProcessProgRef::getNcProgramId, ncProgramId).eq(ProcessProgRef::getProcessDefinitionKey, StartDispatcher.PROCESS_KEY).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 1");;




      List<ProcessProgRef> list = this.list(query);


      return list.isEmpty() ? null : list.get(0);


   }


   }*/


}