From 6451957b9f0a28c7067cd78ab10690b2304ff1da Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Tue, 8 Jul 2025 17:38:25 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=B7=BB=E5=8A=A0=E8=BE=93?=
 =?UTF-8?q?=E9=80=81=E7=BA=BF=E6=8C=87=E4=BB=A4=E5=8F=B7=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siemens_conveyor/SiemensConveyorDeviceDriver.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 74c0a136a..9bb3788c3 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
@@ -308,6 +308,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
             if (task != last_task) {
+                if (task > 0) {
+                    logServer.deviceExecuteLog("SSX", "", "", "指令号：" + task + "在" + this.device_code +"设备上出现过");
+                }
                 logServer.deviceItemValue(this.device_code, "task", String.valueOf(task));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task);
                 if ("true".equals(this.device.getExtraValue().get("task_update"))) {
@@ -1279,9 +1282,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                     if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
                         vehicle_code = inst.getVehicle_code();
                         inst.setExecute_device_code(this.device_code);
-                        if (mode == 2 || mode == 8) {
-                            finish_instruction();
-                        }
+//                        if (mode == 2 || mode == 8) {
+                        finish_instruction();
+//                        }
                         logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task + ",载具号:" + inst.getVehicle_code());
                     } else {