add:入库混料

This commit is contained in:
2025-12-01 17:30:36 +08:00
parent 5c03f3e82c
commit 87f6cc442c
17 changed files with 1246 additions and 107 deletions

View File

@@ -0,0 +1,216 @@
<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="物料查询">
<el-input
v-model="query.material_code"
clearable
size="mini"
placeholder="物料编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="批次号">
<el-input
v-model="query.pcsn"
clearable
size="mini"
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<rrOperation />
<!--如果想在工具栏加入更多按钮可以使用插槽方式 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="1200px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" @change="queryMater" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" disabled style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="form.material_spec" disabled style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料批号" prop="pcsn">
<el-input v-model="form.pcsn" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料重量" prop="qty">
<el-input-number v-model="form.qty" :precision="2" :controls="false" :min="1" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
</el-form-item>
</el-col>
</el-row>
</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="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="qty" label="收货重量" :formatter="crud.formatNum3" :min-width="100" />
<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
v-permission="['admin','Supplierbase:edit','Supplierbase:del']"
label="操作"
width="150px"
lign="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 crudPackaging from '@/views/wms/pdm_manage/packaging/packaging'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import crudGroup from '@/views/wms/basedata/group/group'
const defaultForm = {
packing_id: null,
material_id: null,
pcsn: null,
qty: null,
is_transfer: null,
remark: null,
create_id: null,
create_name: null,
create_time: null,
material_spec: null,
material_code: null,
material_name: null
}
export default {
name: 'Packaging',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典
dicts: [],
cruds() {
return CRUD({
title: '外包材收货',
url: 'api/packaging',
optShow: {
add: true,
edit: false,
del: false,
download: false,
reset: true
},
idField: 'packing_id',
sort: 'packing_id,desc',
crudMethod: { ...crudPackaging }
})
},
data() {
return {
permission: {},
rules: {
material_code: [
{ required: true, message: '物料不能为空', trigger: 'blur' }
],
pcsn: [
{ required: true, message: '批次不能为空', trigger: 'blur' }
],
qty: [
{ required: true, message: '收货重量不能为空', trigger: 'blur' }
]
}
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
queryMater(value) {
crudGroup.queryMater({ 'material_code': value }).then(row => {
this.form.material_spec = row.material_spec
this.form.material_name = row.material_name
this.form.material_id = row.material_id
}).catch(() => {
this.form.material_spec = ''
this.form.material_name = ''
this.form.material_code = ''
this.form.material_id = ''
})
}
}
}
</script>
<style scoped>
</style>

View File

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

View File

@@ -0,0 +1,142 @@
<template>
<el-dialog
title="库存选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1000px"
@close="close"
@open="open"
>
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="物料查询">
<el-input
v-model="query.material_code"
clearable
size="mini"
placeholder="物料编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="批次号">
<el-input
v-model="query.pcsn"
clearable
size="mini"
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="clickChange"
>
<el-table-column label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="qty" label="收货重量" :formatter="crud.formatNum3" :min-width="100" />
<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>
<!--分页组件-->
<pagination />
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
</span>
</el-dialog>
</template>
<script>
import crudPackaging from '@/views/wms/pdm_manage/packaging/packaging'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
export default {
name: 'AddDtl',
components: { crudOperation, rrOperation, pagination },
cruds() {
return CRUD({
title: '新增转运物料',
optShow: {
add: false,
edit: false,
del: false,
reset: true,
download: false
},
url: 'api/packaging',
idField: 'packing_id',
sort: 'packing_id,desc'
})
},
mixins: [presenter(), header()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
tableRadio: null,
dialogVisible: false,
sect: {},
rows: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
this.crud.toQuery()
},
close() {
this.tableRadio = null
this.$emit('update:dialogShow', false)
},
clickChange(item) {
this.tableRadio = item
},
submit() {
if (!this.tableRadio) {
this.$message('请先勾选仓位')
return
}
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.tableRadio)
this.tableRadio = null
}
}
}
</script>

View File

@@ -0,0 +1,242 @@
<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="物料查询">
<el-input
v-model="query.material_code"
clearable
size="mini"
placeholder="物料编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="批次号">
<el-input
v-model="query.pcsn"
clearable
size="mini"
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<rrOperation />
<!--如果想在工具栏加入更多按钮可以使用插槽方式 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="1200px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" disabled style="width: 200px;">
<el-button slot="append" icon="el-icon-search" @click="queryIvt()" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" disabled style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="form.material_spec" disabled style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料批号" prop="pcsn">
<el-input v-model="form.pcsn" disabled style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="转运重量" prop="qty">
<el-input-number v-model="form.qty" disabled :precision="2" :controls="false" :min="1" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="转运点位" prop="point_code">
<el-select
v-model="form.point_code"
clearable
size="mini"
placeholder="全部"
class="filter-item"
style="width: 200px;"
>
<el-option
v-for="item in pointList"
:key="item.point_code"
:label="item.point_name"
:value="item.point_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</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="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="qty" label="转运重量" :formatter="crud.formatNum3" :min-width="100" />
<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
v-permission="['admin','Supplierbase:edit','Supplierbase:del']"
label="操作"
width="150px"
lign="center"
fixed="right"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDtl :dialog-show.sync="AddDtlShow" @tableChanged="tableChanged" />
</div>
</template>
<script>
import crudPackaging from '@/views/wms/pdm_manage/packaging/packaging'
import AddDtl from '@/views/wms/pdm_manage/transfer/AddDtl'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
const defaultForm = {
packing_id: null,
material_id: null,
pcsn: null,
qty: null,
is_transfer: null,
remark: null,
create_id: null,
create_name: null,
create_time: null,
material_spec: null,
material_code: null,
point_code: null,
material_name: null
}
export default {
name: 'Transfer',
components: { pagination, crudOperation, rrOperation, udOperation, AddDtl },
mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典
dicts: [],
cruds() {
return CRUD({
title: '外包材转运',
url: 'api/packaging/queryTransfer',
optShow: {
add: true,
edit: false,
del: false,
download: false,
reset: true
},
idField: 'create_time',
sort: 'create_time,desc',
crudMethod: { ...crudPackaging }
})
},
data() {
return {
permission: {},
pointList: [],
AddDtlShow: false,
rules: {
material_code: [
{ required: true, message: '转运物料不能为空', trigger: 'blur' }
],
pcsn: [
{ required: true, message: '转运批次不能为空', trigger: 'blur' }
],
qty: [
{ required: true, message: '转运重量不能为空', trigger: 'blur' }
],
point_code: [
{ required: true, message: '转运点位不能为空', trigger: 'blur' }
]
}
}
},
created() {
crudSchBasePoint.getPointList({ 'region_code': 'WBCZC01' }).then(res => {
this.pointList = res
})
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
queryIvt() {
this.AddDtlShow = true
},
tableChanged(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_name = row.material_name
this.form.material_spec = row.material_spec
this.form.pcsn = row.pcsn
this.form.qty = row.qty
}
}
}
</script>
<style scoped>
</style>

View File

@@ -292,11 +292,11 @@ export default {
this.form.detail_count = this.form.tableData.length
},
deleteRow(index, rows) {
const pcsn = rows[index].pcsn
const vehicle_code = rows[index].vehicle_code
let len = rows.length
while (len--) {
const obj = rows[len]
if (pcsn === obj.pcsn) {
if (vehicle_code === obj.vehicle_code) {
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
@@ -307,20 +307,23 @@ export default {
}
},
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.pcsn === item.pcsn) {
same_mater = false
// 根据载具编码查询载具下的所有组盘信息
crudRawAssist.getVehicleGroup({ 'rows': rows }).then(res => {
rows = res
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.pcsn === item.pcsn) {
same_mater = false
}
})
if (same_mater) {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
})
if (same_mater) {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
this.form.detail_count = this.form.tableData.length
})
this.form.detail_count = this.form.tableData.length
},
async insertEvent(row) {
if (this.form.bill_type === '') {

View File

@@ -93,5 +93,15 @@ export function getInBillTaskDtl(data) {
})
}
export function getVehicleGroup(data) {
return request({
url: '/api/in/rawAssist/getVehicleGroup',
method: 'post',
data
})
}
export default { add, edit, del, getIODtl, commit,
deleteDisDtl, getDisDtl, divStruct, unDivStruct, divPoint, confirm, getInBillTaskDtl }
deleteDisDtl, getDisDtl, divStruct, unDivStruct, divPoint, confirm, getInBillTaskDtl,
getVehicleGroup
}