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/cutmanage/CutManageService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 d5ea912..d08b33b 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"
@@ -556,9 +556,7 @@
//缁撴潫浠诲姟
public String delecttask(Long id,Long line) {
RawFile rawFile=rawFileDao.findAcceptedByGroup2(id);
- System.out.println(1111);
int lipiancount =galssTaskDao.finlipian2(rawFile.getFileName());
- System.out.println(2222);
int slicecount;
if (line==1) {
slicecount=horizontalDao.findfall3(rawFile.getFileName());
@@ -572,7 +570,7 @@
System.out.println(slicecount);
System.out.println(rawFile.getFileName());
if(lipiancount>0||slicecount>0){
- return "redirect:cutmanage/gettasks";
+ return "鐞嗙墖瀛樺湪褰撳墠璁㈠崟鐜荤拑:浠诲姟瀛樺湪"+lipiancount+","+slicecount;
}else{
Connection conn=DeviceService.getConnection();
try{
@@ -601,10 +599,10 @@
}
}
- return "redirect:cutmanage/gettasks";
+ return "缁撴潫鎴愬姛";
} catch (SQLException e) {
e.printStackTrace();
- return "redirect:cutmanage/gettasks";
+ return "鏈嶅姟鍣ㄨ繛鎺ラ敊璇�";
}finally{
messageProcessor.close(conn);
}
@@ -628,7 +626,7 @@
slicecount=slicecageDao.findfall3(rawFile.getFileName());
}
if(lipiancount>0||slicecount>0){
- return "redirect:cutmanage/gettasks";
+ return "鐞嗙墖瀛樺湪褰撳墠璁㈠崟鐜荤拑:浠诲姟瀛樺湪"+lipiancount+","+slicecount;
}else{
Connection conn=DeviceService.getConnection();
try {
@@ -657,10 +655,10 @@
}
}
- return "redirect:cutmanage/gettasks";
+ return "涓柇鎴愬姛";
} catch (SQLException e) {
e.printStackTrace();
- return "redirect:cutmanage/gettasks";
+ return "鏈嶅姟鍣ㄨ繛鎺ラ敊璇�";
}finally{
messageProcessor.close(conn);
}
--
Gitblit v1.8.0