From 858e82a2c7505e90216b1a1f605354b283b84217 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 25 Nov 2022 11:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/quartz/task/AutoCreateInst.java   | 20 +++++++++----------
 qd/src/views/acs/route/routeLine/index.vue    |  9 +++++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
index 0f31790..544860b 100644
--- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
+++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
@@ -102,18 +102,18 @@ public class AutoCreateInst {
             String startDriverCode = startdevice.getDeviceDriverDefination().getDriverCode();
             String nextDriverCode = nextdevice.getDeviceDriverDefination().getDriverCode();
             if (StrUtil.isNotEmpty(startDriverCode)){
-                DriverDeviceService deviceService = applicationContext.getBean(startDriverCode, DriverDeviceService.class);
-                Boolean checkStartPoint = deviceService.createInstCheckStartPoint(startdevice, acsTask);
-                if (!checkStartPoint){
-                    continue;
-                }
+//                DriverDeviceService deviceService = applicationContext.getBean(startDriverCode, DriverDeviceService.class);
+//                Boolean checkStartPoint = deviceService.createInstCheckStartPoint(startdevice, acsTask);
+//                if (!checkStartPoint){
+//                    continue;
+//                }
             }
             if (StrUtil.isNotEmpty(nextDriverCode)){
-                DriverDeviceService deviceService = applicationContext.getBean(nextDriverCode, DriverDeviceService.class);
-                Boolean checkNextPoint = deviceService.createInstCheckNextPoint(nextdevice, acsTask);
-                if (!checkNextPoint){
-                    continue;
-                }
+//                DriverDeviceService deviceService = applicationContext.getBean(nextDriverCode, DriverDeviceService.class);
+//                Boolean checkNextPoint = deviceService.createInstCheckNextPoint(nextdevice, acsTask);
+//                if (!checkNextPoint){
+//                    continue;
+//                }
             }
             Instruction instdto = new Instruction();
             instdto.setInstruction_type(acsTask.getTask_type());
diff --git a/qd/src/views/acs/route/routeLine/index.vue b/qd/src/views/acs/route/routeLine/index.vue
index 7e02ce1..7495a75 100644
--- a/qd/src/views/acs/route/routeLine/index.vue
+++ b/qd/src/views/acs/route/routeLine/index.vue
@@ -159,7 +159,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="line_uuid" label="路线标识" />
-        <el-table-column prop="device_code" label="设备编码" width="120"/>
+        <el-table-column prop="device_code" label="设备编码" width="120" />
         <el-table-column v-if="false" prop="device_code" label="设备名称" />
         <el-table-column prop="route_plan_id" label="路由方案" width="140">
           <template slot-scope="scope">
@@ -310,6 +310,11 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    [CRUD.HOOK.beforeToEdit](data) {
+      this.form.device_code = Array.of(data.form.device_code.split('').join(''))
+      this.form.next_device_code = Array.of(data.form.next_device_code.split('').join(''))
+      return true
+    },
     // 改变状态
     changeEnabled(data) {
       var msg = '停用'
@@ -337,7 +342,7 @@ export default {
       }).catch(err => {
         console.log(err.response.data.message)
       })
-    },
+    }
   }
 }
 </script>