From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 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 fe2fd1e..6ba3fab 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,8 @@
     }
 
     @Override
-    public Boolean isOutMost(String locNo) {
-        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo);
+    public Boolean isOutMost(String locNo, Boolean pakin) {
+        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin);
     }
 
     @Override
@@ -65,11 +65,35 @@
 
     @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);
+    }
+
+    @Override
+    public List<LocMast> selectEmptyLocNos(List<String> locNos) {
+        return this.baseMapper.selectEmptyLocNos(locNos);
+    }
 }

--
Gitblit v1.9.1