From e9efb50ea62a9ad58e652446c6528f1b49fcc39a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 01 五月 2025 10:58:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 2fffdd3..4182f70 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -155,8 +155,40 @@
basDevp.setWrkNo(workNo.intValue());
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
- if (!loading){
- basDevp.setStaErr(0);
+ 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");
@@ -165,8 +197,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());
+// basDevp.setAgvStartPick(agvStartPick.intValue());
+// basDevp.setAgvStartPlace(agvStartPlace.intValue());
return basDevp;
}
--
Gitblit v1.9.1