From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 50 ++++++++++----------------------------------------
1 files changed, 10 insertions(+), 40 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 a848f98..8883efe 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,11 +1,7 @@
package com.zy.core.model.protocol;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
@@ -19,7 +15,7 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Short workNo = 0;
+ private Integer workNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
@@ -45,13 +41,10 @@
private boolean fullPlt;
// 楂�
- private boolean high = false;
+ private boolean high;
// 浣�
private boolean low;
-
- //agv
- private boolean car;
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -61,6 +54,9 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
+
+ //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+ private Integer stamp = 0;
//鎸囦护ID
private Integer commandId;
@@ -105,39 +101,13 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
- private List<Integer> alarm;
-
-
- public List<Integer> getAlarm(){
- List<Integer> alarm = new ArrayList<>();
- if (breakerErr){
- alarm.add(1);
+ public Boolean isErr(){
+ if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
+ return true;
+ }else {
+ return false;
}
- if (infraredErr){
- alarm.add(2);
- }
- if (outTimeErr){
- alarm.add(3);
- }
- if (seizeSeatErr){
- alarm.add(4);
- }
- if (wrkYgoodsN){
- alarm.add(5);
- }
- if (inverterErr){
- alarm.add(6);
- }
- if (contactErr){
- alarm.add(7);
- }
- if (upcontactErr){
- alarm.add(8);
- }
- return alarm;
}
-
-
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
--
Gitblit v1.9.1