From 6d7d0dc468f6e1d2f2f46552ed12cb6db32d4f4e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 13:34:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 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 07c5584..05c53ac 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -23,8 +23,18 @@
private RowLastnoService rowLastnoService;
@Override
- public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, rows, locType1);
+ public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Integer rowsLen, Short locType1) {
+ List<LocMast> locMasts = this.baseMapper.queryFreeLocMast(row, 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;
}
@Override
@@ -81,8 +91,12 @@
}
@Override
- public void breakUp(String locNo) {
+ public synchronized void breakUp(String locNo) {
+ List<String> groupLoc = Utils.getGroupOuterLoc(locNo);
+ for (String outerLocNo : groupLoc) {
+ LocMast locMast = this.selectById(outerLocNo);
+ }
}
}
--
Gitblit v1.9.1