From d41e012eda2982b07aaf79adeb4fa4ffee82ea90 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 16 五月 2022 19:19:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 18 +++++++++---------
src/main/webapp/views/pakStore/locDetlQuery.html | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 982f348..9000b84 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -46,18 +46,18 @@
return false;
}
}
- if (crnp.getCrnSts() != null) {
- if (crnp.getCrnSts() == 10) {
- log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", crnNo);
- return false;
- }
- }
-// if (crnp.getCrnErr() != null) {
-// if (crnp.getCrnErr() != 0) {
-// log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+// if (crnp.getCrnSts() != null) {
+// if (crnp.getCrnSts() == 10) {
+// log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", crnNo);
// return false;
// }
// }
+ if (crnp.getCrnErr() != null) {
+ if (crnp.getCrnErr() != 0) {
+ log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+ return false;
+ }
+ }
return true;
}
}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 5d835a4..ef7c53d 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -120,7 +120,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/stock/out/list/auth',
page: true,
- limit: 10,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
--
Gitblit v1.9.1