yangys
2025-09-09 3d558e1bb5091b76a6525f6fab015574e1755200
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
@@ -160,15 +160,7 @@
         .eq(ProduceDivision::getCheckerId,division.getCheckerId()).eq(ProduceDivision::getSeniorId,division.getSeniorId())
         .eq(ProduceDivision::getTeamLeaderId,division.getTeamLeaderId()).count()>0;
   }
   /*
   public ProduceDivision getByDrawingNo(String drawingNo){
      List<ProduceDivision> divs = lambdaQuery().eq(ProduceDivision::getDrawingNo, drawingNo).list();
      if(divs.isEmpty()){
         return null;
      }else{
         return divs.get(0);
      }
   }*/
   /**
    * 根据勤哲零件号于主管编制获取分工表数据 图号->勤哲数据(编制) ->  主制分工表数据
@@ -179,22 +171,27 @@
   public ProduceDivision getByDrawingNoWithQinzhe(String drawingNo){
      QinzheFgb qinzheFgb = qinzheFgbService.getByLjh(drawingNo);
      if(qinzheFgb == null){
         throw new ServiceException("未找到零组件号");
         throw new ServiceException("未找到零组件号:"+drawingNo);
      }
      Long programmerId = tUserService.getUserIdByName(qinzheFgb.getZggy());
      if(programmerId == null){
         throw new ServiceException("根据"+qinzheFgb.getZggy()+"未找到对应的系统用户,请检查用户是否存在");
         throw new ServiceException("根据["+qinzheFgb.getZggy()+"]未找到对应的系统用户,请检查用户是否存在");
      }
      ProduceDivision division = lambdaQuery().eq(ProduceDivision::getProgrammerId, programmerId).list().stream().findFirst().orElse(null);
      if(division == null){
         throw new ServiceException("主制分工表无工艺员"+qinzheFgb.getZggy()+"对应的数据");
         throw new ServiceException("人员职责表无主管工艺["+qinzheFgb.getZggy()+"]对应的数据");
      }
      List<ProduceDivision> divs = lambdaQuery().eq(ProduceDivision::getDrawingNo, drawingNo).list();
      if(divs.isEmpty()){
         return null;
      }else{
         return divs.get(0);
      }
      return division;
   }
   /**
    * 选择主管工艺数据
    * @param programmer
    * @return
    */
    public List<ProduceDivisionViewVO> queryProgrammer(String programmer) {
      return baseMapper.queryProgrammer(programmer);
    }
}