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

rev : 出库分配

Browse Source
This commit is contained in:
liuxy
2023-05-25 20:38:18 +08:00
parent f530e6d7b4
commit 65822e1864
37 changed files with 797 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
View File

@@ -325,27 +325,6 @@ export default {
}
}
},
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
same_mater = false
}
})
if (same_mater) {
item.quality_scode = '01'
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = '0'
item.edit = true
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
},
tableChanged1(row) {
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
@@ -356,6 +335,28 @@ export default {
},
tableChanged2(row) {
let same_mater = true
this.form.tableData.forEach((item) => {
if (item.source_bill_code === row.sale_code) {
same_mater = false
}
})
if (same_mater) {
const data = {}
data.material_id = row.material_id
data.material_code = row.material_code
data.material_name = row.material_name
data.plan_qty = row.product_qty
data.qty_unit_name = row.qty_unit_name
data.qty_unit_id = row.qty_unit_id
data.source_billdtl_id = row.sale_id
data.source_bill_type = row.sale_type
data.source_bill_code = row.sale_code
data.edit = true
this.form.tableData.splice(-1, 0, data)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(data.plan_qty)
this.form.detail_count = this.form.tableData.length
}
},
insertEvent(row) {

27
mes/qd/src/views/wms/storage_manage/product/productIn/AddDtl.vue
View File

@@ -20,7 +20,7 @@
>
<el-form-item label="销售单号">
<el-input
v-model="query.bill_code"
v-model="query.sale_code"
size="mini"
clearable
placeholder="销售单号"
@@ -30,14 +30,14 @@
<el-form-item label="客户编码">
<el-input
v-model="query.bill_code"
v-model="query.cust_code"
size="mini"
clearable
placeholder="客户编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!--
<el-form-item label="创建日期">
<el-date-picker
v-model="query.createTime"
@@ -48,7 +48,7 @@
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
</el-form-item>-->
<rrOperation />
</el-form>
@@ -62,8 +62,13 @@
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
@current-change="clickChange"
>
<el-table-column type="selection" width="55" />
<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 show-overflow-tooltip width="150" prop="sale_code" label="销售单号" />
<el-table-column show-overflow-tooltip width="150" prop="sale_type" label="销售单类型" />
<el-table-column show-overflow-tooltip width="150" prop="status" label="状态" />
@@ -72,6 +77,7 @@
<el-table-column show-overflow-tooltip width="150" prop="sale_qty" label="销售数量" />
<el-table-column show-overflow-tooltip width="150" prop="cust_code" label="客户编码" />
<el-table-column show-overflow-tooltip width="150" prop="cust_name" label="客户名称" />
<el-table-column show-overflow-tooltip width="150" prop="product_qty" label="生产数量" />
<el-table-column show-overflow-tooltip width="150" prop="qty_unit_name" label="单位" />
<el-table-column show-overflow-tooltip width="150" prop="plandeliver_date" label="计划交期" />
<el-table-column show-overflow-tooltip width="150" prop="create_name" label="创建人" />
@@ -104,7 +110,7 @@ export default {
cruds() {
return CRUD({
title: '用户',
url: '/api/mdPbBucketrecord',
url: '/api/mpsSaleOrder',
crudMethod: {},
optShow: {
reset: true
@@ -125,6 +131,7 @@ export default {
return {
dialogVisible: false,
rows: [],
tableRadio: null,
tableData: []
}
},
@@ -146,13 +153,13 @@ export default {
close() {
this.$emit('update:dialogShow', false)
},
clickChange(item) {
this.tableRadio = item
},
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
crudProductIn.queryBoxMater(this.rows).then(res => {
this.rows = res
this.$emit('tableChanged', this.rows)
})
this.$emit('tableChanged', this.tableRadio)
}
}
}

44
mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
View File

@@ -325,27 +325,6 @@ export default {
}
}
},
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
same_mater = false
}
})
if (same_mater) {
item.quality_scode = '01'
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = '0'
item.edit = true
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
},
tableChanged1(row) {
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
@@ -356,7 +335,28 @@ export default {
},
tableChanged2(row) {
let same_mater = true
this.form.tableData.forEach((item) => {
if (item.source_bill_code === row.sale_code) {
same_mater = false
}
})
if (same_mater) {
const data = {}
data.material_id = row.material_id
data.material_code = row.material_code
data.material_name = row.material_name
data.plan_qty = row.delivery_qty
data.qty_unit_name = row.qty_unit_name
data.qty_unit_id = row.qty_unit_id
data.source_billdtl_id = row.sale_id
data.source_bill_type = row.sale_type
data.source_bill_code = row.sale_code
data.edit = true
this.form.tableData.splice(-1, 0, data)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(data.plan_qty)
this.form.detail_count = this.form.tableData.length
}
},
insertEvent(row) {
this.dtlShow = true

138
mes/qd/src/views/wms/storage_manage/product/productOut/AddDtl.vue
View File

@@ -1,7 +1,6 @@
<!--suppress ALL -->
<template>
<el-dialog
title="物料选择"
title="单据选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
@@ -11,38 +10,58 @@
@open="open"
>
<div class="head-container">
<div>
<!-- 搜索 -->
<el-input
v-model="query.material_code"
clearable
size="mini"
placeholder="物料编码、名称"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.material_spec"
clearable
size="mini"
placeholder="物料规格"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.pcsn"
clearable
size="mini"
placeholder="订单号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation />
</div>
</div>
<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.deliver_code"
size="mini"
clearable
placeholder="销售单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="销售单号">
<el-input
v-model="query.sale_code"
size="mini"
clearable
placeholder="销售单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="客户编码">
<el-input
v-model="query.cust_code"
size="mini"
clearable
placeholder="客户编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!--
<el-form-item label="创建日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>-->
<rrOperation />
</el-form>
<!--表格渲染-->
<el-table
ref="multipleTable"
@@ -51,19 +70,25 @@
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="clickChange"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',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_name',crud.data,'物料规格')" />
<el-table-column prop="struct_code" label="点位" :min-width="flexWidth('struct_name',crud.data,'点位')" />
<el-table-column prop="pcsn" label="订单号" :min-width="flexWidth('pcsn',crud.data,'订单号')" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="可用数" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
<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 show-overflow-tooltip width="150" prop="deliver_code" label="单据号" />
<el-table-column show-overflow-tooltip width="150" prop="status" label="状态" />
<el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip width="150" prop="cust_code" label="客户编码" />
<el-table-column show-overflow-tooltip width="150" prop="cust_name" label="客户名称" />
<el-table-column show-overflow-tooltip width="150" prop="delivery_qty" label="数量" />
<el-table-column show-overflow-tooltip width="150" prop="qty_unit_name" label="单位" />
</el-table>
<!--分页组件-->
<pagination />
</div>
<span slot="footer" class="dialog-footer">
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
<el-button slot="left" type="primary" @click="submit">保存</el-button>
@@ -73,16 +98,17 @@
<script>
import CRUD, { header, presenter } from '@crud/crud'
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: { rrOperation, pagination },
components: { rrOperation, pagination, crudOperation },
cruds() {
return CRUD({
title: '用户', url: 'api/productOut/addDtl',
title: '用户', url: 'api/stIfDeliveryorderCp',
optShow: {
add: false,
edit: false,
@@ -113,6 +139,7 @@ export default {
dialogVisible: false,
opendtlParam: '',
rows: [],
tableRadio:null,
openShow: true
}
},
@@ -130,14 +157,7 @@ export default {
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.mater_type = this.opendtlParam
this.crud.query.stor_id = this.storId
if (this.openShow) {
this.openShow = false
return false
} else {
return true
}
return true
},
close() {
this.crud.resetQuery(false)
@@ -148,15 +168,13 @@ export default {
open() {
this.crud.query.mater_type = this.opendtlParam
},
clickChange(item) {
this.tableRadio = item
},
submit() {
this.rows = this.$refs.multipleTable.selection
if (this.rows.length <= 0) {
this.$message('请先勾选物料')
return
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
this.rows = this.$refs.multipleTable.selection
this.$emit('tableChanged', this.tableRadio)
}
}
}

99
mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
View File

@@ -44,7 +44,7 @@
type="primary"
icon="el-icon-plus"
size="mini"
@click="allDiv()"
@click="allDivIvt()"
>
全部分配
</el-button>
@@ -65,7 +65,6 @@
type="primary"
icon="el-icon-check"
size="mini"
:disabled="button1"
@click="oneDiv()"
>
自动分配
@@ -76,7 +75,6 @@
type="primary"
icon="el-icon-check"
size="mini"
:disabled="button2"
@click="oneCancel()"
>
自动取消
@@ -111,7 +109,6 @@
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="订单号" align="center" width="140px" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
@@ -169,7 +166,6 @@
:loading="loadingSetAllPoint"
type="warning"
icon="el-icon-check"
:disabled="button5"
size="mini"
@click="allSetPoint"
>
@@ -238,7 +234,7 @@ export default {
type: Boolean,
default: false
},
rowmst: {
rowMst: {
type: Object
},
openArray: {
@@ -262,10 +258,6 @@ export default {
pointshow: false,
structshow: false,
button1: true,
button2: true,
button3: true,
button4: true,
button5: true,
tableDtl: [],
openParam: [],
mstrow: {},
@@ -299,7 +291,7 @@ export default {
this.tableDtl = newValue
}
},
rowmst: {
rowMst: {
handler(newValue, oldValue) {
this.mstrow = newValue
}
@@ -357,62 +349,32 @@ export default {
this.mstrow.sect_id = val[1]
}
},
deleteRow(row) {
productOut.oneCancel(row).then(res => {
this.queryTableDtl()
})
},
handleDtlCurrentChange(current) {
if (current !== null) {
this.currentRow = current
this.form2.unassign_qty = current.unassign_qty
this.form2.assign_qty = current.assign_qty
this.tabledis = []
if (current.bill_status === '10') {
this.button1 = false
this.button2 = true
this.button5 = false
this.button3 = false
} else if (current.bill_status === '20') {
this.button1 = false
this.button2 = false
this.button3 = false
this.button5 = false
} else if (current.bill_status === '30') {
this.button1 = true
this.button2 = false
this.button3 = true
this.button5 = false
}
this.queryTableDdis(current.iostorinvdtl_id)
} else {
this.button1 = true
this.button2 = true
this.button3 = true
this.button5 = true
this.mstrow.iostorinvdtl_id = ''
this.currentRow = {}
this.tabledis = []
}
this.queryTableDdis(current)
},
handleDisCurrentChange(current) {
if (current !== null) {
this.currentDis = current
if (current.work_status === '01' || current.work_status === '00') {
this.button4 = false
} else {
this.button4 = true
}
} else {
this.button4 = true
this.mstrow.iostorinvdis_id = ''
this.currentDis = {}
}
},
allDiv() {
queryTableDtl() {
productOut.getIosInvDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
this.tableDtl = res
})
},
queryTableDdis(row) {
productOut.getIosInvDis({ 'iostorinvdtl_id': row.iostorinvdtl_id, 'iostorinv_id': row.iostorinv_id }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
})
},
allDivIvt() {
if (this.mstrow.sect_id === '') {
this.crud.notify('请选择库区！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.loadingAlldiv = true
productOut.allDiv(this.mstrow).then(res => {
this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.INFO)
productOut.allDivIvt({ 'iostorinv_id': this.mstrow.iostorinv_id, 'sect_id': this.mstrow.sect_id, 'stor_id': this.mstrow.stor_id }).then(res => {
this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.queryTableDtl()
this.loadingAlldiv = false
}).catch(() => {
@@ -443,18 +405,7 @@ export default {
})
}
},
queryTableDtl() {
productOut.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
this.tableDtl = res
})
},
queryTableDdis(iostorinvdtl_id) {
productOut.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
})
},
cellStyle({ row, column, rowIndex, columnIndex }) {
const assign_qty = parseFloat(row.assign_qty)
const plan_qty = parseFloat(row.plan_qty)

2
mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
View File

@@ -169,7 +169,7 @@
</div>
<AddDialog @AddChanged="querytable" />
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
<DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
<DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :row-mst="mstrow" @DivChanged="querytable" />
</div>
</template>

25
mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
View File

@@ -32,4 +32,27 @@ export function getIosInvDtl(data) {
})
}
export default { add, edit, del, getIosInvDtl }
export function getIosInvDis(data) {
return request({
url: 'api/productOut/getIosInvDis',
method: 'post',
data
})
}
export function allDivIvt(data) {
return request({
url: 'api/productOut/allDivIvt',
method: 'post',
data
})
}
export default {
add,
edit,
del,
getIosInvDtl,
getIosInvDis,
allDivIvt
}