diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js index 643fe665..bbf40ff2 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/api/Inventory/CreatePickingList.js @@ -84,7 +84,7 @@ export function dropList(num) { } }) } -// 选入领料单 +// 查询领料单明细 export function searchListDetail(...params) { return request({ url: '', diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js new file mode 100644 index 00000000..01fb227d --- /dev/null +++ b/src/api/Inventory/MaterialOut.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 领料单查询 +export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_查询数据', + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询领料单明细 +export function searchListDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单明细_查询数据', + param: `领料单流水号=${params[0]}` + } + }) +} +// 查看领料单明细相关的物料货位数量 +export function searchStockNumber(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料出库_标准件和外购件_查询数据', + param: `物料流水号=${params[0]}` + } + }) +} diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index 20649ab8..8f674b1f 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -61,6 +61,18 @@ export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, } }) } +// 合并投产 +export function production2(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产', + param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int' + } + }) +} // 获取表2的值 export function getTable1(num, pageList, pageSize) { return request({ diff --git a/src/icons/svg/CreatePickingList.svg b/src/icons/svg/CreatePickingList.svg new file mode 100644 index 00000000..343a5d73 --- /dev/null +++ b/src/icons/svg/CreatePickingList.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialOut.svg b/src/icons/svg/MaterialOut.svg new file mode 100644 index 00000000..2cb31100 --- /dev/null +++ b/src/icons/svg/MaterialOut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index c609d18e..750f3023 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 15561bbd..09584add 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -577,7 +577,7 @@ export default { selectIntoList(basePartGroup, null, this.pickingListNum).then(response => { if (response.data[0].result === '1') { this.$message.success('操作成功') - this.multipleSelection = [] + this.searchTable() this.clickList() } else { this.$message.error('操作失败') } }) @@ -585,7 +585,7 @@ export default { selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => { if (response.data[0].result === '1') { this.$message.success('操作成功') - this.multipleSelection = [] + this.searchTable() this.clickList() } else { this.$message.error('操作失败') } }) diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue new file mode 100644 index 00000000..22fd780a --- /dev/null +++ b/src/views/Inventory/MaterialOut/index.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 72f38820..c213cdb2 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -164,6 +164,7 @@