From 0cf5eefc7080c65b045ad3ecf160daa3c39b488d Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 27 Dec 2022 22:43:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siemens_conveyor/SiemensConveyorDeviceDriver.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
index c7722f611..7131a274d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
@@ -169,7 +169,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                             int nextTask = siemensConveyorDeviceDriver.getTask();
                             if (nextTask == task) {
                                 inst_message = "指令号:" + instruction.getInstruction_code() + " " + instruction.getStart_point_code() + "->" + instruction.getNext_point_code() + "  载具号：" + instruction.getVehicle_code();
-                                if (StrUtil.equals(instruction.getInstruction_status(), "1") && StrUtil.equals(this.getDeviceCode(), instruction.getNext_device_code())) {
+                                if (StrUtil.equals(instruction.getInstruction_status(), "1")) {
+                                    inst = instruction;
                                     finish_instruction();
                                     this.clearWrite();
                                 }