From dd1365efe49fc53bb7ea83f6f655036c4f925d74 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 30 Jan 2023 03:24:19 +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

---
 .../SiemensConveyorLabelingDeviceDriver.java                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
index b5d8f2069..70965b493 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
@@ -654,6 +654,9 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
             }
             if(task >0 ){
                 Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(task));
+                if (ObjectUtil.isEmpty(instruction)){
+                    instruction = instructionService.findByCode(String.valueOf(task));
+                }
                 vehicle_code = instruction.getVehicle_code();
             } else {
                 logServer.deviceExecuteLog(device_code, "", "", "申请贴标电气设备任务号:"+task+"异常");