From cab1fb65541de6dd4a50e2cf925f1ff21e2e03ce Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 18 八月 2020 13:00:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 60374b9..3c3c77e 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -9,6 +9,7 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
@@ -138,6 +139,16 @@
crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+
+ /**
+ * 褰撹鍒皊tatus == 90.浠诲姟瀹屾垚绛夊緟WCS纭 鏃�
+ * 涓嬪彂浠诲姟瀹屾垚鎸囦护
+ */
+ if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ write(crnCommand);
+ }
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
--
Gitblit v1.9.1