From 6067c5e5e7e568caa915f5124c71f39fbd2dc1b9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 16 六月 2025 08:03:29 +0800
Subject: [PATCH] 结束任务新增弹窗，以及理片界面显示工程号
---
河北望美项目/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 48fffc7..d59b90c 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"
@@ -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,8 +143,9 @@
PreprocessingGlass preprocessingGlass=preprocessingGlassDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
List<GalssTask> glass;
if(patternTask!=null){
- /*glass=galssTaskDao.findpattern1(patternTask.getId());*/
- glass=galssTaskDao.findByidentify1(groups);
+ 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();
@@ -155,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;
--
Gitblit v1.8.0