From c15bcd1ae396be8e5f707826253389d141e5aece Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期五, 11 七月 2025 10:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 51e79dd..ab271a0 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -110,6 +110,15 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ private Boolean pushTheEnvelopeErr = false; // 鎻愬崌涓婃瀬闄�
+
+ private Boolean raiseTheLowerLimitErr = false; // 鎻愬崌涓嬫瀬闄�
+
+ private Boolean leftProtectionTriggersErr = false; // 宸︿繚鎶よЕ鍙�
+
+ private Boolean rightProtectionTriggersErr = false; // 鍙充繚鎶よЕ鍙�
+
+ private Boolean gratingBlockingErr = false; // 鍏夋爡闃绘尅
private Short agvStartPick; //鍏佽鍙栬揣
private Short agvStartPlace; //鍏佽鏀捐揣
@@ -121,6 +130,38 @@
private List<Integer> alarm;
+ // 鑾峰彇鏁呴殰鎻忚堪
+ public String getFaultDescription(){
+ String faultDescription = "";
+ if (breakerErr) {
+ faultDescription = "鐢佃矾淇濇姢鍣ㄦ柇寮�";
+ } else if(infraredErr) {
+ faultDescription = "鍏夌數寮傚父(妫�鏌ユ墭鐩樻槸鍚﹀崱浣�)";
+ }else if(outTimeErr) {
+ faultDescription = "杩愯瓒呮椂(妫�鏌ユ墭鐩樻槸鍚﹀崱浣�)";
+ }else if(seizeSeatErr) {
+ faultDescription = "鍗犱綅瓒呮椂(妫�鏌GV鏄惁闀挎椂闂撮樆鎸″厜鐢典笖鏃犱氦浜掍俊鍙�)";
+ }else if(wrkYgoodsN) {
+ faultDescription = "鏈変换鍔℃棤璐ф晠闅�(AGV鍙栬揣绂诲紑鍚庨暱鏃堕棿娌℃湁鏀跺埌AGV绂诲紑淇″彿)";
+ }else if(inverterErr) {
+ faultDescription = "鍙橀鍣ㄦ晠闅�:";
+ }else if(contactErr) {
+ faultDescription = "鎺ヨЕ鍣ㄦ晠闅�";
+ }else if(upcontactErr) {
+ faultDescription = "椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�";
+ } else if(pushTheEnvelopeErr) {
+ faultDescription = "鎻愬崌涓婃瀬闄�";
+ } else if(raiseTheLowerLimitErr) {
+ faultDescription = "鎻愬崌涓嬫瀬闄�";
+ } else if(leftProtectionTriggersErr) {
+ faultDescription = "淇濇姢鍏夌數瑙﹀彂(妫�鏌GV鏀捐揣浣嶇疆)";
+ } else if(rightProtectionTriggersErr) {
+ faultDescription = "鍙充繚鎶よЕ鍙�";
+ } else if(gratingBlockingErr) {
+ faultDescription = "鍏夋爡闃绘尅";
+ }
+ return faultDescription;
+ }
public List<Integer> getAlarm() {
List<Integer> alarm = new ArrayList<>();
--
Gitblit v1.9.1