From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 104 ++++++++++++++++++++++-----------------------------
1 files changed, 45 insertions(+), 59 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 761a91a..6e22c96 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -54,6 +54,8 @@
*/
public Short status;
+ public Short alarm = 0;
+
/**
* 鐘舵�佹灇涓�
*/
@@ -185,25 +187,25 @@
* 1 = 璐у弶鍦ㄥ乏渚�
* 2 = 璐у弶鍦ㄥ彸渚�
*/
- public Short forkPos;
+ public Short forkPos = -1;
- public CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType = CrnForkPosType.NONE;
/**
* 褰撳墠杞借揣鍙颁綅缃�
* 0 = 涓嬪畾浣�
* 1 = 涓婂畾浣�
*/
- public Short liftPos;
+ public Short liftPos = -1;
- public CrnLiftPosType liftPosType;
+ public CrnLiftPosType liftPosType = CrnLiftPosType.ERROR;
/**
* 璧拌鍦ㄥ畾浣�
* 0 = 鍦ㄥ畾浣�
* 1 = 涓嶅湪瀹氫綅
*/
- public Short walkPos;
+ public Short walkPos = 0;
/**
* 鎷ㄦ寚浣嶇疆
@@ -219,89 +221,81 @@
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Float xDistance = 0F;
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
+ */
+ public Float yDistance = 0F;
+ ;
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Float xDuration = 0F;
+ ;
+ /**w
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Float yDuration = 0F;
+ ;
/**
* 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm1;
-
+ private Integer alarm1 = 0;
/**
* 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm2;
-
+ private Integer alarm2 = 0;
/**
* 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm3;
-
+ private Integer alarm3 = 0;
/**
* 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm4;
-
+ private Integer alarm4 = 0;
/**
* 寮傚父1
*/
private boolean[] error1;
-
private CrnError1 crnError1;
-
/**
* 寮傚父2
*/
private boolean[] error2;
-
private CrnError2 crnError2;
-
/**
* 寮傚父3
*/
private boolean[] error3;
-
private CrnError3 crnError3;
-
/**
* 寮傚父4
*/
private boolean[] error4;
-
private CrnError4 crnError4;
-
/**
* X琛岃蛋绾块�熷害m/min
*/
- private Float xSpeed;
-
+ private Float xSpeed = 0F;
/**
* Y琛岃蛋绾块�熷害m/min
*/
- private Float ySpeed;
-
+ private Float ySpeed = 0F;
/**
* Z琛岃蛋绾块�熷害m/min
*/
- private Float zSpeed;
-
+ private Float zSpeed = 0F;
+ //鎸囦护ID
+ private Integer commandId;
/**
- * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
*/
- public Float xDistance;
-
- /**
- * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
- */
- public Float yDistance;
-
- /**
- * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
- */
- public Float xDuration;
-
- /**
- * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
- */
- public Float yDuration;
+ private String lastIo = "I";
public void setMode(Short mode) {
this.mode = mode;
@@ -333,12 +327,12 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
- public void setStatus(Short status){
+ public void setStatus(Short status) {
this.status = status;
this.statusType = CrnStatusType.get(status);
}
- public void setStatus(CrnStatusType type){
+ public void setStatus(CrnStatusType type) {
this.statusType = type;
this.status = CrnStatusType.get(type).id.shortValue();
}
@@ -348,7 +342,7 @@
this.fingerPosType = CrnFingerPosType.get(type);
}
- public void setError1(boolean[] error1){
+ public void setError1(boolean[] error1) {
this.error1 = error1;
this.crnError1 = new CrnError1();
this.crnError1.remoteStop = error1[0];
@@ -369,7 +363,7 @@
this.crnError1.leftOverWidthErr2 = error1[15];
}
- public void setError2(boolean[] error2){
+ public void setError2(boolean[] error2) {
this.error2 = error2;
this.crnError2 = new CrnError2();
this.crnError2.leftOverLenErr1 = error2[0];
@@ -420,16 +414,8 @@
this.crnError4.zLooseBrakeTimeout = error4[3];
}
- /**
- * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
- * I:鍏ュ簱
- * O:鍑哄簱
- */
- private String lastIo = "I";
-
-
- public BasCrnp toSqlModel(BasCrnp basCrnp){
- basCrnp.setCrnErr(alarm1.longValue());
+ public BasCrnp toSqlModel(BasCrnp basCrnp) {
+ basCrnp.setCrnErr(alarm.longValue());
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
}
--
Gitblit v1.9.1