From bc5b7f3743dfbddb113ff3480673161791c87644 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Thu, 2 Feb 2023 23:38:39 +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         | 2 +-
 .../acs/instruction/service/impl/InstructionServiceImpl.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 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 76b4cfd77..73b5caada 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
@@ -159,7 +159,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
             if (move != last_move) {
                 message = null;
-                if (move == 0 && mode == 2) {
+                if (move == 0 ) {
                     inst_message = null;
                     this.clearWrite();
                 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index dcca493c5..17a677161 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -715,6 +715,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         }
 
         removeByCodeFromCache(entity.getInstruction_code());
+        this.reload();
     }
 
     @Override
@@ -770,7 +771,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         deviceService.changeDeviceStatus(jo1);
 
         removeByCodeFromCache(dto.getInstruction_code());
-
+        this.reload();
     }
 
     @Override
@@ -942,6 +943,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
             }
             removeByCodeFromCache(entity.getInstruction_code());
         }
+        this.reload();
 
     }
     @Override