From 32efe67e5c2ce1419d91717232f5b881b1828bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 07 六月 2024 09:30:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 a7a3460..6d724a0 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -60,13 +60,30 @@
private Short inQty;
// 闅斿绔欑偣锛堝彴杞︿綅缃級
- private String nearbySta;
+ private short nearbySta;
//鎸囦护ID
private Integer commandId;
//鏉＄爜
private String barcode = null;
+
+ private boolean place1 = false;
+ private boolean place2 = false;
+
+ public String getPlace(){
+ if (place1 && place2){
+ return "鍒颁綅淇″彿寮傚父";
+ }
+ if (place1){
+ return "涓�妤煎埌浣�";
+ }
+ if (place2){
+ return "浜屾ゼ鍒颁綅";
+ }
+ return "涓嶅湪瀹氫綅";
+
+ }
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -92,7 +109,7 @@
private boolean barcodeErr = false;
//鏁呴殰-----------------------------------------------------------------------
- private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+ private Boolean breakerErr = true; //鏂矾鍣ㄦ晠闅�
private Boolean infraredErr = false; //鍏夌數寮傚父
@@ -109,6 +126,7 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
private List<Integer> alarm;
+ private Short realTimeLocation;
public List<Integer> getAlarm(){
--
Gitblit v1.9.1