From 3ada754b60571bfa156c2e61df8ddea7ccc496fb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 14:13:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 a17dc7e..acd2d53 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -70,7 +71,28 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, pakin);
+ int row = Utils.getRow(locNo);
+ int bay = Utils.getBay(locNo);
+ ArrayList<Integer> list = new ArrayList<Integer>(){{
+ add(1);add(3);add(4);add(6);
+ add(8);add(10);add(11);
+ }};
+
+ if (list.contains(row)) {
+ return true;//鏈�澶栦晶搴撲綅
+ }
+
+ if (row == 13 && (bay >= 59 && bay <= 61)) {
+ return true;//鏈�澶栦晶搴撲綅
+ }
+
+ if (bay < 59) {
+ if (row == 13 || row == 14 || row == 16) {
+ return true;//鏈�澶栦晶搴撲綅
+ }
+ }
+
+ return false;//涓嶆槸鏈�澶栦晶搴撲綅
}
public static void main(String[] args) {
--
Gitblit v1.9.1