From 193c3204f7f998df4d603df202dbea88a3074585 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 九月 2025 09:03:39 +0800
Subject: [PATCH] #入库逻辑变更
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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..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")
@@ -57,7 +58,7 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 10;
}
@Override
@@ -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,10 +108,15 @@
// }
@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);
+ }
+
+ @Override
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
}
@Override
@@ -148,4 +154,9 @@
}
return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
}
+
+ @Override
+ public List<Integer> selectRowByCrnNo(Integer crnNo) {
+ return this.baseMapper.selectRowByCrnNo(crnNo);
+ }
}
--
Gitblit v1.9.1