From 05674942fbe505c2aef9a0849fed2831a0a8818b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 08:46:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   13 +++++++++----
 1 files changed, 9 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 f286926..07c5584 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -23,8 +23,8 @@
     private RowLastnoService rowLastnoService;
 
     @Override
-    public LocMast queryFreeLocMast(Integer row, Short locType1) {
-        return this.baseMapper.queryFreeLocMast(row, locType1);
+    public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Short locType1) {
+        return this.baseMapper.queryFreeLocMast(row, rows, locType1);
     }
 
     @Override
@@ -53,8 +53,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.getOutermostRow(locNo, true);
     }
 
     @Override
@@ -80,4 +80,9 @@
         return null;
     }
 
+    @Override
+    public void breakUp(String locNo) {
+
+    }
+
 }

--
Gitblit v1.9.1