From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |  111 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 105 insertions(+), 6 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 0b56793..bc4efa2 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 @Service("locMastService")
@@ -20,7 +21,12 @@
 
     @Override
     public LocMast queryFreeLocMast(Integer row, Short locType1) {
-        return this.baseMapper.queryFreeLocMast(row, locType1);
+        return this.baseMapper.queryFreeLocMast(row, locType1,1L);
+    }
+
+    @Override
+    public LocMast queryFreeLocMast(Integer row, Short locType1,Long type) {
+        return this.baseMapper.queryFreeLocMast(row, locType1,type);
     }
 
     @Override
@@ -32,7 +38,19 @@
         if (Cools.isEmpty(sourceStock)) {
             return null;
         }
-        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
+        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), 1L);
+    }
+
+    @Override
+    public List<String> queryGroupEmptyStock(String sourceLocNo,Long type) {
+        if (Cools.isEmpty(sourceLocNo)) {
+            return null;
+        }
+        LocMast sourceStock = this.selectById(sourceLocNo);
+        if (Cools.isEmpty(sourceStock)) {
+            return null;
+        }
+        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), type);
     }
 
     @Override
@@ -40,7 +58,65 @@
         if (locMast == null) {
             return false;
         }
-        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 10;
+    }
+
+    @Override
+    public Boolean checkEmptyCount(LocMast locMast,Long type) {
+        if (locMast == null) {
+            return false;
+        }
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),type) > 1;
+    }
+
+    /*
+     *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+     * */
+//    @Override
+//    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
+//        if (curRow<nearRow){
+//            return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L);
+//        }
+//        return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L);
+//    }
+//
+//    @Override
+//    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
+//        if (curRow<nearRow){
+//            return this.baseMapper.selectLocByLocStsPakInF1(locNos,type);
+//        }
+//        return this.baseMapper.selectLocByLocStsPakInF2(locNos,type);
+//    }
+
+    @Override
+    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+        if (curRow>nearRow){
+            return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+        }
+        return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+    }
+
+    /*
+     * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+     * */
+//    @Override
+//    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
+//        if (curRow<nearRow){
+//            return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
+//        }
+//        return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
+//    }
+    @Override
+    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+        if (curRow>nearRow){
+            return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+        }
+        return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+    }
+
+    @Override
+    public List<LocMast> selectLocByLev(Integer lev) {
+        return this.baseMapper.selectLocByLev(lev);
     }
 
     @Override
@@ -49,15 +125,38 @@
     }
 
     @Override
+    public Boolean checkWhole(List<LocDetl> locDetls,Long type) {
+        return null;
+    }
+
+    @Override
     public List<LocMast> queryShallowLocFMast(Integer crnNo) {
-        return this.baseMapper.queryShallowLocFMast(crnNo);
+        return this.baseMapper.queryShallowLocFMast(crnNo,1L);
+    }
+
+    @Override
+    public List<LocMast> queryShallowLocFMast(Integer crnNo,Long type) {
+        return this.baseMapper.queryShallowLocFMast(crnNo,type);
     }
 
     @Override
     public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) {
         if (crnNo==1){
-            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev);
+            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,1L);
         }
-        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev);
+        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,1L);
+    }
+
+    @Override
+    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo,Long type) {
+        if (crnNo==1){
+            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,type);
+        }
+        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
+    }
+
+    @Override
+    public List<Integer> selectRowByCrnNo(Integer crnNo) {
+        return this.baseMapper.selectRowByCrnNo(crnNo);
     }
 }

--
Gitblit v1.9.1