From ccc39836716ba323c946cddc78a62049731ebb46 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:43:33 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 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 7a1e77c..01a2ff5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -13,9 +13,19 @@
 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) {
+        return this.baseMapper.queryFreeLocMast(row, locType1);
+    }
+    @Override
+    public LocMast queryFreeLocMast2(Integer row, Short locType1,Integer bay) {
+        return this.baseMapper.queryFreeLocMast2(row, locType1,bay);
+    }
+
 
     @Override
     public List<String> queryGroupEmptyStock(String sourceLocNo) {
@@ -35,8 +45,16 @@
     }
 
     @Override
-    public LocMast queryDemoLoc(Integer crn) {
-        return this.baseMapper.queryDemoLoc(crn);
+    public LocMast queryDemoLoc(Integer crn,short locType1) {
+        return this.baseMapper.queryDemoLoc(crn,locType1);
+    }
+
+    @Override
+    public Boolean checkEmptyCount(LocMast locMast) {
+        if (locMast == null) {
+            return false;
+        }
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
     }
 
 }

--
Gitblit v1.9.1