From d9eeceed86c1ce43c73dda00a108595a078a8f3d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:44:53 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 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 fe3c612..3ac882a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -4,9 +4,11 @@
 import com.core.common.Cools;
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.ErrorDeviceParam;
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +23,21 @@
     @Override
     public LocMast queryFreeLocMast(Integer row, Short locType1) {
         return this.baseMapper.queryFreeLocMast(row, locType1);
+    }
+
+    @Override
+    public List<LocMast> asrLocMastNotInDetl1() {
+        return this.baseMapper.asrLocMastNotInDetl1();
+    }
+
+    @Override
+    public List<LocMast>  asrLocMastNotInDetl2() {
+        return this.baseMapper.asrLocMastNotInDetl2();
+    }
+
+    @Override
+    public List<ErrorDeviceParam>  adjacentLocMast() {
+        return this.baseMapper.adjacentLocMast();
     }
 
     @Override
@@ -43,9 +60,35 @@
         return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
     }
 
+    /*
+    *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+    * */
+    @Override
+    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
+        if (curRow<nearRow){
+            return this.baseMapper.selectLocByLocStsPakInF1(locNos);
+        }
+        return this.baseMapper.selectLocByLocStsPakInF2(locNos);
+    }
+
+    /*
+    * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+    * */
+    @Override
+    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
+        if (curRow<nearRow){
+            return this.baseMapper.selectLocByLocStsPakInO1(locNos);
+        }
+        return this.baseMapper.selectLocByLocStsPakInO2(locNos);
+    }
+
     @Override
     public Boolean checkWhole(List<LocDetl> locDetls) {
         return null;
     }
 
+    @Override
+    public List<LocMast> queryShallowLocFMast(Integer crnNo) {
+        return this.baseMapper.queryShallowLocFMast(crnNo);
+    }
 }

--
Gitblit v1.9.1