From 47e020281f0799e0d781d5a4220e97f6649c400e Mon Sep 17 00:00:00 2001
From: ls <1793460677@qq.com>
Date: Thu, 24 Apr 2025 13:14:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=EF=BC=9A=E5=8F=96=E6=B6=88=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardInspectSite2DeviceDriver.java     | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java
index 4efe9a1..c798185 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java
@@ -279,6 +279,8 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
             WQLObject wo = WQLObject.getWQLObject("acs_task");
             JSONObject json = JSONObject.fromObject(dto);
             wo.insert(json);
+
+            writingTask(taskcode);
             requireSucess = true;
         }
     }
@@ -355,6 +357,18 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
         server.dispose();
     }
 
+    public void writingTask(String task) {
+        String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_task;
+
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_task, task);
+        ReadUtil.write(itemMap, server);
+        server.dispose();
+    }
+
     public void writing(int type, int command) {
         String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
                 + "." + ItemProtocol.item_to_command;
@@ -404,10 +418,8 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
         } else {
             this.instruction_require_time = date;
 
-            Instruction inst = checkInst();
-
             try {
-                taskserver.cancelByCode(inst.getTask_code());
+                taskserver.cancelByCode("-"+task);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -416,22 +428,7 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
         }
     }
 
-    public Instruction checkInst() {
-        if (ObjectUtil.isNotEmpty(this.inst)) {
-            if (this.task > 0) {
-                if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) {
-                    return this.inst;
-                } else {
-                    inst = instructionService.findByCodeFromCache(String.valueOf(task));
-                    return inst;
-                }
-            }
-        } else {
-            inst = instructionService.findByCodeFromCache(String.valueOf(task));
-            return inst;
-        }
-        return null;
-    }
+
 
     /**
      * 终点请求取消指令