From ce641926a957d238b202aa0d9dac3b8f15aff153 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 14 五月 2025 14:43:00 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 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 e1a01ea..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;
@@ -13,19 +13,49 @@
 public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
 
     @Override
-    public LocMast queryFreeLocMast(Integer row) {
-        return this.baseMapper.queryFreeLocMast(row);
+    public List<Integer> queryDistinctRow(Integer crnNo) {
+        return this.baseMapper.queryDistinctRow(crnNo);
     }
+
+    @Override
+    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;
         }
         return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
     }
+
+    @Override
+    public LocMast queryDemoSourceLoc(Integer crn) {
+        return this.baseMapper.queryDemoSourceLoc(crn);
+    }
+
+    @Override
+    public LocMast queryDemoLoc(Integer crn) {
+        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