From c569dd28e84788cf26ec86371e5e13f007779845 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 十一月 2022 14:40:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 fd417b0..c139b03 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -32,6 +32,11 @@
     }
 
     @Override
+    public LocMast queryFreeLocMast0(Integer row, Short locType1) {
+        return this.baseMapper.queryFreeLocMast0(row, locType1);
+    }
+
+    @Override
     public List<String> queryGroupEmptyStock(String sourceLocNo) {
         if (Cools.isEmpty(sourceLocNo)) {
             return null;
@@ -48,7 +53,7 @@
         if (locMast == null) {
             return false;
         }
-        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+        return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > 1;
     }
 
     @Override
@@ -77,8 +82,8 @@
         } else {
             throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
         }
-
-        for (int i = 0; i<locNos.size(); i++) {
+        // 鍏ュ簱澶栧眰搴撲綅婊炵┖
+        for (int i = 0; i<locNos.size() - 1; i++) {
             LocMast locMast = this.selectById(locNos.get(i));
             if (locMast.getLocSts().equals("O")) {
                 if (i == 0) {

--
Gitblit v1.9.1