From e7dd8396e19f538e5f51ced927e2f62e1f75fa63 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 29 三月 2024 10:29:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 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..2fffdd3 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -68,25 +68,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 +104,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,6 +155,9 @@
basDevp.setWrkNo(workNo.intValue());
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
+ if (!loading){
+ basDevp.setStaErr(0);
+ }
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
@@ -152,6 +165,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