From e86c84f673a552f351c6847a5f432910cb927082 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 14:06:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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 d648afc..740034a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,12 +7,14 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Comparator;
+import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
@@ -21,10 +23,22 @@
@Autowired
private RowLastnoService rowLastnoService;
+ @Autowired
+ private WorkService workService;
@Override
- public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, rows, locType1);
+ 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;
}
@Override
@@ -80,4 +94,19 @@
return null;
}
+ @Override
+ public synchronized void breakUp(String locNo) {
+ 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")) {
+ continue;
+ }
+ iterator.remove();
+ }
+ workService.shuttleTransfer(groupLoc);
+ }
+
}
--
Gitblit v1.9.1