From a9e8a91fd4c8c504d7df9ef921f32d832390e77d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 13:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
index 3b7b9ed..905bc95 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -33,14 +33,16 @@
if(fireStatus == 1){
return LOC_ERROR;
} else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
- if (packStatus == 1){
- return LOC_WAIT_TESTINT;
+ if (packStatus == 1 && locSts.equals("F")){
+ return LOC_WAIT_TESTINT;//寰呮祴
} else if (packStatus == 2){
- return LOC_TESTING;
+ return LOC_TESTING; //娴嬭瘯涓�
} else if (packStatus == 3){
- return LOC_STAY;
+ return LOC_STAY; //OK
} else if (packStatus == 4){
- return LOC_STAY_OVER;
+ return LOC_STAY_OVER; //NG
+ }else {
+ return LOC_EMPTY; //
}
} else if (locSts.equals("O") || locSts.equals("S")){
return LOC_EMPTY;
--
Gitblit v1.9.1