From 0ea5c25c84ec189aad8fdd3f412b1e6399a30612 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期日, 18 九月 2022 15:58:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index deebcfe..de5a5d2 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -190,6 +190,9 @@
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
for (int i = 0; i < shelves.group; i ++) {
+ if (i > 0) {
+ curRow = currentRow;
+ }
curRow = shelves.start(curRow);
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -269,7 +272,16 @@
if (locMast == null) {
List<Integer> rows = Utils.getGroupLoc(curRow);
- locMast = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
+ List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
+ if (!Cools.isEmpty(locMasts)) {
+ Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
+ for (LocMast one : locMasts) {
+ if (one.getRow1().equals(innermostRow)) {
+ locMast = one;
+ break;
+ }
+ }
+ }
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
--
Gitblit v1.9.1