From e855a781fb4bedf2f35d5fd2a1044c9351e41ec6 Mon Sep 17 00:00:00 2001
From: pangshenghao <pangshenghao@erayt.com>
Date: Thu, 8 Jun 2023 16:52:42 +0800
Subject: [PATCH] fix

---
 .../org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java     | 4 ++--
 acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue | 2 ++
 .../src/views/acs/history/taskTreeRecord/index.vue        | 2 ++
 acs/nladmin-ui/src/views/acs/task/index.vue               | 8 ++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index ad71a28..35209ec 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -131,10 +131,10 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             System.out.println(str1);
             byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
                     (byte) 0X00, (byte) 0X08,
-                    (byte) 0X00, (byte) 0X12,
+                    (byte) 0X00, (byte) 0X16,
                     (byte) 0X00, (byte) 0X01,
                     (byte) 0X00, (byte) 0X71,
-                    (byte) 0X00, (byte) 0X0E,
+                    (byte) 0X00, (byte) 0X12,
                     (byte) 0X01, prioritylow,
                     (byte) 0X00, (byte) 0X01,
                     (byte) ikeyhigh, (byte) ikeylow,
diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index 5f3a42f..72722e3 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -242,6 +242,8 @@
         <el-table-column prop="priority" label="任务优先级" />
         <el-table-column prop="start_point_code" label="起点" />
         <el-table-column prop="next_point_code" label="终点" />
+        <el-table-column prop="start_height" label="起点高度" />
+        <el-table-column prop="next_height" label="终点高度" />
         <el-table-column prop="matarial" label="物料" />
         <el-table-column prop="quantity" label="数量" />
         <el-table-column prop="remark" label="备注" />
diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
index ac8fd51..4db587a 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -101,6 +101,8 @@
         <el-table-column prop="next_point_code" label="终点" />
         <el-table-column prop="start_point_code2" label="起点2" />
         <el-table-column prop="next_point_code2" label="终点2" />
+        <el-table-column prop="start_height" label="起点高度" />
+        <el-table-column prop="next_height" label="终点高度" />
         <el-table-column prop="matarial" label="物料" />
         <el-table-column prop="quantity" label="数量" />
         <el-table-column prop="remark" label="备注" />
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 8302850..bd2f312 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -309,6 +309,12 @@
           <el-form-item label="优先级">
             <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
           </el-form-item>
+          <el-form-item label="起点高度">
+            <el-input v-model="form.start_height" style="width: 370px;" @change="isDisabled=false" />
+          </el-form-item>
+          <el-form-item label="终点高度">
+            <el-input v-model="form.next_height" style="width: 370px;" @change="isDisabled=false" />
+          </el-form-item>
           <el-form-item label="载具号">
             <el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
           </el-form-item>
@@ -355,6 +361,8 @@
         <!--        <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
         <!--        <el-table-column prop="matarial" label="物料" />-->
         <!--        <el-table-column prop="quantity" label="数量" />-->
+        <el-table-column prop="start_height" label="起点高度" />
+        <el-table-column prop="next_height" label="终点高度" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />