From e3c9aa6bbf449ec27cd5f037045418d355d0580e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 14:35:21 +0800
Subject: [PATCH] #bug修复
---
src/main/java/com/zy/asrs/utils/Utils.java | 7 ++++---
src/main/java/com/zy/common/service/CommonService.java | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 34f89db..6d3f5ca 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -800,10 +800,10 @@
}
/**
- * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丱
* 杩斿洖true琛ㄧず鍐呬晶搴撲綅涓嶆槸DFX锛岃繑鍥瀎alse琛ㄧず鍐呬晶搴撲綅鏄疍FX
*/
- public static boolean checkInsideLocIsDFX2(String locNo) {
+ public static boolean checkInsideLocIsDFXO(String locNo) {
LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
List<String> insideLoc = Utils.getGroupInsideLoc(locNo);
if (insideLoc.size() > 0) {
@@ -811,8 +811,9 @@
for (LocMast mast : insideLocMast) {
if (!mast.getLocSts().equals("D")
&& !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("O")
&& !mast.getLocSts().equals("X")) {
- //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+ //D銆丗銆乆銆丱(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
return true;
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 62637a9..73c18da 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -392,9 +392,9 @@
//鎵炬渶澶栦晶绌哄簱浣�
List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), randomCrnNos);
for (LocMast locMast0 : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
- //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丱
+ if (Utils.checkInsideLocIsDFXO(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆丱銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
@@ -423,7 +423,7 @@
List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1(), randomCrnNo);
for (LocMast locMast0 : locMasts) {
//妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX2(locMast0.getLocNo())) {
+ if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
--
Gitblit v1.9.1