From a3d44470b704e81d4f66399bed2f37529ddb31be Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 25 十二月 2025 13:53:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 43d6ec0..11012ad 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -6,9 +6,8 @@
import com.zy.core.enums.CrnStatusType;
import lombok.Data;
-/**
- * Created by vincent on 2020/8/7
- */
+import java.util.Map;
+
@Data
public class CrnProtocol {
@@ -22,11 +21,6 @@
public Integer mode;
public CrnModeType modeType;
-
- /**
- * 1 = 鎬ュ仠
- */
- public Integer eStop;
/**
* 寮傚父鐮�
@@ -110,37 +104,37 @@
/**
* X琛岃蛋绾块�熷害m/min
*/
- private Float xSpeed;
+ private Integer xSpeed;
/**
* Y琛岃蛋绾块�熷害m/min
*/
- private Float ySpeed;
+ private Integer ySpeed;
/**
* Z琛岃蛋绾块�熷害m/min
*/
- private Float zSpeed;
+ private Integer zSpeed;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
- public Float xDistance;
+ public Integer xDistance;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
- public Float yDistance;
+ public Integer yDistance;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
- public Float xDuration;
+ public Integer xDuration;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
- public Float yDuration;
+ public Integer yDuration;
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
@@ -155,6 +149,16 @@
private Integer crnLane = 1;
/**
+ * 绉伴噸鏁版嵁
+ */
+ private Double weight;
+
+ /**
+ * 鏉＄爜鏁版嵁
+ */
+ private String barcode;
+
+ /**
* 鏃ュ織閲囬泦鏃堕棿
*/
private Long deviceDataLog = System.currentTimeMillis();
@@ -164,6 +168,11 @@
*/
private Long lastCommandTime = System.currentTimeMillis();
+ /**
+ * 鎵╁睍鏁版嵁
+ */
+ private Map<String, Object> extend;
+
public void setMode(Integer mode) {
this.mode = mode;
this.modeType = CrnModeType.get(mode);
--
Gitblit v1.9.1