From 8b2fbb38c76c670c1db5e4d2ac3d874503cbe5e2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 15:03:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 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 c139b03..abc32af 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -63,7 +63,7 @@
 
     @Override
     public Boolean isOutMost(String locNo, Boolean pakin) {
-        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, true);
+        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, pakin);
     }
 
     public static void main(String[] args) {
@@ -119,4 +119,17 @@
         workService.shuttleTransfer(groupLoc);
     }
 
+    @Override
+    public Integer getOutCrnNo(LocMast locMast) {
+        int row = Utils.getRow(locMast.getLocNo());
+        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+            return 1;
+        }
+        if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+            return 3;
+        } else {
+            return locMast.getCrnNo();
+        }
+    }
+
 }

--
Gitblit v1.9.1