root/weiDaQi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
pangshenghao
2023-06-08 16:52:42 +08:00
parent 63ce1f0110
commit e855a781fb
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
View File

@@ -131,10 +131,10 @@ public class NDCAgvServiceImpl implements NDCAgvService {
System.out.println(str1); System.out.println(str1);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD, byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08, (byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X12, (byte) 0X00, (byte) 0X16,
(byte) 0X00, (byte) 0X01, (byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71, (byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X0E, (byte) 0X00, (byte) 0X12,
(byte) 0X01, prioritylow, (byte) 0X01, prioritylow,
(byte) 0X00, (byte) 0X01, (byte) 0X00, (byte) 0X01,
(byte) ikeyhigh, (byte) ikeylow, (byte) ikeyhigh, (byte) ikeylow,

2
acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -242,6 +242,8 @@
<el-table-column prop="priority" label="任务优先级" /> <el-table-column prop="priority" label="任务优先级" />
<el-table-column prop="start_point_code" label="起点" /> <el-table-column prop="start_point_code" label="起点" />
<el-table-column prop="next_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="matarial" label="物料" />
<el-table-column prop="quantity" label="数量" /> <el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />

2
acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
View File

@@ -101,6 +101,8 @@
<el-table-column prop="next_point_code" label="终点" /> <el-table-column prop="next_point_code" label="终点" />
<el-table-column prop="start_point_code2" label="起点2" /> <el-table-column prop="start_point_code2" label="起点2" />
<el-table-column prop="next_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="matarial" label="物料" />
<el-table-column prop="quantity" label="数量" /> <el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />

8
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -309,6 +309,12 @@
<el-form-item label="优先级"> <el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" /> <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
</el-form-item> </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-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" /> <el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item> </el-form-item>
@@ -355,6 +361,8 @@
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />--> <!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
<!-- <el-table-column prop="matarial" label="物料" />--> <!-- <el-table-column prop="matarial" label="物料" />-->
<!-- <el-table-column prop="quantity" 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="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />