From 3e6099da0e8733551226372d7d74e33ee6211015 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Fri, 22 Dec 2023 14:47:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A5=BF=E9=97=A8=E5=AD=90=E8=BE=93?=
 =?UTF-8?q?=E9=80=81=E7=BA=BF=E6=A8=AA=E7=A7=BB=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SiemensConveyorDeviceDriver.java              | 15 ++++++---------
 .../instruction/service/InstructionService.java   |  7 +++++++
 .../service/impl/InstructionServiceImpl.java      |  8 ++++++++
 3 files changed, 21 insertions(+), 9 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 9ecc7c4f1..63186fb96 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
@@ -309,7 +309,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 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"))) {
-
                     taskDeviceUpdate(task);
                 }
             }
@@ -461,20 +460,18 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
     }
 
     private void taskDeviceUpdate(int task) {
-        Instruction  inst = instructionService.findByTaskcode(String.valueOf(task));
-
+        Instruction  inst = instructionService.findByInsructionCode(String.valueOf(task));
         ApplyManipulatorActionRequest applyManipulatorActionRequest = new ApplyManipulatorActionRequest();
-
         applyManipulatorActionRequest.setDevice_code(device_code);
         applyManipulatorActionRequest.setAction("3");
-        if (ObjectUtil.isNotEmpty(inst) && StrUtil.isNotEmpty(inst.getTask_code())) {
-            applyManipulatorActionRequest.setTask_code1(inst.getTask_code());
-        }else {
-            message = "task变化未找到指令";
+        if (ObjectUtil.isEmpty(inst)) {
+            logServer.deviceExecuteLog(this.device_code, "", "", "任务号不存在:" + inst);
+            return;
         }
+        applyManipulatorActionRequest.setTask_code1(inst.getTask_code());
         logServer.deviceExecuteLog(this.device_code, "", "", "task变化请求LMS,参数:" + applyManipulatorActionRequest);
         try {
-            ApplyManipulatorActionResponse response = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest);
+            ApplyManipulatorActionResponse response = acsToWmsService.actionFinishRequest(applyManipulatorActionRequest);
             if (response == null || response.getstatus() == 200) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "task变化请求LMS,接口返回:" + response.getMessage());
             }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
index bfcb31921..de0237145 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
@@ -86,6 +86,13 @@ public interface InstructionService {
      */
     Instruction findByTaskcode(String code);
 
+    /**
+     * 根据指令号查询
+     * @param code
+     * @return
+     */
+    Instruction findByInsructionCode(String code);
+
     Instruction findByTaskcodeAndStatus(String code);
 
     Instruction findByTaskcodeAndStatus(String code,String status);
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 f41d8acad..0a85edbe4 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
@@ -258,6 +258,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         return obj;
     }
 
+    @Override
+    public Instruction findByInsructionCode(String code) {
+        WQLObject wo = WQLObject.getWQLObject("acs_instruction");
+        JSONObject json = wo.query("instruction_code ='" + code + "'","create_time desc").uniqueResult(0);
+        final Instruction obj = json.toJavaObject(Instruction.class);
+        return obj;
+    }
+
     @Override
     public Instruction findByTaskcodeAndStatus(String code) {
             Iterator var3 = instructions.iterator();