From 3c09a80b4d01b8ea19ec48e2852ff9092d8153c4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 18:40:14 +0800
Subject: [PATCH] #bug修复
---
src/main/java/com/zy/asrs/utils/Utils.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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..566c0d4 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;
}
}
@@ -870,4 +871,32 @@
System.out.println(groupLoc);
}
+ public static Double getIoPri(String locNo){
+ switch (Utils.getRow(locNo)){
+ case 3:
+ case 4:
+ case 11:
+ case 12:
+ case 18:
+ case 19:
+ return 21.0;
+ case 2:
+ case 5:
+ case 10:
+ case 13:
+ case 17:
+ case 20:
+ return 19.0;
+ case 1:
+ case 6:
+ case 9:
+ case 14:
+ case 16:
+ case 21:
+ return 17.0;
+ default:
+ return 15.0;
+ }
+ }
+
}
--
Gitblit v1.9.1