From f631782d5fc99a07c59e9c5275e347a88fcc4b70 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 03 六月 2025 08:07:04 +0800
Subject: [PATCH] 修改双任务模式

---
 河北望美项目/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java"
index d2de2ff..48fffc7 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java"
@@ -143,7 +143,8 @@
 		PreprocessingGlass preprocessingGlass=preprocessingGlassDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
 		List<GalssTask> glass;
 		if(patternTask!=null){
-			 glass=galssTaskDao.findpattern1(patternTask.getId());
+			 /*glass=galssTaskDao.findpattern1(patternTask.getId());*/
+			 glass=galssTaskDao.findByidentify1(groups);
 		}else if(preprocessingGlass.getStatu().equals("澶氭暟鎹尮閰�")){
 			IdentifyError identifyError=identifyErrorDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
 			double minwidth=preprocessingGlass.getActualWidth()-identifyError.getHeigtherror();

--
Gitblit v1.8.0