From cdca466c533197157f3255b77fbdb4aac89be064 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 30 八月 2023 08:26:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 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..c50356a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -55,12 +55,7 @@
 
     @Override
     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);
-        }
+        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin);
     }
 
     @Override
@@ -70,11 +65,30 @@
 
     @Override
     public Boolean isShuttle(String locNo) {
-        int row = Utils.getRow(locNo);
-        if (row >= 2 && row <= 30) {
-            return Boolean.TRUE;
-        }
-        return Boolean.FALSE;
+//        int row = Utils.getRow(locNo);
+//        if (row >= 2 && row <= 30) {
+//            return Boolean.TRUE;
+//        }
+        return Boolean.TRUE;
     }
 
+    @Override
+    public Integer getOutCrnNo(LocMast locMast) {
+        return 1;
+    }
+
+    @Override
+    public LocMast queryByLoc(String locNo) {
+        return this.baseMapper.queryByLoc(locNo);
+    }
+
+    @Override
+    public LocMast queryByQrCode(String qrCodeValue) {
+        return this.baseMapper.queryByQrCode(qrCodeValue);
+    }
+
+    @Override
+    public List<LocMast> selectLocByLev(Integer lev) {
+        return this.baseMapper.selectLocByLev(lev);
+    }
 }

--
Gitblit v1.9.1