From 4e408ee7956752c6c8612c40d2070f353306a9cb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 08:25:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 1c4a6cd..0a51a73 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -55,12 +55,7 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- if (null == pakin) {
- return (Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, true)
- || Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, false));
- } else {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin);
- }
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin);
}
@Override
@@ -70,11 +65,16 @@
@Override
public Boolean isShuttle(String locNo) {
- int row = Utils.getRow(locNo);
- if (row >= 2 && row <= 30) {
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
+// int row = Utils.getRow(locNo);
+// if (row >= 2 && row <= 30) {
+// return Boolean.TRUE;
+// }
+ return Boolean.TRUE;
+ }
+
+ @Override
+ public Integer getOutCrnNo(LocMast locMast) {
+ return 1;
}
}
--
Gitblit v1.9.1