From baae63a330467be864de7d156bc189e84ae996b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 16:50:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 2 +-
src/main/java/com/zy/core/enums/CrnStatusType.java | 6 +++---
src/main/java/com/zy/core/thread/CrnThread.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 6f8531b..c236c79 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -2,16 +2,16 @@
public enum CrnStatusType {
- IDLE(0, "绌洪棽"),
+ IDLE(0, "绌洪棽锛屾棤浠诲姟"),
FETCH_POSITION(1, "鍙栬揣瀹氫綅涓�"),
FETCHING(2, "鍙栬揣涓�"),
- PUT_POSITION(3, "鏀捐揣瀹氫綅涓�"),
+ PUT_POSITION(3, "鍙栬揣瀹屾垚锛屾斁璐у畾浣嶄腑"),
PUTTING(4, "鏀捐揣涓�"),
TO_ORIGIN(5, "鍥炲師鐐逛腑"),
ORIGIN(6, "鍙嶅師鐐�"),
LOC_MOVE(7, "搴撲綅绉讳綅"),
WAITING(90, "浠诲姟瀹屾垚绛夊緟WCS纭"),
- SOS(99, "鎶ヨ"),
+// SOS(99, "鎶ヨ"),
;
public Integer id;
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index c6fca8a..2d31ca3 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -7,7 +7,7 @@
PAKOUT(2), // 鍑哄簱
LOC_MOVE(3), // 搴撲綅绉昏浆
SITE_MOVE(4), // 绔欎綅绉昏浆
- ORIGIN(5), // 鍥炲師鐐�
+ OFFSET_MOVE(7), // 鍧愭爣绉昏
;
public Integer id;
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index d36adba..eaa6b3f 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -115,7 +115,7 @@
crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+// crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 22));
--
Gitblit v1.9.1