From 7d25794f31a059ea2bdbf0548c294ea2d671d1f4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 三月 2024 14:36:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   87 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 8 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 f6bde14..2fffdd3 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -4,6 +4,9 @@
 import com.zy.asrs.entity.CommandInfo;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
  * Created by vincent on 2020/8/6
@@ -42,10 +45,13 @@
     private boolean fullPlt;
 
     // 楂�
-    private boolean high;
+    private boolean high = false;
 
     // 浣�
     private boolean low;
+
+    //agv
+    private boolean car;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
@@ -62,25 +68,85 @@
     // 澶栧舰妫�娴� ------------------------------------------------------------------------
 
     // 鍓嶈秴闄�
-    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; //鏂矾鍣ㄦ晠闅�
+
+    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 List<Integer> getAlarm(){
+        List<Integer> alarm = new ArrayList<>();
+        if (breakerErr){
+            alarm.add(1);
+        }
+        if (infraredErr){
+            alarm.add(2);
+        }
+        if (outTimeErr){
+            alarm.add(3);
+        }
+        if (seizeSeatErr){
+            alarm.add(4);
+        }
+        if (wrkYgoodsN){
+            alarm.add(5);
+        }
+        if (inverterErr){
+            alarm.add(6);
+        }
+        if (contactErr){
+            alarm.add(7);
+        }
+        if (upcontactErr){
+            alarm.add(8);
+        }
+        return alarm;
+    }
+
 
 
     public BasDevp toSqlModel(){
@@ -89,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:楂樺簱浣峿
@@ -96,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