From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 a848f98..ce532a8 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -60,10 +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 "涓嶅湪瀹氫綅";
+
+ }
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -106,6 +126,7 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
private List<Integer> alarm;
+ private Short realTimeLocation;
public List<Integer> getAlarm(){
--
Gitblit v1.9.1