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

rev: 与ACS对接的接口与实体的对应

Browse Source
This commit is contained in:
liyongde
2023-07-26 15:04:48 +08:00
parent e09b66a6f1
commit 5cc0c807ca
101 changed files with 3313 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue
View File

@@ -154,7 +154,7 @@ export default {
presenter(),
header(),
form(function() {
return Object.assign({ dict: { id: this.dictId }}, defaultForm)
return Object.assign({ code_rule_id: this.dictId }, defaultForm)
})],
data() {
return {

203
lms/nladmin-ui/src/views/wms/basedata/brick/index.vue Normal file
View File

@@ -0,0 +1,203 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="当前抓取工位">
<el-input v-model="form.get_station" style="width: 370px;" />
</el-form-item>
<el-form-item label="当前放置工位">
<el-input v-model="form.put_station" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否合格">
<el-input v-model="form.is_qualified" style="width: 370px;" />
</el-form-item>
<el-form-item label="激光标刻码">
<el-input v-model="form.laser_marking_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="碾次">
<el-input v-model="form.grinding_number" style="width: 370px;" />
</el-form-item>
<el-form-item label="高度1">
<el-input v-model="form.height1" style="width: 370px;" />
</el-form-item>
<el-form-item label="高度2">
<el-input v-model="form.height2" style="width: 370px;" />
</el-form-item>
<el-form-item label="高度3">
<el-input v-model="form.height3" style="width: 370px;" />
</el-form-item>
<el-form-item label="高度4">
<el-input v-model="form.height4" style="width: 370px;" />
</el-form-item>
<el-form-item label="宽度1">
<el-input v-model="form.width1" style="width: 370px;" />
</el-form-item>
<el-form-item label="宽度2">
<el-input v-model="form.width2" style="width: 370px;" />
</el-form-item>
<el-form-item label="长度">
<el-input v-model="form.len" style="width: 370px;" />
</el-form-item>
<el-form-item label="体积">
<el-input v-model="form.volume" style="width: 370px;" />
</el-form-item>
<el-form-item label="平面度">
<el-input v-model="form.flatness" style="width: 370px;" />
</el-form-item>
<el-form-item label="缺陷个数">
<el-input v-model="form.unqualified_qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="组盘标识">
<el-input v-model="form.group_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否组盘">
<el-input v-model="form.is_group" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column
prop="get_station"
label="当前抓取工位"
:min-width="flexWidth('get_station',crud.data,'当前抓取工位')"
/>
<el-table-column
prop="put_station"
label="当前放置工位"
:min-width="flexWidth('put_station',crud.data,'当前放置工位')"
/>
<el-table-column
prop="is_qualified"
label="是否合格"
:min-width="flexWidth('is_qualified',crud.data,'是否合格')"
/>
<el-table-column
prop="laser_marking_code"
label="激光标刻码"
:min-width="flexWidth('laser_marking_code',crud.data,'激光标刻码')"
/>
<el-table-column
prop="grinding_number"
label="碾次"
:min-width="flexWidth('grinding_number',crud.data,'碾次')"
/>
<el-table-column prop="height1" label="高度1" :min-width="flexWidth('height1',crud.data,'高度1')" />
<el-table-column prop="height2" label="高度2" :min-width="flexWidth('height2',crud.data,'高度2')" />
<el-table-column prop="height3" label="高度3" :min-width="flexWidth('height3',crud.data,'高度3')" />
<el-table-column prop="height4" label="高度4" :min-width="flexWidth('height4',crud.data,'高度4')" />
<el-table-column prop="width1" label="宽度1" :min-width="flexWidth('width1',crud.data,'宽度1')" />
<el-table-column prop="width2" label="宽度2" :min-width="flexWidth('width2',crud.data,'宽度2')" />
<el-table-column prop="len" label="长度" :min-width="flexWidth('len',crud.data,'长度')" />
<el-table-column prop="volume" label="体积" :min-width="flexWidth('volume',crud.data,'体积')" />
<el-table-column prop="flatness" label="平面度" :min-width="flexWidth('flatness',crud.data,'平面度')" />
<el-table-column
prop="unqualified_qty"
label="缺陷个数"
:min-width="flexWidth('unqualified_qty',crud.data,'缺陷个数')"
/>
<el-table-column prop="group_id" label="组盘标识" :min-width="flexWidth('group_id',crud.data,'组盘标识')" />
<el-table-column prop="is_group" label="是否组盘" :min-width="flexWidth('is_group',crud.data,'是否组盘')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudMdBaseBrickInfo from './mdBaseBrickInfo'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
brick_id: null,
get_station: null,
put_station: null,
is_qualified: null,
laser_marking_code: null,
grinding_number: null,
height1: null,
height2: null,
height3: null,
height4: null,
width1: null,
width2: null,
len: null,
volume: null,
flatness: null,
unqualified_qty: null,
group_id: null,
is_group: null
}
export default {
name: 'BrickInfo',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '每块砖的信息记录',
url: 'api/mdBaseBrickInfo',
idField: 'brick_id',
sort: 'brick_id,desc',
crudMethod: { ...crudMdBaseBrickInfo },
optShow: {
add: false,
edit: false,
del: false,
download: false
}
})
},
data() {
return {
permission: {},
rules: {}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
lms/nladmin-ui/src/views/wms/basedata/brick/mdBaseBrickInfo.js Normal file
View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/mdBaseBrickInfo',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/mdBaseBrickInfo/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/mdBaseBrickInfo',
method: 'put',
data
})
}
export default { add, edit, del }

15
lms/nladmin-ui/src/views/wms/pdm/record/index.vue
View File

@@ -10,10 +10,10 @@
<el-form-item label="压机编号">
<el-input v-model="form.device_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料">
<el-form-item label="混碾物料">
<el-input v-model="form.material_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="工单">
<el-form-item label="压机工单">
<el-input v-model="form.workorder_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="叫料时间">
@@ -29,9 +29,14 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="device_code" label="压机编号" :min-width="flexWidth('device_code',crud.data,'压机编号')"/>
<el-table-column prop="material_id" label="物料" :min-width="flexWidth('material_id',crud.data,'物料')"/>
<el-table-column prop="workorder_id" label="工单" :min-width="flexWidth('workorder_id',crud.data,'工单')"/>
<el-table-column prop="material_id" label="混碾物料" :min-width="flexWidth('material_id',crud.data,'物料')"/>
<el-table-column prop="workorder_id" label="压机工单" :min-width="flexWidth('workorder_id',crud.data,'工单')"/>
<el-table-column prop="create_time" label="叫料时间" :min-width="flexWidth('create_time',crud.data,'叫料时间')"/>
<el-table-column prop="is_finish" label="是否上料" :min-width="flexWidth('is_finish',crud.data,'叫料时间')">
<template slot-scope="scope">
{{ scope.row.is_finish ? '是' : '否'}}
</template>
</el-table-column>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -63,7 +68,7 @@ const defaultForm = {
create_time: null
}
export default {
name: 'PdmBdRequestMaterialRecord',
name: 'MaterialRecord',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

116
lms/nladmin-ui/src/views/wms/pdm/track/index.vue Normal file
View File

@@ -0,0 +1,116 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="链路ID">
<el-input
v-model="query.buss_move_id"
clearable
style="width: 180px"
placeholder="输入链路ID"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="日期">
<el-date-picker
v-model="query.createTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="crud.toQuery">
</el-date-picker>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="buss_move_id" label="链路ID" :min-width="flexWidth('buss_move_id',crud.data,'链路id')"/>
<el-table-column prop="process_action" label="动作" :min-width="flexWidth('process_action',crud.data,'动作')"/>
<el-table-column prop="process_location" label="地点" :min-width="flexWidth('process_location',crud.data,'地点')"/>
<el-table-column prop="point_name" label="名称" :min-width="flexWidth('point_name',crud.data,'地点')"/>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"/>
<el-table-column prop="record_time" label="记录时间" :min-width="flexWidth('record_time',crud.data,'记录时间')"/>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudPdmBdProductionProcessTracking from './pdmBdProductionProcessTracking'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
process_id: null,
record_time: null,
process_action: null,
process_location: null,
buss_move_id: null
}
export default {
name: 'ProcessTracking',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '生产过程跟踪表',
url: 'api/pdmBdProductionProcessTracking',
idField: 'process_id',
sort: 'process_id,desc',
crudMethod: { ...crudPdmBdProductionProcessTracking },
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
permission: {
},
rules: {
} }
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
lms/nladmin-ui/src/views/wms/pdm/track/pdmBdProductionProcessTracking.js Normal file
View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/pdmBdProductionProcessTracking',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/pdmBdProductionProcessTracking/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/pdmBdProductionProcessTracking',
method: 'put',
data
})
}
export default { add, edit, del }

10
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -221,8 +221,9 @@
<!-- <el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>-->
<el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="point_code" label="当前点位编码" :min-width="flexWidth('point_code',crud.data,'当前点位编码')" />
<el-table-column prop="point_name" label="当前点位名称" :min-width="flexWidth('point_name',crud.data,'当前点位名称')" />
<el-table-column prop="move_way" label="移动路径" :min-width="flexWidth('move_way',crud.data,'点位名称')" />
<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
<template slot-scope="scope">
{{scope.row.is_full?'是':'否'}}
@@ -253,6 +254,8 @@
<!-- <el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>-->
<!-- <el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>-->
<!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
<el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />
<el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />
<el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />
<el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -296,6 +299,7 @@ const defaultForm = {
material_id: null,
child_vehicle_code: null,
source_vehicle_code: null,
move_way: null,
point_code: null,
point_name: null,
is_full: true,
@@ -320,6 +324,8 @@ const defaultForm = {
before_task_code: null,
next_task_code: null,
remark: null,
out_kiln_time: null,
into_kiln_time: null,
is_delete: false
}
export default {

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

@@ -161,7 +161,8 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_code" label="载具编码1" :min-width="flexWidth('vehicle_code',crud.data,'载具编码1')" />
<el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')" />
<el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />
<el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')">
<template slot-scope="scope">
@@ -183,7 +184,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,'任务完成类型')" />
@@ -236,6 +237,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
task_id: null,
task_code: null,
task_class_id: null,
task_status: null,
@@ -247,6 +249,7 @@ const defaultForm = {
vehicle_type: null,
vehicle_qty: null,
vehicle_code: null,
vehicle_code2: null,
priority: null,
handle_class: null,
handle_status: null,
@@ -272,7 +275,7 @@ export default {
return CRUD({
title: '任务管理',
url: 'api/schBaseTask',
idField: 'task_code',
idField: 'task_id',
sort: 'task_code,desc',
optShow: {
add: false,