From 038634540d95d4a5787b80a1fbab131df4d99823 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 17:11:09 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
index 8a0ead1..666098b 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
@@ -32,10 +32,10 @@
// 鏈夌墿
private boolean loading;
- // 鍙叆
+ // 闇�姹傚叆
private boolean inEnable;
- // 鍙嚭
+ // 闇�姹傚嚭
private boolean outEnable;
// 绌烘澘淇″彿
@@ -49,6 +49,18 @@
// 浣�
private boolean low;
+
+ // 涓�
+ private boolean mid;
+
+ // 鍚姩鍏ュ簱
+ private boolean startup;
+
+ // 涓�斾换鍔＄敵璇�
+ private boolean segApply;
+
+ // 鍏ュ簱寮傚父
+ private boolean applyErr;
//鏉＄爜
private String barcode;
@@ -100,6 +112,43 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ // 瀹夊叏浜や簰 ------------------------------------------------------------------------
+ // ctu鎴朼gv鍐欑粰杈撻�佺嚎鐨�
+ // ctu鐢宠鏀�
+ private Boolean applyPut = false;
+
+ // ctu鐢宠鍙�
+ private Boolean applyTake = false;
+
+ // ctu鍙栧畬鎴�
+ private Boolean putComplete = false;
+
+ // ctu鏀惧畬鎴�
+ private Boolean takeComplete = false;
+
+ // 绂佹杩愯
+ private Boolean stop = false;
+
+
+ // 杈撻�佺嚎鍐欑粰ctu鎴朼gv
+ // 蹇冭烦
+ private Boolean heartbeat = false;
+
+ // 鍏佽鍙�
+ private Boolean allowTake = false;
+
+ // 鍏佽鏀�
+ private Boolean allowPut = false;
+
+ // 鎺ヨ揣瀹屾垚
+ private Boolean inComplete = false;
+
+ // 鍑鸿揣瀹屾垚
+ private Boolean outComplete = false;
+
+ private SafeSignal safeSignal;
+
+
public Boolean isErr() {
if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr) {
return true;
--
Gitblit v1.9.1