diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index 6b20a96d..4893b14b 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -35,14 +35,15 @@ export function searchgroup(num) { }) } // 组件查询 -export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '质检管理_质量情况_查询数据', - param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4, + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js index 01fb227d..46ee1692 100644 --- a/src/api/Inventory/MaterialOut.js +++ b/src/api/Inventory/MaterialOut.js @@ -1,5 +1,39 @@ import request from '@/utils/request' +// 初始化人员 +export function initPickPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0' + } + }) +} +// 初始化机床项目 +export function initMachineProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} // 领料单查询 export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { return request({ @@ -37,3 +71,15 @@ export function searchStockNumber(...params) { } }) } +// 出库 +export function submitOutStore(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料出库_出库记录_增加数据', + param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}` + } + }) +} diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index 8f674b1f..cb7e60ce 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -62,14 +62,14 @@ 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) { +export function production2(num1, num, 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' + param: '零件图号=' + num1 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=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' } }) } diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js index f5863d45..52e3273b 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/api/TechnologyCenter/QueryParts.js @@ -81,3 +81,14 @@ export function deletePurchaseData(num) { } }) } +export function getFileData(MachineDrawValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床总图_查询数据', + param: `机床流水号=${MachineDrawValue}` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index c609d18e..39e0294c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,14 +11,16 @@ export const name1 = `OP1000` export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement -export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 +// 技术中心程序发布时要更改下面所有的IP到0段 +export const ServerIP = `http://192.168.1.231:8411/webpage/file/` +export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 +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`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 10673baf..bb0d5683 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -31,6 +31,22 @@ 零件: + 时间区间: + + ~ + 查询 @@ -130,6 +146,8 @@ export default { return { machineNumberValue: '', machineNumber: [], + startTime: '', + endTime: '', groupNumberValue: '', groupNumber: [], QualityTypeNumber: [], @@ -190,7 +208,9 @@ export default { if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 } if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 } if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 } - selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.pageCurrent, this.pageSize).then(response => { + if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 } + if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 } + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.pageCurrent, this.pageSize).then(response => { this.tableData1 = response.data.rows this.loading = false this.total = response.data.total diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 09584add..47290aae 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -282,6 +282,11 @@ {{ scope.row.备件数量 }} + + +