From 37516c6d0fe893d4fe1a3bed051a43d657ae9858 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Sat, 22 Feb 2025 16:02:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E8=A1=8C=E6=9E=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E6=A0=A1=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SlitTwoManipulatorDeviceDriver.java            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
index c03282c79..2120699af 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
@@ -1589,7 +1589,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
             }
 
             //双任务 后工位反馈任务完成 并反馈
-            if (mode == 3 && action1 == 4 && move2 == 0 && task1 > 0 && task2 > 0 && type == 3) {
+            if (mode == 3 && action1 == 4 && move1 == 0 && task1 > 0 && task2 > 0 && type == 3) {
                 if (to_command1 != 5) {
                     this.writing("to_command1", "5");
                 }
@@ -1601,10 +1601,10 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                         feedMessage += "行架工作模式不为运行中(mode != 3),";
                     }
                     if (action2 != 4) {
-                        feedMessage += "后工位动作信号未放货完成(action2 != 4),";
+                        feedMessage += "后工位动作信号未放货完成(action1 != 4),";
                     }
                     if (move2 != 0) {
-                        feedMessage += "后工位光电信号不应该为有货状态(move2 != 0),";
+                        feedMessage += "后工位光电信号不应该为有货状态(move1 != 0),";
                     }
                     if (task1 == 0) {
                         feedMessage += "前工位没有任务号(task1 == 0),";
@@ -1724,9 +1724,9 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
 
 
             //双工位  任务完成 前工位反馈4
-            if (mode == 3 && action2 == 4 && move1 == 0 && task1 > 0 && task2 > 0 && type == 3) {
+            if (mode == 3 && action2 == 4 && move2 == 0 && task1 > 0 && task2 > 0 && type == 3) {
                 //inst_message
-                Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1));
+                Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task2));
                 if (inst1 != null) {
                     if (StrUtil.equals(inst1.getInstruction_status(), "1")) {
                         if (to_command2 != 5) {
@@ -1744,10 +1744,10 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                         feedMessage += "行架工作模式不为运行中(mode != 3),";
                     }
                     if (action1 != 4) {
-                        feedMessage += "前工位动作信号未放货完成(action1 != 4),";
+                        feedMessage += "前工位动作信号未放货完成(action2 != 4),";
                     }
                     if (move1 != 0) {
-                        feedMessage += "前工位光电信号为不应为有货状态(move1 != 0),";
+                        feedMessage += "前工位光电信号为不应为有货状态(move2 != 0),";
                     }
                     if (task1 == 0) {
                         feedMessage += "前工位没有任务(task1 == 0),";