锁定流程完成

yangys

2025-08-17 0ef4cc755bddd87799b8bfdd65c8123df6e149d0

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java

@@ -11,6 +11,8 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
@@ -23,7 +25,7 @@
@AllArgsConstructor
@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
   private final NcProgramService progService;
   private final MachineFileService macineFileService;
   private final OssTemplate ossTemplate;
   /**
    * 接受
@@ -32,14 +34,17 @@
   public void accept(String ids) {

      List<Long> idList = Func.toLongList(ids);

      MachineFile mf;
      for(Long id : idList){
         mf = macineFileService.getById(id);
         mf.accept();
         macineFileService.updateById(mf);
         /*
         MachineBackFile backFile = this.getById(id);
         backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
         backFile.setConfirmTime(DateUtil.now());
         this.updateById(backFile);


         */
      }

   }
@@ -51,12 +56,19 @@
   public void reject(String ids) {
      List<Long> idList = Func.toLongList(ids);

      MachineFile mf;
      for(Long id : idList){
         mf = macineFileService.getById(id);
         mf.reject();
         macineFileService.updateById(mf);
      }
      /*
      for(Long id : idList){
         MachineBackFile backFile = this.getById(id);
         backFile.setStatus(MachineBackFile.STATUS_REJECTED);
         backFile.setConfirmTime(DateUtil.now());
         this.updateById(backFile);
      }
      }*/

   }

@@ -65,21 +77,22 @@
    * @param query 查询参数
    * @return 分页数据
    */
   /*
   public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {
      IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);

      return page;
   }
   }*/

   /**
    * 机床回传程序处理分页查询
    * @param query 查询参数对象
    * @return 分页数据
    */
   /*
   public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
      IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
      return page;
   }

   */

}