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/slicecage/SlicecageService.java

@@ -65,11 +65,12 @@
               html.append("<td></td>");
               html.append("<td></td>");
               html.append("<td></td>");
               html.append("<td>"+slicecages.getFlag() +"</td>");
               html.append("<td></td>");
               html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
               html.append("</tr>");
            }
            else{
               List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),groups);
               List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),slicecages.getProcesscardId(),groups);
               GalssTask galssTask=galssTasklist.get(0);
               html.append("<tr>");
               html.append("<td style='width:30px'><input type='checkbox' name='id' value="+slicecages.getId() +" /></td>");
@@ -82,7 +83,8 @@
               html.append("<td>"+galssTask.getThickness()+"</td>");
               html.append("<td>"+slicecages.getCount()+"</td>");
               html.append("<td>"+slicecages.getProcesscardId()+"</td>");
               html.append("<td>"+slicecages.getFlag() +"</td>");
               html.append("<td>"+galssTask.getEngineeringId()+"</td>");
               html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
               html.append("</tr>");
            }
         }
@@ -108,11 +110,12 @@
               html.append("<td></td>");
               html.append("<td></td>");
               html.append("<td></td>");
               html.append("<td>"+slicecages.getFlag() +"</td>");
               html.append("<td></td>");
               html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
               html.append("</tr>");
            }
            else{
               List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),groups);
               List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),slicecages.getProcesscardId(),groups);
               GalssTask galssTask=galssTasklist.get(0);
               html.append("<tr>");
               html.append("<td style='width:30px'><input type='checkbox' name='id' value="+slicecages.getId() +" /></td>");
@@ -125,7 +128,8 @@
               html.append("<td>"+galssTask.getThickness()+"</td>");
               html.append("<td>"+slicecages.getCount()+"</td>");
               html.append("<td>"+slicecages.getProcesscardId()+"</td>");
               html.append("<td>"+slicecages.getFlag() +"</td>");
               html.append("<td>"+galssTask.getEngineeringId()+"</td>");
               html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
               html.append("</tr>");
            }
         }