From 771881b3f58148600c16fb168a47d769fce5588b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 九月 2022 08:56:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 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 740034a..15d1175 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -27,18 +27,8 @@
private WorkService workService;
@Override
- public LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
- List<LocMast> locMasts = this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
- if (Cools.isEmpty(locMasts)) {
- return null;
- }
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast locMast : locMasts) {
- if (locMast.getRow1().equals(innermostRow)) {
- return locMast;
- }
- }
- return null;
+ public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
+ return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
}
@Override
@@ -95,13 +85,13 @@
}
@Override
- public synchronized void breakUp(String locNo) {
+ public synchronized void breakUp(String locNo, List<String> excludeLocNos) {
List<String> groupLoc = Utils.getGroupOuterLoc(locNo);
Iterator<String> iterator = groupLoc.iterator();
while (iterator.hasNext()) {
String next = iterator.next();
LocMast locMast = this.selectById(next);
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || !excludeLocNos.contains(locMast.getLocNo())) {
continue;
}
iterator.remove();
--
Gitblit v1.9.1