From 91cfc50d5231ffa6e1e9a86e12bd68f3efa57e50 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 09:21:09 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 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 4f5c4a4..b94df0c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -71,38 +71,51 @@
/*
*鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
* */
- @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) {
+// 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,List<String> locNos,Long type) {
- if (curRow<nearRow){
- return this.baseMapper.selectLocByLocStsPakInF1(locNos,type);
+ 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(locNos,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,List<String> locNos) {
- if (curRow<nearRow){
- return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
+ 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(locNos,1L);
+ return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
}
+
@Override
- public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
- if (curRow<nearRow){
- return this.baseMapper.selectLocByLocStsPakInO1(locNos,type);
- }
- return this.baseMapper.selectLocByLocStsPakInO2(locNos,type);
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
}
@Override
--
Gitblit v1.9.1