From 9594129ba3c8adbf0c3c8852f9ff5cbbf172b681 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 二月 2023 11:17:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 64 +++++++++++---------------------
1 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 423aee2..da2d0cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -178,9 +178,12 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ crnNo = locMast0.getCrnNo();
+ locMast = locMast0;
+ break;
+ }
}
}
}
@@ -200,9 +203,12 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ crnNo = locMast0.getCrnNo();
+ locMast = locMast0;
+ break;
+ }
}
}
}
@@ -224,9 +230,12 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
- locMast = locMast0;
- break;
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ crnNo = locMast0.getCrnNo();
+ locMast = locMast0;
+ break;
+ }
}
}
}
@@ -381,6 +390,10 @@
success = false; break;
}
}
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (!locMastService.checkEmptyCount(loc, 10)) {
+ success = false;
+ }
if (success) {
locMast = loc;
break;
@@ -389,39 +402,6 @@
sign = getCurRow(sign);
}
}
-
-
-// if (Cools.isEmpty(locMast)){
-// 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, locTypeDto.getLocType1());
-// }else {
-// break;
-// }
-// }else {
-// break;
-// }
-// }
-// for (LocMast locMast1 : locMasts){
-// 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")){
-// locMast = locMast2;
-// break;
-// }else if (!locMast2.getLocSts().equals("F")){
-// break;
-// }
-// }
-// if (!Cools.isEmpty(locMast)){
-// break;
-// }
-// }
-// }
// 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
--
Gitblit v1.9.1