From be31471261d238e9a0f5067d57ca32fff091bfd9 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 3 Feb 2023 09:47:47 +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

---
 ...eyorControlWithPlcScannerDeviceDriver.java | 19 ++++++++++++++++++-
 .../src/views/system/monitor/device/index.vue | 14 +++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java
index 8b49dab99..e459f504b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java
@@ -864,6 +864,18 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
             move = "有托盘有货";
             jo.put("hasGoods", true);
         }
+        String requireSucess = "0";
+        if (this.requireSucess) {
+            requireSucess = "1";
+        }
+        String applySucess = "0";
+        if (this.applySucess) {
+            applySucess = "1";
+        }
+        jo.put("requireSucess", requireSucess);
+        jo.put("applySucess", applySucess);
+        jo.put("driver_type", "standard_conveyor_control_with_scanner");
+        jo.put("is_click", true);
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("mode", mode);
         jo.put("move", move);
@@ -877,7 +889,12 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
 
     @Override
     public void setDeviceStatus(JSONObject data) {
-
+        String requestSucess = data.getString("requireSucess");
+        if (StrUtil.equals(requestSucess, "0")) {
+            this.requireSucess = false;
+        } else if (StrUtil.equals(requestSucess, "1")) {
+            this.requireSucess = true;
+        }
     }
 
 
diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue
index eb4800a46..d3d1d0b59 100644
--- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -103,6 +103,12 @@
             <el-radio-button :label="1">是</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="请求标记" prop="is_disable" label-width="120px">
+          <el-radio-group v-model="form.applySucess">
+            <el-radio-button :label="0">否</el-radio-button>
+            <el-radio-button :label="1">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible5 = false">取 消</el-button>
@@ -167,7 +173,8 @@ export default {
         material_type: '',
         requireSucess: '',
         fullrequireSucess: '',
-        is_disable: ''
+        is_disable: '',
+        applySucess: ''
       },
       allDeviceMsg: [],
       msgTop: '200px',
@@ -289,6 +296,7 @@ export default {
       if (clickObj.data.device_type === 'scanner') { // 扫码器
         this.dialogFormVisible1 = true
       } else {
+        console.log(clickObj.data.driver_type)
         if (clickObj.data.driver_type === 'standard_ordinary_site') {
           this.dialogFormVisible3 = true
         } else if (clickObj.data.driver_type === 'hailiang_packer_station') {
@@ -301,6 +309,7 @@ export default {
           this.dialogFormVisible5 = true
         } else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
           this.dialogFormVisible5 = true
+          console.log('11111111111')
         } else {
           this.dialogFormVisible = true
         }
@@ -473,6 +482,9 @@ export default {
           } else if (val === 'requireSucess') {
             const obj = { name: '请求成功标记', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'applySucess') {
+            const obj = { name: 'applySucess', value: data[val] }
+            this.arr.push(obj)
           }
         }
       }