From 7696449765db40cc251619554e68c6b7e50a13bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 01 二月 2023 09:28:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f70fdf4..eae98cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -355,13 +355,13 @@
// 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
if (Cools.isEmpty(locMast)){
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow);
+ List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow, locTypeDto.getLocType1());
int sign=curRow;
while (true){
if (locMasts.size()==0){
sign = getCurRow(sign);
if (sign != 0){
- locMasts = locMastService.queryFreeLocMastEnd(sign);
+ locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
}else {
break;
}
@@ -370,7 +370,7 @@
}
}
for (LocMast locMast1 : locMasts){
- List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
+ List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1(), locTypeDto.getLocType1());
Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
for (LocMast locMast2:locMasts1){
if (locMast2.getLocSts().equals("O")){
--
Gitblit v1.9.1