From bdcc326cf75564f324c164d8ad64e90bda4a95eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 08 八月 2020 17:16:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1
src/main/java/com/zy/core/thread/CrnThread.java | 30 +++++++-------
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 13 ++++++
src/main/java/com/zy/core/enums/CrnModeType.java | 38 +++++++++++++++++++
4 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f6ad036..f1874dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -291,7 +291,6 @@
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol.status == )
}
}
diff --git a/src/main/java/com/zy/core/enums/CrnModeType.java b/src/main/java/com/zy/core/enums/CrnModeType.java
new file mode 100644
index 0000000..b908ed7
--- /dev/null
+++ b/src/main/java/com/zy/core/enums/CrnModeType.java
@@ -0,0 +1,38 @@
+package com.zy.core.enums;
+
+public enum CrnModeType {
+
+ HAND(1), // 绌洪棽
+ AUTO(2), // 鍙栬揣瀹氫綅涓�
+ COMPUTER(3), // 鍙栬揣璇锋眰
+ ;
+
+ public Integer id;
+ CrnModeType(Integer id) {
+ this.id = id;
+ }
+
+ public static CrnModeType get(Short id) {
+ if (null == id) {
+ return null;
+ }
+ for (CrnModeType type : CrnModeType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static CrnModeType get(CrnModeType type) {
+ if (null == type) {
+ return null;
+ }
+ for (CrnModeType crnModeType : CrnModeType.values()) {
+ if (crnModeType == type) {
+ return crnModeType;
+ }
+ }
+ return null;
+ }
+}
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 045f98a..e70f00e 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.core.enums.CrnModeType;
import com.zy.core.enums.CrnStatusType;
import lombok.Data;
@@ -18,6 +19,8 @@
* 6 = 鐢佃剳妯″紡鍚姩涓�
*/
public short mode;
+
+ public CrnModeType modeType;
/**
* 1 = 鎬ュ仠
@@ -117,6 +120,16 @@
*/
public int duration;
+ public void setMode(Short mode) {
+ this.mode = mode;
+ this.modeType = CrnModeType.get(mode);
+ }
+
+ public void setMode(CrnModeType type) {
+ this.modeType = type;
+ this.mode = CrnModeType.get(type).id.shortValue();
+ }
+
public void setStatus(Short status){
this.status = status;
this.statusType = CrnStatusType.get(status);
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 9d34452..ad1b865 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -82,21 +82,21 @@
*/
private void readStatus(){
CrnProtocol protocol = new CrnProtocol();
- protocol.mode = siemensNet.ReadInt16("D2231").Content;
- protocol.eStop = siemensNet.ReadInt16("D2232").Content;
- protocol.taskNo = siemensNet.ReadInt16("D2233").Content;
- protocol.status = siemensNet.ReadInt16("D2234").Content;
- protocol.bay = siemensNet.ReadInt16("D2235").Content;
- protocol.level = siemensNet.ReadInt16("D2236").Content;
- protocol.forkPos = siemensNet.ReadInt16("D2237").Content;
- protocol.liftPos = siemensNet.ReadInt16("D2238").Content;
- protocol.walkPos = siemensNet.ReadInt16("D2239").Content;
- protocol.taskFinish = siemensNet.ReadInt16("D2240").Content;
- protocol.loaded = siemensNet.ReadInt16("D2241").Content;
- protocol.alarm = siemensNet.ReadInt16("D2242").Content;
- protocol.xDistance = siemensNet.ReadInt32("D2251").Content;
- protocol.yDistance = siemensNet.ReadInt32("D2253").Content;
- protocol.duration = siemensNet.ReadInt32("D2255").Content;
+ protocol.setMode(siemensNet.ReadInt16("D2231").Content);
+ protocol.setEStop(siemensNet.ReadInt16("D2232").Content);
+ protocol.setTaskNo(siemensNet.ReadInt16("D2233").Content);
+ protocol.setStatus(siemensNet.ReadInt16("D2234").Content);
+ protocol.setBay(siemensNet.ReadInt16("D2235").Content);
+ protocol.setLevel(siemensNet.ReadInt16("D2236").Content);
+ protocol.setForkPos(siemensNet.ReadInt16("D2237").Content);
+ protocol.setLiftPos(siemensNet.ReadInt16("D2238").Content);
+ protocol.setWalkPos(siemensNet.ReadInt16("D2239").Content);
+ protocol.setTaskFinish(siemensNet.ReadInt16("D2240").Content);
+ protocol.setLoaded(siemensNet.ReadInt16("D2241").Content);
+ protocol.setAlarm(siemensNet.ReadInt16("D2242").Content);
+ protocol.setXDistance(siemensNet.ReadInt32("D2251").Content);
+ protocol.setYDistance(siemensNet.ReadInt32("D2253").Content);
+ protocol.setDuration(siemensNet.ReadInt32("D2255").Content);
this.crnProtocol = protocol;
}
--
Gitblit v1.9.1