From d2314059892561c4d9f89264db43cf92d741eb42 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 26 六月 2025 15:05:08 +0800
Subject: [PATCH] 完善待测
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 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 d804f6e..7a33f08 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -13,6 +13,8 @@
@Data
public class CrnProtocol {
+ private Integer crnNo;
+
/**
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
@@ -21,6 +23,10 @@
public Short mode;
public CrnModeType modeType;
+
+ private String Barcode;
+
+ private boolean BarcodeResult;
/**
* 1 = 鎬ュ仠
@@ -94,21 +100,11 @@
public Short walkPos;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
-
- /**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
- /**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
- */
- private Short alarm1;
-
- private boolean[] temp1;
+ private Short temp1;
private CrnTemp1 crnTemp1;
@@ -235,21 +231,12 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
- public void setTemp1(boolean[] temp1) {
+ public Short getTemp1() {
+ return temp1;
+ }
+
+ public void setTemp1(Short temp1) {
this.temp1 = temp1;
- this.crnTemp1 = new CrnTemp1();
- this.crnTemp1.liftLimitSwitchErr = temp1[0];
- this.crnTemp1.liftBrakeErr = temp1[1];
- this.crnTemp1.liftDiastimeterFau = temp1[2];
- this.crnTemp1.stop = temp1[3];
- this.crnTemp1.warn = temp1[4];
- this.crnTemp1.overHighErr = temp1[5];
- this.crnTemp1.leftOverWidthErr = temp1[6];
- this.crnTemp1.rightOverWidthErr = temp1[7];
- this.crnTemp1.leftOverLenErr = temp1[8];
- this.crnTemp1.rightOverLenErr = temp1[9];
- this.crnTemp1.pakinThenLoadedErr = temp1[10];
- this.crnTemp1.pakOutThenNoneErr = temp1[11];
}
/**
@@ -267,4 +254,33 @@
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
}
+
+ public void setxSpeed(Short xSpeed) {
+ this.xSpeed = Float.valueOf(xSpeed);
+ }
+
+ public void setySpeed(Short ySpeed) {
+ this.ySpeed = Float.valueOf(ySpeed);
+ }
+
+ public void setzSpeed(Short zSpeed) {
+ this.zSpeed = Float.valueOf(zSpeed);
+ }
+
+ public void setxDistance(Short xDistance) {
+ this.xDistance = Float.valueOf(xDistance);
+ }
+
+ public void setyDistance(Short yDistance) {
+ this.yDistance = Float.valueOf(yDistance);
+ }
+
+ public void setxDuration(Short xDuration) {
+ this.xDuration = Float.valueOf(xDuration);
+ }
+
+ public void setyDuration(Short yDuration) {
+ this.yDuration = Float.valueOf(yDuration);
+ }
+
}
--
Gitblit v1.9.1