From b20aaa67ac6c8b090e1fc9f3de43f2020023b24d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 08:00:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 d7ac868..e1ba5cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -55,7 +55,12 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, 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);
+ }
}
@Override
@@ -72,4 +77,17 @@
return Boolean.FALSE;
}
+ @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();
+ }
+ }
+
}
--
Gitblit v1.9.1