From cdc7ddd76879ec47166b51947754ba946260267b Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 九月 2025 15:08:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs-yclk' into jxtlfwcs-yclk
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 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 358631e..f59e5ab 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -3,6 +3,8 @@
import com.zy.asrs.entity.BasDevp;
import lombok.Data;
+import java.util.List;
+
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
* Created by vincent on 2020/8/6
@@ -37,18 +39,72 @@
// 绌烘澘淇″彿
private boolean emptyMk;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
// 楂�
private boolean high;
// 浣�
private boolean low;
- // 闇�姹�1
- private boolean inreq1;
-
// 閿佸畾鏍囪
private boolean pakMk = true;
+ // 鍏ュ簱鏆傚瓨鏁�
+ private Short inQty;
+
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private boolean frontErr = false;
+
+ // 鍚庤秴闄�
+ private boolean backErr = false;
+
+ // 楂樿秴闄�
+ private boolean highErr = false;
+
+ // 宸﹁秴闄�
+ private boolean leftErr = false;
+
+ // 鍙宠秴闄�
+ private boolean rightErr = false;
+
+ // 瓒呴噸
+ private boolean weightErr = false;
+
+ // 鎵爜澶辫触
+ private boolean barcodeErr = false;
+
+ //鏁呴殰-----------------------------------------------------------------------
+ private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+
+ private Boolean infraredErr = false; //鍏夌數寮傚父
+
+ private Boolean outTimeErr = false; //杩愯瓒呮椂
+
+ private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂
+
+ private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅�
+
+ private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅�
+
+ 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;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
@@ -56,12 +112,45 @@
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(high ? (short) 2 : (short) 1);
+ basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
}
--
Gitblit v1.9.1