This commit is contained in:
chenjianan
2019-03-30 11:31:39 +08:00
parent 7c61b37ea7
commit 37172ad4f7
4 changed files with 29 additions and 8 deletions

View File

@@ -49,7 +49,18 @@ export function ExchangeOut(listNumber) {
}
})
}
// 滞货件出库
export function backlogPart(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_滞货件出库_修改数据',
param: `领料单明细流水号=${params[0]}&出库数量=${params[1]}&滞货物料与货位对照流水号=${params[2]}`
}
})
}
// 外购件零件出库
export function PurchasePart(listNumber, data1, data2, data3, data4, data5, data6) {
return request({

View File

@@ -200,7 +200,8 @@
</template>
<script>
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ErrorOut, ExchangeOut, ExchangePartOut } from '@/api/Inventory/PartOut'
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ErrorOut, ExchangeOut, ExchangePartOut,
backlogPart } from '@/api/Inventory/PartOut'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -295,6 +296,7 @@ export default {
},
// 选择领料单
chooseListinfor(row) {
console.log(row, 99)
this.pickingListNumberx = row.领料单流水号
this.getpicikingPeople = row.领料人流水号
this.searchListDetailt()
@@ -325,26 +327,33 @@ export default {
},
// 出库
partOut(row) {
console.log(row.领料单明细流水号, row.出库数量, row.滞货物料与货位对照流水号)
this.$confirm('确认出库?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (row.出库类型 === 3) {
if (row.出库类型 === 4) { // 滞货件
backlogPart(row.领料单明细流水号, row.出库数量, row.滞货物料与货位对照流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
} else { this.$message.error('出库失败') }
})
} else if (row.出库类型 === 3) { // 车间采购件
WorkShopPart(row.领料单明细流水号, row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.出库类型 === 2) {
} else if (row.出库类型 === 2) { // 采购件
PurchasePart(row.领料单明细流水号, row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else {
} else { // 自制件
BasicPart(row.领料单明细流水号, row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')

View File

@@ -335,7 +335,7 @@
</el-table-column>
<el-table-column label="可出库数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.可出库数量 = scope.row.关联数 - scope.row.待出库数量 }}
{{ scope.row.可出库数量 = scope.row.货位余 - scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
@@ -738,7 +738,7 @@ export default {
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
label: response.data[i].件名称,
label: response.data[i].,
value: response.data[i].组件流水号
})
}

View File

@@ -107,7 +107,7 @@
<!--</el-tooltip>-->
</template>
</el-table-column>
<el-table-column label="滞货数量" align="center" min-width="80">
<el-table-column label="可用滞货数量" align="center" min-width="80">
<template slot-scope="scope">
{{ Number(scope.row.滞货数量) }}
</template>
@@ -775,6 +775,7 @@ export default {
let check1
this.materialName ? check1 = 1 : check1 = 0
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, this.id).then(response => {
console.log(response.data.rows)
this.tableData11 = response.data.rows
this.total11 = response.data.total
})