From 352b3946e1afb9a27c96f58bb138e2ba5a010ec0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 21 六月 2024 19:52:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/JarProtocol.java b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
index 4bc415b..29966ae 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -8,7 +8,7 @@
import lombok.extern.slf4j.Slf4j;
/**
- * Created by vincent on 2020/8/7
+ * Created by vincent on 2024/6/21
*/
@Slf4j
@Data
@@ -73,6 +73,26 @@
* */
private boolean autoing;
+ /*
+ * open the left door
+ * */
+ public Integer leftDoorOpen;
+
+ /*
+ * close the left door
+ * */
+ public Integer leftDoorClose;
+
+ /*
+ * open the right door
+ * */
+ public Integer rightDoorOpen;
+
+ /*
+ * close the right door
+ * */
+ public Integer rightDoorClose;
+
/**
* 寮傚父鐮�
@@ -104,17 +124,15 @@
basJar.setJarErr(jarErr);
}
basJar.setJarMode(mode);
-// if (basSte.getPakMk().equals("N")) {
-// if (!Cools.isEmpty(row)) {
-// basSte.setRow(row.intValue());
-// }
-// if (!Cools.isEmpty(bay)) {
-// basSte.setBay(bay.intValue());
-// }
-// if (!Cools.isEmpty(lev)) {
-// basSte.setLev(lev.intValue());
-// }
-// }
+ basJar.setJarStatus(status.intValue());
+ basJar.setLeftDoor(leftDoor?"Y":"N");
+ basJar.setRightDoor(rightDoor?"Y":"N");
+ basJar.setLeftInEnable(leftInEnable?"Y":"N");
+ basJar.setLeftOutEnable(leftOutEnable?"Y":"N");
+ basJar.setRightInEnable(rightInEnable?"Y":"N");
+ basJar.setRightOutEnable(rightOutEnable?"Y":"N");
+ basJar.setAutoing(autoing?"Y":"N");
+
return basJar;
}
--
Gitblit v1.9.1