From 4bebcda1c8c9f9344d25d2f06c90f84bd045534e Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 28 二月 2023 14:48:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 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 e1ba5cd..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,24 +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) {
- int row = Utils.getRow(locMast.getLocNo());
- if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 1;
- }
- if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 3;
- } else {
- return locMast.getCrnNo();
- }
+ return 1;
}
}
--
Gitblit v1.9.1