meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0

Browse Source
This commit is contained in:
liushuai
2018-11-23 13:38:19 +08:00
parent eca32011fd 8042d3416b
commit e8ca1f78a5
10 changed files with 172 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/api/Inventory/GenneralPart.js Normal file
View File

@@ -0,0 +1,48 @@
import request from '@/utils/request'
// 查询零件入库情况
export function searchTable(partnumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号',
param: '零件图号=' + partnumber + '=string'
}
})
}
// 仓库查询
export function getinventory() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位主文件_仓库查询'
}
})
}
// 货位查询
export function getlocate(housenumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位主文件_查询数据',
param: '仓库流水号=' + housenumber + '=int'
}
})
}
// 修改入库数量
export function insertOne(num0, num1, people, num4, num5, num6, num7) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'MES_机加工MES_库存管理_入库模块_增加入库信息_修改入库数量',
param: '工艺计划流水号=' + num0 + '=int&入库数量=' + num1 + '=int&收件人员编号=' + people + '=int&送件人员编号=1001' + '&漆塑=' + num4 + '&仓库流水号=' + num5 + '&货位流水号=' + num6 + '&备注=' + num7
}
})
}

16
src/api/Inventory/PartOut.js
View File

@@ -1,14 +1,14 @@
import request from '@/utils/request' import request from '@/utils/request'
// 领料单查询 // 领料单查询
export function searchList(listNumber) { export function searchList(listNumber_check, listNumber) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间装配管理_领料单_领料单查询', name: '车间装配管理_领料单_领料单查询',
param: '领料单编号=' + listNumber param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber
} }
}) })
} }
@@ -24,6 +24,18 @@ export function searchListDetail(listNumber) {
} }
}) })
} }
// 领料单明细出库
export function ListDetailOut(listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单明细出库',
param: '领料单明细流水号=' + listNumber
}
})
}
// 外购件零件出库 // 外购件零件出库
export function PurchasePart(data1, data2, data3, data4, data5) { export function PurchasePart(data1, data2, data3, data4, data5) {
return request({ return request({

4
src/api/Inventory/PickingList.js
View File

@@ -136,14 +136,14 @@ export function dropListDetail(DetailNumberx) {
}) })
} }
// 增加领料单明细 // 增加领料单明细
export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6) { export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6, data7) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间装配管理_领料单_领料单明细增加', name: '车间装配管理_领料单_领料单明细增加',
param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7
} }
}) })
} }

5
src/utils/request.js
View File

@@ -10,9 +10,14 @@ export const name = `OP8888`
export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx` export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx` export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
const service = axios.create({ const service = axios.create({
<<<<<<< HEAD
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
=======
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
>>>>>>> 3b215d048bf49b3019c70e80ff7dbd7ebd5869a4
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

4
src/views/Inventory/genneralPart/index.vue → src/views/Inventory/GenneralPart/index.vue
View File

@@ -90,7 +90,7 @@
</template> </template>
<script> <script>
import { searchTable, insertOne, getinventory, getlocate } from '@/api/Inventory/Inboundscanning' import { searchTable, insertOne, getinventory, getlocate } from '@/api/Inventory/GenneralPart'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { wsuri, name } from '@/utils/request' import { wsuri, name } from '@/utils/request'
import print from '@/vendor/print' import print from '@/vendor/print'
@@ -245,7 +245,7 @@ export default {
this.locateName = [] this.locateName = []
this.locateNumber = '' this.locateNumber = ''
if (this.inventoryNumber) { if (this.inventoryNumber) {
this.getSelect(getlocate, ['货位名称'], 'locateName', this.inventoryNumber) this.getSelect(getlocate, ['货位名称', '货位流水号'], 'locateName', this.inventoryNumber)
} }
} }
} }

26
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -212,18 +212,22 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
for (let i = 0; i < this.tableData.length; i++) { if (this.locateNumber === '') {
if (this.tableData[i].innumber > this.tableData[i].plannumber) { this.$message.error('请选择货位')
this.tableData[i].innumber = this.tableData[i].plannumber } else {
} for (let i = 0; i < this.tableData.length; i++) {
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => { if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.$message({ this.tableData[i].innumber = this.tableData[i].plannumber
type: 'success', }
message: '零件入库成功!' insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
this.$message({
type: 'success',
message: '零件入库成功!'
})
}).then(() => {
this.Empty()
}) })
}).then(() => { }
this.Empty()
})
} }
}).catch(() => { }).catch(() => {
this.$message({ this.$message({

48
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -72,7 +72,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120"> <el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchBasicPartRecord(scope.row)">选择</el-button> <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchBasicPartRecord(scope.row)">选择</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -114,11 +114,6 @@
{{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '' }} {{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<el-table <el-table
v-loading="listLoading2" v-loading="listLoading2"
@@ -151,11 +146,6 @@
{{ scope.row.出库备注 }} {{ scope.row.出库备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
@@ -232,7 +222,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120"> <el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchGeneralPartRecord(scope.row)">选择</el-button> <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchGeneralPartRecord(scope.row)">选择</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -274,11 +264,6 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }} {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<el-table <el-table
v-loading="listLoading5" v-loading="listLoading5"
@@ -306,11 +291,6 @@
{{ scope.row.领用者 }} {{ scope.row.领用者 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
@@ -385,7 +365,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120"> <el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button> <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -427,11 +407,6 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }} {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<el-table <el-table
v-loading="listLoading8" v-loading="listLoading8"
@@ -459,11 +434,6 @@
{{ scope.row.领用者 }} {{ scope.row.领用者 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
@@ -540,7 +510,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200px"> <el-table-column label="操作" align="center" width="200px">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="mini" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button> <el-button size="mini" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button> <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
</template> </template>
</el-table-column> </el-table-column>
@@ -595,11 +565,6 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }} {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<el-table <el-table
v-loading="listLoading11" v-loading="listLoading11"
@@ -627,11 +592,6 @@
{{ scope.row.领用者 }} {{ scope.row.领用者 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>

6
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -32,7 +32,7 @@
</el-table-column> </el-table-column>
<el-table-column label="联系人" align="center"> <el-table-column label="联系人" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.联系人 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" width="180" align="center"> <el-table-column label="备注" width="180" align="center">
@@ -52,10 +52,6 @@
icon="el-icon-edit" icon="el-icon-edit"
type="primary" type="primary"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right">
<template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"

23
src/views/Inventory/PartOut/index.vue
View File

@@ -84,7 +84,7 @@
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button> <el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -93,7 +93,7 @@
</template> </template>
<script> <script>
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart } from '@/api/Inventory/PartOut' import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut } from '@/api/Inventory/PartOut'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
data() { data() {
@@ -113,6 +113,7 @@ export default {
tableDataPicking: [], // 领料单明细表格 tableDataPicking: [], // 领料单明细表格
listNumber: '', listNumber: '',
pickingListNumber: null, // 领料单编号 pickingListNumber: null, // 领料单编号
pickingListNumber_check: 1,
pickingListNumberx: '', // 领料单流水号 pickingListNumberx: '', // 领料单流水号
picikingPeople: '', // 领料人流水号 picikingPeople: '', // 领料人流水号
partProjectNumber: '', // 项目流水号 partProjectNumber: '', // 项目流水号
@@ -144,8 +145,14 @@ export default {
}, },
// 查询领料单 // 查询领料单
searchListinfor() { searchListinfor() {
if (this.pickingListNumber === null) {
this.pickingListNumber_check = 0
}
this.listLoading = true this.listLoading = true
searchList(this.pickingListNumber).then(response => { searchList(this.pickingListNumber_check, this.pickingListNumber).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].领料时间 = response.data[i].领料时间.substring(0, response.data[i].领料时间.length - 8)
}
this.tableData1 = response.data this.tableData1 = response.data
this.listLoading = false this.listLoading = false
}) })
@@ -154,7 +161,11 @@ export default {
searchListDetailt() { searchListDetailt() {
this.listLoading1 = true this.listLoading1 = true
searchListDetail(this.pickingListNumberx).then(response => { searchListDetail(this.pickingListNumberx).then(response => {
this.tableDataPicking = response.data const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataPicking = data
this.listLoading1 = false this.listLoading1 = false
}) })
}, },
@@ -171,12 +182,14 @@ export default {
if (row.车间外购 === 1) { if (row.车间外购 === 1) {
WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功') this.$message.success('出库成功')
} else { this.$message.error('出库失败') } } else { this.$message.error('出库失败') }
}) })
} else if (row.零件类型 === 1 || row.零件类型 === 2) { } else if (row.零件类型 === 1 || row.零件类型 === 2) {
PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功') this.$message.success('出库成功')
} else { this.$message.error('出库失败') } } else { this.$message.error('出库失败') }
}) })
@@ -184,9 +197,11 @@ export default {
BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, row.备注).then(response => { BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, row.备注).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('出库成功') this.$message.success('出库成功')
ListDetailOut(row.领料单明细流水号)
} else { this.$message.error('增加失败') } } else { this.$message.error('增加失败') }
}) })
} }
this.searchListDetailt()
} }
} }
} }

85
src/views/Inventory/PickingList/index.vue
View File

@@ -168,11 +168,21 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</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"> <template slot-scope="scope">
{{ scope.row.可出库数量 }} {{ scope.row.可出库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</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" align="center"> <template slot-scope="scope" align="center">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -240,11 +250,21 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</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"> <template slot-scope="scope">
{{ scope.row.货位存量 }} {{ scope.row.货位存量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</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"> <template slot-scope="scope">
{{ scope.row.类型名称 }} {{ scope.row.类型名称 }}
@@ -307,11 +327,21 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</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"> <template slot-scope="scope">
{{ scope.row.货位存量 }} {{ scope.row.货位存量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</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"> <template slot-scope="scope">
{{ scope.row.类型名称 }} {{ scope.row.类型名称 }}
@@ -525,7 +555,9 @@ export default {
listLoadingx: '', listLoadingx: '',
purchaseDetailNum: '', purchaseDetailNum: '',
dialogFormVisibleWork: false, dialogFormVisibleWork: false,
time: [] time: [],
materialLocate: '',
enableOut: ''
} }
}, },
computed: { computed: {
@@ -547,7 +579,7 @@ export default {
console.log(this.picikingPeople) console.log(this.picikingPeople)
}, },
searchMachine() { // 查询机床 searchMachine() { // 查询机床
if (this.ProjectValue === ' ') { if (this.ProjectValue === null) {
this.ProjectValue_check = 0 this.ProjectValue_check = 0
} }
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => { searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
@@ -742,26 +774,28 @@ export default {
this.materialName = row.零件名称 this.materialName = row.零件名称
this.materialType = row.零件类型名称 this.materialType = row.零件类型名称
this.materialNumber = row.零件图号 this.materialNumber = row.零件图号
this.enableOut = row.可出库数量
}, },
addBasicListDetail(formName) { addBasicListDetail(formName) {
if (this.pickingListNumberx === '') { if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单') this.$message.error('请选择领料单')
} if (this.form.OutNumber === '') { } else if (this.form.OutNumber === '' || this.form.OutNumber > this.enableOut) {
this.$message.error('请输入领用数量') this.$message.error('请正确输入领用数量')
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0, this.materialLocate).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
this.dialogFormVisible1 = false
this.searchListinfor()
}
})
} }
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
this.dialogFormVisible1 = false
this.searchListinfor()
}
})
}, },
// 增加外购件领料单明细 // 增加外购件领料单明细
addListDetailinfor(row) { addListDetailinfor(row) {
@@ -782,16 +816,18 @@ export default {
this.materialType = row.物料规格 this.materialType = row.物料规格
this.dialogFormVisible = true this.dialogFormVisible = true
this.purchaseDetailNum = row.采购合同明细流水号 this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
}, },
execaddListDetail(formName) { execaddListDetail(formName) {
if (this.pickingListNumberx === '') { if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单') this.$message.error('请选择领料单')
} else if (this.OutNumber === '') { } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
this.$message.error('请输入领用数量') this.$message.error('请正确输入领用数量')
} else { } else {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0).then(response => { addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('增加成功') this.$message.success('增加成功')
} else { } else {
@@ -821,16 +857,19 @@ export default {
this.materialType = row.物料规格 this.materialType = row.物料规格
this.dialogFormVisibleWork = true this.dialogFormVisibleWork = true
this.purchaseDetailNum = row.采购合同明细流水号 this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
console.log(this.enableOut)
}, },
addWorkshopListDetail(formName) { addWorkshopListDetail(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
if (this.pickingListNumberx === '') { if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单') this.$message.error('请选择领料单')
} else if (this.OutNumber === '') { } else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
this.$message.error('请输入领用数量') this.$message.error('请正确输入领用数量')
} else { } else {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1).then(response => { addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('增加成功') this.$message.success('增加成功')
} else { } else {