From c5e8e45124d314166d229bb63a9846f8d6b9c69b Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 07 九月 2024 14:26:27 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   22 ++++++++++++++++++----
 1 files changed, 18 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 634485f..6367aaf 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,6 +1,6 @@
 package com.zy.asrs.service.impl;
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.Cools;
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.mapper.LocMastMapper;
@@ -18,16 +18,22 @@
     }
 
     @Override
-    public LocMast queryFreeLocMast(Integer row, Short locType1) {
-        return this.baseMapper.queryFreeLocMast(row, locType1);
+    public LocMast queryFreeLocMast(Integer row, Short locType1, Short locType2) {
+        return this.baseMapper.queryFreeLocMast(row, null, locType1, locType2);
     }
+
+    @Override
+    public LocMast queryFreeLocMast(Integer row, Integer bay, Short locType1, Short locType2) {
+        return this.baseMapper.queryFreeLocMast(row, bay, locType1, locType2);
+    }
+
 
     @Override
     public List<String> queryGroupEmptyStock(String sourceLocNo) {
         if (Cools.isEmpty(sourceLocNo)) {
             return null;
         }
-        LocMast sourceStock = this.selectById(sourceLocNo);
+        LocMast sourceStock = this.baseMapper.selectById(sourceLocNo);
         if (Cools.isEmpty(sourceStock)) {
             return null;
         }
@@ -44,4 +50,12 @@
         return this.baseMapper.queryDemoLoc(crn);
     }
 
+    @Override
+    public Boolean checkEmptyCount(LocMast locMast) {
+        if (locMast == null) {
+            return false;
+        }
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+    }
+
 }

--
Gitblit v1.9.1