From 44c51c450765e98a969f9d2a48185ffa511ef3aa Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 16 十二月 2025 12:46:15 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 2db40bd..08468a5 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")
@@ -89,7 +90,7 @@
@Override
public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
- if (curRow<nearRow){
+ 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);
@@ -107,7 +108,7 @@
// }
@Override
public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
- if (curRow<nearRow){
+ 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);
@@ -148,4 +149,14 @@
}
return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
}
+
+ @Override
+ public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
+ return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
+ }
+
+ @Override
+ public List<Integer> getLevList() {
+ return this.baseMapper.getLevList();
+ }
}
--
Gitblit v1.9.1