From 261a155bfc3dd5b51c207af23b3ef631253dcfd6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 十二月 2022 10:39:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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 3c7fb69..e1ba5cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -54,8 +54,13 @@
}
@Override
- public Boolean isOutMost(String locNo) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo);
+ 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);
+ }
}
@Override
@@ -63,4 +68,26 @@
return this.baseMapper.getDemoNextLoc(crnNo);
}
+ @Override
+ public Boolean isShuttle(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row >= 2 && row <= 30) {
+ return Boolean.TRUE;
+ }
+ 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