From 1b160b340bd6fe5f34cedbd01c80b9530d530d91 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 五月 2025 18:58:46 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 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 a848f98..5f6ad0b 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -62,6 +62,9 @@
// 闅斿绔欑偣锛堝彴杞︿綅缃級
private String nearbySta;
+ //鍏佽绌烘墭鍑哄簱
+ private String allowEmptyOut;
+
//鎸囦护ID
private Integer commandId;
@@ -105,7 +108,19 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+
+ private Short agvStartPick; //鍏佽鍙栬揣
+ private Short agvStartPlace; //鍏佽鏀捐揣
+ private Short agvTypeSign; //鍏佽鏀捐揣
+
+ private Short agvTargetPick; //鍙栬揣瀹屾垚
+ private Short agvTargetPlace; //鏀捐揣瀹屾垚
+ private Short agvTypeSignEnd; //鏀捐揣瀹屾垚
+
private List<Integer> alarm;
+
+
public List<Integer> getAlarm(){
@@ -145,6 +160,41 @@
basDevp.setWrkNo(workNo.intValue());
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
+ if (frontErr){
+ basDevp.setStaErr(11);
+ }else if (backErr){
+ basDevp.setStaErr(12);
+ }else if (highErr){
+ basDevp.setStaErr(13);
+ }else if (leftErr){
+ basDevp.setStaErr(14);
+ }else if (rightErr){
+ basDevp.setStaErr(15);
+ }else if (weightErr){
+ basDevp.setStaErr(16);
+ }else if (barcodeErr){
+ basDevp.setStaErr(17);
+ }else if (breakerErr){
+ basDevp.setStaErr(18);
+ }else if (infraredErr){
+ basDevp.setStaErr(19);
+ }else if (outTimeErr){
+ basDevp.setStaErr(110);
+ }else if (seizeSeatErr){
+ basDevp.setStaErr(111);
+ }else if (wrkYgoodsN){
+ basDevp.setStaErr(112);
+ }else if (inverterErr){
+ basDevp.setStaErr(113);
+ }else if (contactErr){
+ basDevp.setStaErr(114);
+ }else if (upcontactErr){
+ basDevp.setStaErr(115);
+ }else {
+ if (!loading){
+ basDevp.setStaErr(0);
+ }
+ }
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
@@ -152,6 +202,8 @@
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+// basDevp.setAgvStartPick(agvStartPick.intValue());
+// basDevp.setAgvStartPlace(agvStartPlace.intValue());
return basDevp;
}
--
Gitblit v1.9.1