From 5b6c1e9a11639e44a5a830da989ec6ff46bf7000 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 05 七月 2023 13:13:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 28 ++++++++++++++--------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index aa4b14d..3cda130 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4401,7 +4401,7 @@
if (null == loc) {
News.error("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
- return;
+// return;
// throw new CoolException("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 9625946..9a49a36 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -648,20 +648,20 @@
return false;
}
}
- if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
- if (locMast.getLocSts().equals("X")){
- row = selectInSide2(row);
- if (row==0){
- return true;
- }
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
- if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
- return true;
- }
- } else {
- return true;
- }
- }
+// if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
+// if (locMast.getLocSts().equals("X")){
+// row = selectInSide2(row);
+// if (row==0){
+// return true;
+// }
+// LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
+// if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
+// return true;
+// }
+// } else {
+// return true;
+// }
+// }
return false;
}
--
Gitblit v1.9.1