From 0a37b816117828dfc216d00c17724900f4bb14e3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 四月 2026 14:29:23 +0800
Subject: [PATCH] 123

---
 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java |   84 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 81 insertions(+), 3 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 6510156..b6b129f 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
@@ -3,12 +3,16 @@
 import com.zy.acs.conveyor.entity.Devp;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
  * Created by vincent on 2020/8/6
  */
 @Data
-public class StaProtocol implements Cloneable {
+public class StaProtocol implements Cloneable, Serializable {
+
+    private boolean startUpFlag = true;
 
     private Integer plcId;
 
@@ -30,10 +34,10 @@
     // 鏈夌墿
     private boolean loading;
 
-    // 鍙叆
+    // 闇�姹傚叆
     private boolean inEnable;
 
-    // 鍙嚭
+    // 闇�姹傚嚭
     private boolean outEnable;
 
     // 绌烘澘淇″彿
@@ -47,6 +51,18 @@
 
     // 浣�
     private boolean low;
+
+    // 涓�
+    private boolean mid;
+
+    // 鍚姩鍏ュ簱
+    private boolean startup;
+
+    // 涓�斾换鍔＄敵璇�
+    private boolean segApply;
+
+    // 鍏ュ簱寮傚父
+    private boolean applyErr;
 
     //鏉＄爜
     private String barcode;
@@ -78,6 +94,9 @@
     // 鎵爜澶辫触
     private boolean barcodeErr = false;
 
+    // 鏈夎揣鎶ヨ锛岀┖鎵樺叆搴撴椂妫�娴嬫墭鐩樹笂鏈夋棤璐х墿
+    private boolean loadErr = false;
+
     //鏁呴殰-----------------------------------------------------------------------
     private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
 
@@ -94,6 +113,43 @@
     private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
 
     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) {
@@ -126,4 +182,26 @@
         return null;
     }
 
+
+    public String getLocTypeStr() {
+        if (high) {
+            return "楂�";
+        }
+        if (low) {
+            return "浣�";
+        }
+        if (mid) {
+            return "涓�";
+        }
+        return "-";
+    }
+
+    public String getTaskData() {
+        return "鏈珯鐐�:" + siteId + "浠诲姟鍙凤細" + workNo + "鐩爣绔欑偣锛�" + staNo;
+    }
+
+    public String getSafeSignalData() {
+        return "鏈珯鐐�:" + siteId + "搴忓彿锛�" + safeSignal.getIndex() + "鍊硷細" + safeSignal.getValue() + "鏍囧織浣嶏細" + safeSignal.getFlag();
+    }
+
 }

--
Gitblit v1.9.1