From 3a17d3917e467fe37454e757edcedd962b907b45 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 二月 2023 08:43:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 8482b74..c19181d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -30,6 +30,24 @@
public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
}
+ @Override
+ public List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
+ return this.baseMapper.queryFreeLocMast0(rows, rowsLen, locType1,inoutEveryday);
+ }
+
+ @Override
+ public List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1, Boolean inoutEveryday, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
+ return this.baseMapper.queryFreeLocMast1(rows, rowsLen, locType1,inoutEveryday, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
+ }
+
+ @Override
+ public List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1){
+ return this.baseMapper.queryFreeLocMastEnd(row, locType1);
+ }
+ @Override
+ public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1){
+ return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row, locType1);
+ }
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
@@ -111,10 +129,19 @@
// ) {
// locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
// }
- for (String locNo : locNos) {
- LocMast locMast = this.selectById(locNo);
+ for (int i = 0; i<locNos.size(); i++) {
+ LocMast locMast = this.selectById(locNos.get(i));
if (locMast.getLocSts().equals("O")) {
- return locMast;
+ if (i == 0) {
+ return locMast;
+ } else {
+ LocMast lastLoc = this.selectById(locNos.get(i - 1));
+ if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D") || lastLoc.getLocSts().equals("X")) {
+ return locMast;
+ } else {
+ break;
+ }
+ }
}
}
return null;
@@ -127,12 +154,19 @@
while (iterator.hasNext()) {
String next = iterator.next();
LocMast locMast = this.selectById(next);
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || excludeLocNos.contains(locMast.getLocNo())) {
- continue;
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
+ if (!excludeLocNos.contains(locMast.getLocNo())) {
+ continue;
+ }
}
iterator.remove();
}
workService.shuttleTransfer(groupLoc);
}
+ @Override
+ public void updateLocSts(String locNo, String locSts) {
+ this.baseMapper.updateLocSts(locNo,locSts);
+ }
+
}
--
Gitblit v1.9.1