From 056cf9d0311e1345017ab4c52c5946144fb4ccb8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 十月 2024 15:03:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
index 849368e..ccf96a7 100644
--- a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -1,6 +1,8 @@
package com.zy.asrs.domain.enums;
+import com.zy.core.enums.DevpType.DevpStateType;
+import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.model.protocol.StaProtocol;
/**
@@ -25,21 +27,21 @@
if (staProtocol == null) {
return null;
}
-// if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0) {
-// return SITE_AUTO_RUN_ID;
-// }
-// if (staProtocol.isAutoing() && staProtocol.isLoading()) {
-// return SITE_AUTO_RUN;
-// }
-// if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0) {
-// return SITE_AUTO_ID;
-// }
-// if (staProtocol.isAutoing()) {
-// return SITE_AUTO;
-// }
-// if (!staProtocol.isAutoing()) {
-// return SITE_UNAUTO;
-// }
+ if (staProtocol.stateType == DevpStateType.AUTO && staProtocol.workType == DevpWorkType.BUSY && staProtocol.getWorkNo() > 0) {
+ return SITE_AUTO_RUN_ID;
+ }
+ if (staProtocol.stateType == DevpStateType.AUTO && staProtocol.workType == DevpWorkType.BUSY) {
+ return SITE_AUTO_RUN;
+ }
+ if (staProtocol.stateType == DevpStateType.AUTO && staProtocol.getWorkNo() > 0) {
+ return SITE_AUTO_ID;
+ }
+ if (staProtocol.stateType == DevpStateType.AUTO) {
+ return SITE_AUTO;
+ }
+ if (staProtocol.stateType != DevpStateType.AUTO) {
+ return SITE_UNAUTO;
+ }
return null;
}
--
Gitblit v1.9.1