From 5a2fe103bc7ef2ac7087721b197b9a7195b57826 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 12:00:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
index 028650b..826f343 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -154,23 +154,27 @@
boolean send = false;
if (station == 1) {
- if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PICK.id) {
- if (crnProtocol.getStatus().equals(DualCrnStatusType.IDLE.id)) {
- send = true;
- }
- } else if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PUT.id) {
- if (crnProtocol.getStatus().equals(DualCrnStatusType.FETCH_COMPLETE.id)) {
- send = true;
+ if (crnProtocol.getTaskSend() == 0) {
+ if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PICK.id) {
+ if (crnProtocol.getStatus().equals(DualCrnStatusType.IDLE.id)) {
+ send = true;
+ }
+ } else if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PUT.id) {
+ if (crnProtocol.getStatus().equals(DualCrnStatusType.FETCH_COMPLETE.id)) {
+ send = true;
+ }
}
}
}else {
- if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PICK.id) {
- if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.IDLE.id)) {
- send = true;
- }
- } else if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PUT.id) {
- if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.FETCH_COMPLETE.id)) {
- send = true;
+ if (crnProtocol.getTaskSendTwo() == 0) {
+ if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PICK.id) {
+ if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.IDLE.id)) {
+ send = true;
+ }
+ } else if (dualCommand.getTaskMode().intValue() == DualCrnTaskModeType.PUT.id) {
+ if (crnProtocol.getStatusTwo().equals(DualCrnStatusType.FETCH_COMPLETE.id)) {
+ send = true;
+ }
}
}
}
--
Gitblit v1.9.1