From d0a82572324e161d140f17321bcb716233e885ea Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 07 七月 2025 08:37:02 +0800
Subject: [PATCH] 新增称重功能
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 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 ebd4ab8..21388bb 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -50,6 +50,9 @@
// 浣�
private boolean low;
+ // 涓�
+ private boolean centre=false;
+
//agv
private boolean car;
@@ -68,25 +71,25 @@
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
- private boolean frontErr;
+ private boolean frontErr = false;
// 鍚庤秴闄�
- private boolean backErr;
+ private boolean backErr = false;
// 楂樿秴闄�
- private boolean highErr;
+ private boolean highErr = false;
// 宸﹁秴闄�
- private boolean leftErr;
+ private boolean leftErr = false;
// 鍙宠秴闄�
- private boolean rightErr;
+ private boolean rightErr = false;
// 瓒呴噸
- private boolean weightErr;
+ private boolean weightErr = false;
// 鎵爜澶辫触
- private boolean barcodeErr;
+ private boolean barcodeErr = false;
//鏁呴殰-----------------------------------------------------------------------
private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
@@ -104,6 +107,16 @@
private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
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;
@@ -145,13 +158,51 @@
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:楂樺簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+ basDevp.setLocType1(centre ? (short) 3: basDevp.getLocType1());
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+// basDevp.setAgvStartPick(agvStartPick.intValue());
+// basDevp.setAgvStartPlace(agvStartPlace.intValue());
return basDevp;
}
--
Gitblit v1.9.1