From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects
---
河北望美项目/MES_11/src/main/java/com/northglass/service/slicecage/SlicecageService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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/slicecage/SlicecageService.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/slicecage/SlicecageService.java"
index 21e293a..8c2955c 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/slicecage/SlicecageService.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/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>");
}
}
--
Gitblit v1.8.0