Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

严智鑫

2025-08-18 3b65a5dc04be7cdac460c84ebaa38bf009405128

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java

@@ -132,7 +132,7 @@
         return glass;
      }else{
         List<GalssTask> glass=new ArrayList<GalssTask>();
         glass=galssTaskDao.findByidentify1(groups);
         glass=galssTaskDao.findByidentify1(groups,preprocessingGlass.getMinwidths());
         return glass;
      }
      
@@ -143,7 +143,9 @@
      PreprocessingGlass preprocessingGlass=preprocessingGlassDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
      List<GalssTask> glass;
      if(patternTask!=null){
          glass=galssTaskDao.findpattern1(patternTask.getId());
          glass=galssTaskDao.findpattern2(groups,preprocessingGlass.getMinwidths());
          /*glass=galssTaskDao.findByidentify1(groups);*/
          glass.addAll(galssTaskDao.findpattern1(patternTask.getId(),preprocessingGlass.getMinwidths()));
      }else if(preprocessingGlass.getStatu().equals("多数据匹配")){
         IdentifyError identifyError=identifyErrorDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
         double minwidth=preprocessingGlass.getActualWidth()-identifyError.getHeigtherror();
@@ -154,7 +156,7 @@
         glass=galssTaskDao.findByidentify2(groups,minwidth,maxwidth,minheigth,maxheigth);
         return glass;
      }else{
          glass=galssTaskDao.findByidentify1(groups);
          glass=galssTaskDao.findByidentify1(groups,preprocessingGlass.getMinwidths());
      }
      
      return glass;