From fb7b8f97b0617d8f186a4ac9fd0e9eb532e2febd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 13:20:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |    8 +++-----
 src/main/java/com/zy/core/enums/CrnLiftPosType.java    |    8 +++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/enums/CrnLiftPosType.java b/src/main/java/com/zy/core/enums/CrnLiftPosType.java
index bd2514d..5dc366d 100644
--- a/src/main/java/com/zy/core/enums/CrnLiftPosType.java
+++ b/src/main/java/com/zy/core/enums/CrnLiftPosType.java
@@ -3,9 +3,11 @@
 public enum CrnLiftPosType {
 
     ERROR(-1, "鏈煡"),   // 涓嶅湪瀹氫綅
-    DOWN(0, "涓嬪畾浣�"),  //
-    UP(1, "涓婂畾浣�"),   //
-    NONE(2, "涓嶅湪瀹氫綅"),   // 涓嶅湪瀹氫綅
+    ORIGIN(0, "璐у弶鍘熶綅"),   // 涓嶅湪瀹氫綅
+    _DOWN(1, "鍙屼几浣嶄綆浣�"),
+    DOWN(2, "鍗曚几浣嶄綆浣�"),  // 涓嬪畾浣�
+    UP(3, "鍗曚几浣嶉珮浣�"),   // 涓婂畾浣�
+    _UP(4, "鍙屼几浣嶉珮浣�"),
     ;
 
     public Integer id;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 12ffcf4..a3c7bed 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -224,7 +224,7 @@
         }
 //        convertRow(command);
         command.setCrnNo(slave.getId());
-        short[] array = new short[12];
+        short[] array = new short[10];
         array[0] = command.getAckFinish();
         array[1] = command.getTaskNo();
         array[2] = command.getTaskMode();
@@ -234,15 +234,13 @@
         array[6] = command.getDestinationPosX();
         array[7] = command.getDestinationPosY();
         array[8] = command.getDestinationPosZ();
-        array[9] = command.getSourceStaNo();
-        array[10] = command.getDestinationStaNo();
-        array[11] = command.getCommand();
+        array[9] = command.getCommand();
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;
             Thread.sleep(100);
-            result = siemensNet.Write("DB100.22", commandFinish);
+            result = siemensNet.Write("DB100.18", commandFinish);
         }
 
         try {

--
Gitblit v1.9.1