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

fix: 加急工单入窑、分拣批次关系对应

Browse Source
This commit is contained in:
liyongde
2024-02-01 15:14:28 +08:00
parent 14472eca34
commit d6a0636082
30 changed files with 496 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/layout/components/Navbar.vue
View File

@@ -129,7 +129,7 @@ export default {
},
initWebSocket() {
// const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'messageInfo'
const wsUri = window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/' + 'messageInfo'
const wsUri = process.env.VUE_APP_WS_API + '/webSocket/' + 'messageInfo'
this.websock = new WebSocket(wsUri)
this.websock.onerror = this.webSocketOnError
this.websock.onmessage = this.webSocketOnMessage

2
lms/nladmin-ui/src/views/system/menu/index.vue
View File

@@ -241,7 +241,7 @@ export default {
name: 'Menu',
components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
cruds() {
return CRUD({ title: '菜单', idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
return CRUD({ title: '菜单', idField: 'menu_id', crudMethod: { ...crudMenu }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['system_type'],

99
lms/nladmin-ui/src/views/wms/pdm/vehiclebiding/index.vue
View File

@@ -5,37 +5,31 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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.origin_vehicle_code" style="width: 370px;" />
<el-dialog class="demo-form-inline" :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="135px">
<el-form-item label="木托盘编码">
<el-input v-model="form.wood_VEHICLE_CODE" style="width: 240px;" />
</el-form-item>
<el-form-item label="源载具类型">
<el-input v-model="form.origin_vehicle_type" style="width: 370px;" />
<el-form-item label="木托盘数量">
<el-input v-model="form.wood_QTY" style="width: 240px;" />
</el-form-item>
<el-form-item label="目标载具编码">
<el-input v-model="form.target_vehicle_code" style="width: 370px;" />
<el-form-item label="钢托盘编码1">
<el-input v-model="form.steel_VEHICLE_CODE1" style="width: 240px;" />
</el-form-item>
<el-form-item label="目标载具类型">
<el-input v-model="form.target_vehicle_type" style="width: 370px;" />
<el-form-item label="钢托盘数量1">
<el-input v-model="form.steel_QTY1" style="width: 240px;" />
</el-form-item>
<el-form-item label="源当前物料数量">
<el-input v-model="form.origin_qty" style="width: 370px;" />
<el-form-item label="钢托盘编码2">
<el-input v-model="form.steel_VEHICLE_CODE2" style="width: 240px;" />
</el-form-item>
<el-form-item label="目标当前物料数量">
<el-input v-model="form.target_qty" style="width: 370px;" />
<el-form-item label="钢托盘数量2">
<el-input v-model="form.steel_QTY2" style="width: 240px;" />
</el-form-item>
<el-form-item label="取货点">
<el-input v-model="form.get_station" style="width: 370px;" />
<el-form-item label="钢托盘编码3">
<el-input v-model="form.steel_VEHICLE_CODE3" style="width: 240px;" />
</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.order_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="记录时间">
<el-input v-model="form.record_time" style="width: 370px;" />
<el-form-item label="钢托盘数量3">
<el-input v-model="form.steel_QTY3" style="width: 240px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -46,20 +40,24 @@
<!--表格渲染-->
<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="origin_vehicle_code" label="源载具编码" :min-width="flexWidth('origin_vehicle_code',crud.data,'源载具编码')"/>
<el-table-column prop="origin_vehicle_type" label="源载具类型" :min-width="flexWidth('origin_vehicle_type',crud.data,'源载具类型')"/>
<el-table-column prop="target_vehicle_code" label="目标载具编码" :min-width="flexWidth('target_vehicle_code',crud.data,'目标载具编码')"/>
<el-table-column prop="target_vehicle_type" label="目标载具类型" :min-width="flexWidth('target_vehicle_type',crud.data,'目标载具类型')"/>
<el-table-column prop="origin_qty" label="源当前物料数量" :min-width="flexWidth('origin_qty',crud.data,'源当前物料数量')"/>
<el-table-column prop="target_qty" label="目标当前物料数量" :min-width="flexWidth('target_qty',crud.data,'目标当前物料数量')"/>
<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="order_code" label="工单号" :min-width="flexWidth('order_code',crud.data,'工单号')"/>
<el-table-column prop="record_time" label="记录时间" :min-width="flexWidth('record_time',crud.data,'记录时间')"/>
<el-table-column prop="wood_VEHICLE_CODE" label="木托盘编码" :min-width="flexWidth('wood_VEHICLE_CODE',crud.data,'木托盘编码')" />
<el-table-column prop="wood_QTY" label="木托盘数量" :min-width="flexWidth('wood_QTY',crud.data,'木托盘数量')" />
<el-table-column prop="wood_PCSN" label="木托盘批次" :min-width="flexWidth('wood_PCSN',crud.data,'木托盘批次')" />
<el-table-column prop="steel_VEHICLE_CODE1" label="钢托盘编码1" :min-width="flexWidth('steel_VEHICLE_CODE1',crud.data,'钢托盘编码1')" />
<el-table-column prop="steel_QTY1" label="钢托盘数量1" :min-width="flexWidth('steel_QTY1',crud.data,'钢托盘数量1')" />
<el-table-column prop="steel_PCSN1" label="钢托盘批次1" :min-width="flexWidth('steel_PCSN1',crud.data,'钢托盘批次1')" />
<el-table-column prop="steel_VEHICLE_CODE2" label="钢托盘编码2" :min-width="flexWidth('steel_VEHICLE_CODE2',crud.data,'钢托盘编码1')" />
<el-table-column prop="steel_QTY2" label="钢托盘数量2" :min-width="flexWidth('steel_QTY2',crud.data,'钢托盘数量1')" />
<el-table-column prop="steel_PCSN2" label="钢托盘批次2" :min-width="flexWidth('steel_PCSN2',crud.data,'钢托盘批次1')" />
<el-table-column prop="steel_VEHICLE_CODE3" label="钢托盘编码3" :min-width="flexWidth('steel_VEHICLE_CODE3',crud.data,'钢托盘编码1')" />
<el-table-column prop="steel_QTY3" label="钢托盘数量3" :min-width="flexWidth('steel_QTY3',crud.data,'钢托盘数量1')" />
<el-table-column prop="steel_PCSN3" label="钢托盘批次3" :min-width="flexWidth('steel_PCSN3',crud.data,'钢托盘批次1')" />
<el-table-column prop="record_TIME" label="记录时间" :min-width="flexWidth('record_TIME',crud.data,'记录时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:is-visiable-del="false"
:permission="permission"
/>
</template>
@@ -80,17 +78,24 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
associate_id: null,
origin_vehicle_code: null,
origin_vehicle_type: null,
target_vehicle_code: null,
target_vehicle_type: null,
origin_qty: null,
target_qty: null,
get_station: null,
put_station: null,
order_code: null,
record_time: null
record_ID: null,
wood_VEHICLE_CODE: null,
wood_QTY: null,
wood_PCSN: null,
steel_VEHICLE_CODE1: null,
steel_QTY1: null,
steel_PCSN1: null,
steel_VEHICLE_CODE2: null,
steel_QTY2: null,
steel_PCSN2: null,
steel_VEHICLE_CODE3: null,
steel_QTY3: null,
steel_PCSN3: null,
record_TIME: null,
create_TM: null,
op_FLAG: null,
op_TM: null,
op_REPLAY: null
}
export default {
name: 'PdmBdVehicleBinding',
@@ -100,8 +105,8 @@ export default {
return CRUD({
title: '分拣载具关联记录',
url: 'api/pdmBdVehicleBinding',
idField: 'associate_id',
sort: 'associate_id,desc',
idField: 'record_ID',
sort: 'record_id,desc',
crudMethod: { ...crudPdmBdVehicleBinding }
})
},