From 580949f09025aa71de5ecf1e56ebe4f731cf6b19 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 15:30:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 11 ++++++++++-
1 files changed, 10 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..89e086e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -269,7 +269,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