From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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..1ba611f 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,27 @@
}
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 void batchUpdateArea(List<String> locNos, Short areaId) {
+ if (Cools.isEmpty(locNos)) return;
+ java.util.List<LocMast> list = new java.util.ArrayList<>();
+ for (String locNo : locNos) {
+ LocMast loc = new LocMast();
+ loc.setLocNo(locNo);
+ loc.setLocType2(areaId);
+ list.add(loc);
+ }
+ this.updateBatchById(list);
+ }
+
+ @Override
+ public List<Integer> getLevList() {
+ return this.baseMapper.getLevList();
+ }
}
--
Gitblit v1.9.1