From cb7cb55b59f8dc51e06f2af5fe3ccaa117e9b615 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:35:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 249584e..eae98cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -314,7 +314,7 @@
if (locMast == null) {
// 搴撳尯閿佸畾
- LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null);
+ LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
if (!Cools.isEmpty(locRule)) {
List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
@@ -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,14 +370,12 @@
}
}
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")){
- if (locMast2.getRow1().equals(innermostRow)) {
- locMast = locMast2;
- break;
- }
+ locMast = locMast2;
+ break;
}else if (!locMast2.getLocSts().equals("F")){
break;
}
--
Gitblit v1.9.1