From 22094a20a803866201e0b2dd7ff7c266871ffe52 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 10:18:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 1d3265e..ee64cc1 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -33,16 +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;
- } else if (packStatus == 5){
- return LOC_STAY;
- } else if (packStatus == 6){
- return LOC_STAY_OVER;
+ return LOC_TESTING; //娴嬭瘯涓�
+ } else if (packStatus == 3){
+ return LOC_STAY; //OK
+ } else if (packStatus == 4){
+ return LOC_STAY_OVER; //NG
}else {
- return LOC_EMPTY;
+ return LOC_EMPTY; //
}
} else if (locSts.equals("O") || locSts.equals("S")){
return LOC_EMPTY;
--
Gitblit v1.9.1