From 0a58dc2ed7c8349efc4e7dd0b45d8c6ab7e6f9df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 三月 2021 11:07:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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 260df2a..4e34f77 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
-import com.core.exception.CoolException;
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.LocMastService;
@@ -19,18 +18,18 @@
     private RowLastnoService rowLastnoService;
 
     @Override
-    public LocMast queryFreeLocMast(Integer row) {
-        return this.baseMapper.queryFreeLocMast(row);
+    public LocMast queryFreeLocMast(Integer row, Short locType1) {
+        return this.baseMapper.queryFreeLocMast(row, locType1);
     }
 
     @Override
     public List<String> queryGroupEmptyStock(String sourceLocNo) {
         if (Cools.isEmpty(sourceLocNo)) {
-            throw new CoolException("婧愬簱浣嶄笉鑳戒负绌�");
+            return null;
         }
         LocMast sourceStock = this.selectById(sourceLocNo);
         if (Cools.isEmpty(sourceStock)) {
-            throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+            return null;
         }
         return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
     }

--
Gitblit v1.9.1