From 6421f3acf199f951e9e98919b9e38610beedd438 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 08:09:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 8e06fd9..14399e8 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,36 @@
}
@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
+ public List<String> getDemoNextLoc(Integer crnNo) {
+ return this.baseMapper.getDemoNextLoc(crnNo);
+ }
+
+ @Override
+ public Boolean isShuttle(String locNo) {
+ 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();
+ }
}
}
--
Gitblit v1.9.1