From 922a5f471a735a0ea231d30e45312f61d583e58d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期日, 01 九月 2024 16:12:49 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 182 ++++++++++++++++++++++++++++++++------------
1 files changed, 131 insertions(+), 51 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 13c51ed..ec27ebb 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,5 +1,6 @@
package com.zy.core.model.protocol;
+import com.zy.asrs.entity.BasCrnp;
import com.zy.core.enums.CrnForkPosType;
import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;
@@ -11,6 +12,8 @@
*/
@Data
public class CrnProtocol {
+
+ private Integer crnNo;
/**
* 1 = 鎵嬪姩妯″紡
@@ -37,6 +40,11 @@
public Short taskNo = 0;
/**
+ * 浠诲姟鍙�
+ */
+ public Short taskNoTwo = 0;
+
+ /**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
* 0锛氱┖闂诧紝鏃犱换鍔�
* 1锛氬彇璐у畾浣嶄腑
@@ -50,11 +58,16 @@
* 99锛氭姤璀�
*/
public Short status;
-
+ public Short statusTwo;
/**
* 鐘舵�佹灇涓�
*/
public CrnStatusType statusType;
+
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public CrnStatusType statusTypeTwo;
/**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
@@ -62,9 +75,18 @@
public Short bay;
/**
+ * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
+ */
+ public Short bayTwo;
+
+ /**
* 鍫嗗灈鏈哄綋鍓嶅眰鍙�
*/
public Short level;
+ /**
+ * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
+ */
+ public Short levelTwo;
/**
* 褰撳墠璐у弶浣嶇疆
@@ -73,6 +95,8 @@
* 2 = 璐у弶鍦ㄥ彸渚�
*/
public Short forkPos;
+
+ public Short forkPosTwo;
public CrnForkPosType forkPosType;
@@ -83,6 +107,8 @@
*/
public Short liftPos;
+ public Short liftPosTwo;
+
public CrnLiftPosType liftPosType;
/**
@@ -91,21 +117,31 @@
* 1 = 涓嶅湪瀹氫綅
*/
public Short walkPos;
-
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
+ * 璧拌鍦ㄥ畾浣�
+ * 0 = 鍦ㄥ畾浣�
+ * 1 = 涓嶅湪瀹氫綅
*/
- public Short taskFinish;
+ public Short walkPosTwo;
/**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
/**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
+ * 杞借揣鍙版湁鐗�
*/
- private Short alarm1;
+ public Short loadedTwo;
+
+ private Short temp1;
+
+ private CrnTemp1 crnTemp1;
+
+ private Short temp2;
+
+ private Short temp3;
+
+ private Short temp4;
/**
* 寮傚父1
@@ -122,9 +158,32 @@
private CrnError2 crnError2;
/**
- * 淇濈暀
+ * 寮傚父3
*/
- private Short temp1;
+ private boolean[] error3;
+
+ private CrnError3 crnError3;
+
+ /**
+ * 寮傚父4
+ */
+ private boolean[] error4;
+
+ private CrnError4 crnError4;
+
+ /**
+ * 寮傚父5
+ */
+ private boolean[] error5;
+
+ private CrnError5 crnError5;
+
+ /**
+ * 寮傚父6
+ */
+ private boolean[] error6;
+
+ private CrnError6 crnError6;
/**
* X琛岃蛋绾块�熷害m/min
@@ -140,6 +199,10 @@
* Z琛岃蛋绾块�熷害m/min
*/
private Float zSpeed;
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeedTwo;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
@@ -191,63 +254,80 @@
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();
}
- public void setError1(boolean[] error1){
- this.error1 = error1;
- this.crnError1 = new CrnError1();
- this.crnError1.stop = error1[0];
- this.crnError1.xCoverErr = error1[1];
- this.crnError1.yCoverErr = error1[2];
- this.crnError1.zCoverErr = error1[3];
- this.crnError1.rangeErr = error1[4];
- this.crnError1.barcodeErr = error1[5];
- this.crnError1.xFrontLimitErr = error1[6];
- this.crnError1.xBackLimitErr = error1[7];
- this.crnError1.yUpLimitErr = error1[8];
- this.crnError1.yDownLimitErr = error1[9];
- this.crnError1.zLeftLimitErr = error1[10];
- this.crnError1.zRightLimitErr = error1[11];
- this.crnError1.xLocationUpErr = error1[12];
- this.crnError1.xLocationDownErr = error1[13];
- this.crnError1.yLocationUpErr = error1[14];
- this.crnError1.yLocationDownErr = error1[15];
+ public void setStatusTwo(Short status) {
+ this.statusTwo = status;
+ this.statusTypeTwo = CrnStatusType.get(status);
}
- public void setError2(boolean[] error2){
- this.error2 = error2;
- this.crnError2 = new CrnError2();
- this.crnError2.zLocationUpErr = error2[0];
- this.crnError2.zLocationDownErr = error2[1];
- this.crnError2.wcsCommandErr = error2[2];
- this.crnError2.leftWidthLimitErr = error2[3];
- this.crnError2.rightWidthLimitErr = error2[4];
- this.crnError2.leftLengthLimitErr = error2[5];
- this.crnError2.rightLengthLimitErr = error2[6];
- this.crnError2.highLimitErr = error2[7];
- this.crnError2.leftTakeNoneErr = error2[8];
- this.crnError2.rightTakeNoneErr = error2[9];
- this.crnError2.leftPutLoadErr = error2[10];
- this.crnError2.rightPutLoadErr = error2[11];
- this.crnError2.startErr = error2[12];
- this.crnError2.looseRopeErr = error2[13];
- this.crnError2.safeDoorSwitchErr = error2[14];
- this.crnError2.none = error2[15];
+ public void setStatusTwo(CrnStatusType type) {
+ this.statusTypeTwo = type;
+ this.statusTwo = CrnStatusType.get(type).id.shortValue();
+ }
+
+ public Short getTemp1() {
+ return temp1;
+ }
+
+ public void setTemp1(Short temp1) {
+ this.temp1 = temp1;
}
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
- * I:鍏ュ簱
- * O:鍑哄簱
+ * I:鍏ュ簱
+ * O:鍑哄簱
*/
private String lastIo = "I";
+
+ public BasCrnp toSqlModel(BasCrnp basCrnp) {
+ if (alarm != null) {
+ basCrnp.setCrnErr(alarm.longValue());
+ }
+ 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 setzSpeedTwo(Short zSpeedTwo) {
+ this.zSpeedTwo = Float.valueOf(zSpeedTwo);
+ }
+
+ 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