From 581df534cbf44938438189bc6fa8e376427ed238 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 15 七月 2021 13:53:35 +0800
Subject: [PATCH] 出库通知档 1.紧急任务可以超过3个，允许多选
---
src/main/webapp/jsFiles/waitPakOut.js | 10 +++++-----
src/main/java/com/slcf/controller/WaitPakOutController.java | 26 ++++++++++++++++----------
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/slcf/controller/WaitPakOutController.java b/src/main/java/com/slcf/controller/WaitPakOutController.java
index f0c22d2..5836c47 100644
--- a/src/main/java/com/slcf/controller/WaitPakOutController.java
+++ b/src/main/java/com/slcf/controller/WaitPakOutController.java
@@ -167,18 +167,24 @@
Integer i = 0;
String errorTxt = "";
if (list.size() > 0) {
- // 鍒ゆ柇绱ф�ヤ换鍔℃暟閲忔槸鍚﹀凡缁忚秴杩�3涓紝瓒呭嚭3涓笉鍏佽缁х画鏂板绱ф�ヤ换鍔�
- Integer emsNum = waitPakOutService.countEmsNum();
- if (emsNum < 3) {
- // 璁剧疆浠诲姟涓虹揣鎬ョ姸鎬�
- for (SetEmsParam item : list) {
- if (waitPakOutService.waitPakOutSetEms(item) > 0) {
- i++;
- }
+ // 璁剧疆浠诲姟涓虹揣鎬ョ姸鎬�
+ for (SetEmsParam item : list) {
+ if (waitPakOutService.waitPakOutSetEms(item) > 0) {
+ i++;
}
- } else {
- errorTxt = "绱ф�ヤ换鍔″凡瓒呭嚭3涓紝璇疯�愬績绛夊緟浠诲姟瀹屾垚";
}
+// // 鍒ゆ柇绱ф�ヤ换鍔℃暟閲忔槸鍚﹀凡缁忚秴杩�3涓紝瓒呭嚭3涓笉鍏佽缁х画鏂板绱ф�ヤ换鍔�
+// Integer emsNum = waitPakOutService.countEmsNum();
+// if (emsNum < 3) {
+// // 璁剧疆浠诲姟涓虹揣鎬ョ姸鎬�
+// for (SetEmsParam item : list) {
+// if (waitPakOutService.waitPakOutSetEms(item) > 0) {
+// i++;
+// }
+// }
+// } else {
+// errorTxt = "绱ф�ヤ换鍔″凡瓒呭嚭3涓紝璇疯�愬績绛夊緟浠诲姟瀹屾垚";
+// }
} else {
throw new Error("鏁版嵁寮傚父");
}
diff --git a/src/main/webapp/jsFiles/waitPakOut.js b/src/main/webapp/jsFiles/waitPakOut.js
index fd38ba1..e4cc7dd 100644
--- a/src/main/webapp/jsFiles/waitPakOut.js
+++ b/src/main/webapp/jsFiles/waitPakOut.js
@@ -19,7 +19,7 @@
showRefresh: false, //鏄剧ず鍒锋柊鎸夐挳
showExport: false,
toolbar: "#toolbar",
- singleSelect : true,
+ // singleSelect : true,
clickToSelect: true, // 鍗曞嚮琛屽嵆鍙互閫変腑
search: false,//鏄剧ず鎼滅礌琛ㄥ崟
silent: true, //鍒锋柊浜嬩欢蹇呴』璁剧疆
@@ -201,15 +201,15 @@
oInit.InitSubTable(index, row, $detail);
},
onCheck: function (row) {
- getNetACount();
+ // getNetACount();
// alert(row.menu_name);
}, onUncheck: function (row) {
- getNetACount();
+ // getNetACount();
// alert('鍙栨秷閫変腑');
}, onCheckAll: function () {
- getNetACount();
+ // getNetACount();
}, onUncheckAll: function () {
- getNetACount();
+ // getNetACount();
},
onClickRow: function (row, $element) {
$('.info').removeClass('info');
--
Gitblit v1.9.1