From 42154214c5698326710edf336b3148830b646bb2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 11 六月 2025 13:17:56 +0800
Subject: [PATCH] 望美切换订单模式修改
---
河北望美项目/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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/cutmanage/CutManageService.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/cutmanage/CutManageService.java"
index 153ff39..9ceef27 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/cutmanage/CutManageService.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/cutmanage/CutManageService.java"
@@ -206,6 +206,10 @@
model.addAttribute("line", prodLine);
model.addAttribute("groups", prodLine);
model.addAttribute("rawPackageslist", html.toString());
+
+ StringBuffer html3 = new StringBuffer();
+ html3.append("<button type='button' onclick='task()' class='btn btn-primary' id='app'>鎵嬪姩浠诲姟</button>");
+ model.addAttribute("app", html3.toString());
@@ -269,7 +273,7 @@
public String getTasks(String prodLine, Model model) {
StringBuffer html = new StringBuffer();
- List<RawFile> rawPackageslist = rawFileDao.findAcceptedByGroups(Long.valueOf(prodLine));
+ List<RawFile> rawPackageslist = rawFileDao.findTasks(Long.valueOf(prodLine));
int num = 1;
for (RawFile rawPackages : rawPackageslist) {
int galssTaskcount = galssTaskBufferDao.findbygalsstaskcount(rawPackages.getFileName());
@@ -290,8 +294,11 @@
StringBuffer html2 = new StringBuffer();
UserDetails userDetails=userDetailsDao.findgroups(prodLine);
html2.append("<button id='dengluname' style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatedengluname()'>"+userDetails.getName()+"</button>");
+
model.addAttribute("rawPackageslist", html.toString());
model.addAttribute("rawPackageslistname", html2.toString());
+ model.addAttribute("line", prodLine);
+ model.addAttribute("groups", prodLine);
return "cutmanage/gettask";
@@ -577,7 +584,7 @@
c.close();
}else{
CallableStatement c=conn.prepareCall("{call workmanship(?)}");
- c.setLong(1,line);
+ c.setLong(1,id);
c.execute();
c.close();
@@ -756,7 +763,7 @@
int count=patternTaskDao.findcount(rawFile.getId());
int sum=patternTaskDao.findsum(rawFile.getId());
html.append("<tr>");
- html.append("<td>").append(rawFile.getFileName()).append("</td>");
+ html.append("<td id='fileName'>").append(rawFile.getFileName()).append("</td>");
/*html.append("<td>").append(patternTask.getRawWidth()).append("</td>");
html.append("<td>").append(patternTask.getRawHeight()).append("</td>");
html.append("<td>").append(patternTask.getRawThickness()).append("</td>");
@@ -879,6 +886,32 @@
}
}
+ public void updatepieces(Long id,String width,String height,String thinkness,String color,String count) {
+// PatternTask patternTask=patternTaskDao.findOne(id);
+// if(patternTask!=null){
+// patternTask.setContent(count);
+// patternTaskDao.save(patternTask);
+// }
+ //娣诲姞鎵嬪姩鎶ュ伐浠诲姟
+
+ Connection conn=DeviceService.getConnection();
+ try {
+ CallableStatement c=conn.prepareCall("{call GalssCutmanage4(?,?,?,?,?,?)}");
+ c.setString(1,width);
+ c.setString(2, height);
+ c.setString(3, thinkness);
+ c.setString(4, color);
+ c.setString(5, count);
+ c.registerOutParameter(5, java.sql.Types.INTEGER);
+ c.execute();
+ c.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }finally{
+ messageProcessor.close(conn);
+ }
+ }
+
public void updatetask(Long id) {
PatternTask patternTask=patternTaskDao.findOne(id);
--
Gitblit v1.8.0