yangys
2025-07-08 ffd5abc74eea1f6ee6433ac11e401aaa57bcc4ab
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
@@ -37,6 +37,8 @@
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.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
@@ -69,7 +71,7 @@
@Service
@AllArgsConstructor
public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> {
   private final FlowCommonService flowCommonService;
   /**
    * 查询现有固化的程序,暂定条件:零组件号相同,且是同一机床组
    * @param processInstanceId 流程实例id
@@ -82,13 +84,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);
@@ -109,7 +112,8 @@
    */
   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);