From d104a41d3996c44e73d47c75b1a23f352b806f58 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Tue, 23 Jan 2024 15:04:16 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0AGV=E5=8F=96=E6=94=BE?=
 =?UTF-8?q?=E7=83=98=E7=AE=B1=E5=AF=B9=E6=8E=A5=E4=BD=8D=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agv/ndctwo/AgvNdcTwoDeviceDriver.java        | 16 ++++++++++++----
 acs/nladmin-ui/src/views/acs/task/index.vue      |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
index b8ea52bd9..1b3be020d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -242,16 +242,19 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
             } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                 standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
+
                 try {
                     standardInspectSiteDeviceDriver.writing("to_command", "1");
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                if ((standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1) || standardInspectSiteDeviceDriver.getIs_force() == 1) {
+                if ((standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1 && standardInspectSiteDeviceDriver.getError() == 0)
+                        || standardInspectSiteDeviceDriver.getIs_force() == 1 ) {
                     data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                 } else {
-                    message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction() + ",指令号:" + ikey + "不满足取货条件";
-                    log.info("设备{}当前光电信号{}，动作信号{}，不满足取货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction(), ikey);
+                    message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction()+  "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件";
+                    log.info("设备{}当前光电信号{}，动作信号{} ,错误信号{}，不满足取货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction()
+                            ,standardInspectSiteDeviceDriver.getError(), ikey);
                 }
                 standardInspectSiteDeviceDriver.setIs_force(0);
             } else {
@@ -518,8 +521,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
             } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                 standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
                 standardInspectSiteDeviceDriver.writing("to_command", "1");
-                if ((standardInspectSiteDeviceDriver.getMove() == 0 && standardInspectSiteDeviceDriver.getAction() == 1) || standardInspectSiteDeviceDriver.getIs_force() == 1) {
+                if ((standardInspectSiteDeviceDriver.getMove() == 0 && standardInspectSiteDeviceDriver.getAction() == 1  && standardInspectSiteDeviceDriver.getError() == 0)
+                        || standardInspectSiteDeviceDriver.getIs_force() == 1) {
                     data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+                }else {
+                    message = "设备号:" + device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:" + standardInspectSiteDeviceDriver.getAction()+  "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足放货条件";
+                    log.info("设备{}当前光电信号{}，动作信号{} ,报警信号{}，不满足放货条件,指令号{}", device_code, standardInspectSiteDeviceDriver.getMove(), standardInspectSiteDeviceDriver.getAction()
+                            ,standardInspectSiteDeviceDriver.getError(), ikey);
                 }
                 standardInspectSiteDeviceDriver.setIs_force(0);
             } else {
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index f01311cbe..619b3ce01 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -60,6 +60,7 @@
       <crudOperation :permission="permission">
         <el-button
           slot="left"
+          v-permission="['admin','task:add']"
           class="filter-item"
           size="mini"
           type="primary"