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

add:手持海柔出入库顺序表

Browse Source
This commit is contained in:
zhangzq
2024-01-24 09:28:23 +08:00
parent ef3baa529c
commit 2f933a6709
23 changed files with 138 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue
View File

@@ -151,6 +151,19 @@
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
<el-table-column show-overflow-tooltip prop="workprocedure_id" label="所属工序">
<template slot-scope="scope">
<el-select v-model="form.tableData[scope.$index].workprocedure_id"
class="filter-item" placeholder="所属工序" size="small" style="width: 280px">
<el-option
v-for="item in workprocedureList"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格"/>
<el-table-column show-overflow-tooltip prop="plan_qty" label="数量(个)">
<template slot-scope="scope">
@@ -217,6 +230,7 @@ import crudsemiproductIn from '@/views/wms/storage_manage/semiproducthr/semiprod
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import crudPoint from '@/views/wms/scheduler_manage/point/point'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
const defaultForm = {
bill_code: '',
@@ -257,6 +271,7 @@ export default {
materType: '01',
storlist: [],
pointList: [],
workprocedureList: [],
billtypelist: [],
rules: {
product_code: [
@@ -283,6 +298,9 @@ export default {
crudStorattr.getStor({'stor_type': '5'}).then(res => {
this.storlist = res.content
})
crudWorkProcedure.downSelect({ product_area: 'A3' }).then(res => {
this.workprocedureList = res
})
const area_type = 'A3_BCPRK01'
crudPoint.getPoint({ 'area_type': area_type }).then(res => {
this.pointList = res

18
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/ViewDialog.vue
View File

@@ -105,6 +105,11 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="workprocedure_id" label="所属工序">
<template slot-scope="scope">
{{ getprocedurename(scope.row) }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量(个)" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
@@ -124,6 +129,8 @@
import { crud } from '@crud/crud'
import crudsemiproductIn from '@/views/wms/storage_manage/semiproducthr/semiproducthrIn/semiproducthrIn'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
export default {
name: 'ViewDialog',
@@ -145,6 +152,7 @@ export default {
tableDtl: [],
tabledis: [],
billtypelist: [],
workprocedureList: {},
storlist: [],
currentdtl: null,
currentDis: {},
@@ -164,7 +172,17 @@ export default {
}
},
methods: {
getprocedurename(row) {
return this.workprocedureList.get(row.workprocedure_id)
},
open() {
crudWorkProcedure.downSelect({ product_area: 'A3' }).then(res => {
var procedures = new Map();
res.forEach(item => {
procedures.set(item.workprocedure_id,item.workprocedure_name)
})
this.workprocedureList = procedures
})
this.queryTableDtl()
},
close() {

20
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIvt/index.vue
View File

@@ -91,9 +91,14 @@
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="120" prop="workprocedure_id" label="所属工序" >
<template slot-scope="scope">
{{ getprocedurename(scope.row) }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量(个)" :formatter="crud.formatNum3" />
<!-- <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
<!-- <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
<el-table-column show-overflow-tooltip prop="instorage_time" label="入库时间" min-width="150" />
</el-table>
<!--分页组件-->
@@ -111,6 +116,8 @@ import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
import semiproductivt from '@/views/wms/storage_manage/semiproducthr/semiproducthrIvt/semiproducthrivt'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
export default {
name: 'ProductIn',
@@ -130,6 +137,7 @@ export default {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
permission: {},
workprocedureList: {},
storlist: [],
storId: null
}
@@ -141,11 +149,21 @@ export default {
}
},
created() {
crudWorkProcedure.downSelect({ product_area: 'A3' }).then(res => {
var procedures = new Map();
res.forEach(item => {
procedures.set(item.workprocedure_id,item.workprocedure_name)
})
this.workprocedureList = procedures
})
crudStorattr.getStor({ 'stor_type': '5' }).then(res => {
this.storlist = res.content
})
},
methods: {
getprocedurename(row){
return this.workprocedureList.get(row.workprocedure_id)
},
downloadMethod() {
semiproductivt.exportFile(this.query).then(res => {
this.crud.notify('导出成功', CRUD.NOTIFICATION_TYPE.SUCCESS)

4
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrOrder/hrorder.js
View File

@@ -2,8 +2,8 @@ import request from '@/utils/request'
export function del(ids) {
return request({
url: '/api/pda/hrBcp/order',
method: 'delete',
url: '/api/pda/hrBcp/order/delete',
method: 'post',
data: ids
})
}

29
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrOrder/index.vue
View File

@@ -13,7 +13,7 @@
<el-form-item label="箱码">
<label slot="label">箱码:</label>
<el-input
v-model="query.type"
v-model="query.bar_code"
clearable
style="width: 180px"
placeholder="载具号"
@@ -42,7 +42,18 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
icon="el-icon-position"
size="mini"
type="danger"
@click="force(crud.selections)"
>
强制雀润
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table
ref="table"
@@ -52,6 +63,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="workshop_id" label="车间" min-width="100" show-overflow-tooltip />
<el-table-column prop="type" label="出入库类型" min-width="100" show-overflow-tooltip />
<el-table-column prop="order_id" label="顺序id" min-width="100" show-overflow-tooltip />
@@ -142,8 +154,19 @@ export default {
created() {
},
methods: {
force(rows){
if (rows.length > 0){
let ids = []
rows.forEach((item) => {
ids.push(item.order_id)
})
crudHrorder.del(ids).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}
}
</script>