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 |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 1c4a6cd..14399e8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -70,11 +70,20 @@
 
     @Override
     public Boolean isShuttle(String locNo) {
-        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;
         }
-        return Boolean.FALSE;
+        if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
+            return 3;
+        } else {
+            return locMast.getCrnNo();
+        }
     }
 
 }

--
Gitblit v1.9.1