lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 任务业务以及与acs对接的接口

Browse Source
This commit is contained in:
liyongde
2023-07-18 15:16:05 +08:00
parent 3a437675dd
commit 82bebd313e
59 changed files with 2745 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
View File

@@ -93,7 +93,18 @@
<el-input v-model="form.task_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务类型">
<el-input v-model="form.task_type" style="width: 240px;" />
<el-select
v-model="form.task_type"
size="mini"
placeholder="任务类型"
style="width: 240px;"
>
<el-option
v-for="item in dict.task_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="优先级" pro="priority">
<el-input-number
@@ -268,7 +279,11 @@
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')" />
<el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')" />
<el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型', 20)" >
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
</el-table-column>
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
<el-table-column prop="task_create_max_num" label="任务生成数上限" :min-width="flexWidth('task_create_max_num',crud.data,'任务生成数上限')" />
<el-table-column prop="task_issue_max_num" label="任务下发数上限" :min-width="flexWidth('task_issue_max_num',crud.data,'任务下发数上限')" />
@@ -416,14 +431,14 @@ const defaultForm = {
}
export default {
name: 'TaskConfig',
dicts: ['task_qf_type', 'acs_task_type', 'task_direction'],
dicts: ['task_qf_type', 'acs_task_type', 'task_direction', 'task_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '任务配置',
url: 'api/schBaseTaskconfig',
idField: 'config_code',
idField: 'config_id',
sort: 'config_code,desc',
optShow: {
add: true,

6
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -183,7 +183,7 @@
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
<el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
<el-table-column prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
<el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
<!-- <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />-->
<el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />
<el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
<el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')" />
@@ -197,9 +197,9 @@
<el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="ext_group_data" label="额外组盘信息" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />
<!-- <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />-->
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<!-- <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />-->
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
<template slot-scope="scope">