diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js index e31a8cdb..a0b8dad4 100644 --- a/src/api/Inventory/MaterialOut.js +++ b/src/api/Inventory/MaterialOut.js @@ -99,20 +99,6 @@ export function searchStockNumber2(...params) { } }) } -// 查看领料单明细相关的物料货位数量 -export function searchStockNumber3(...params) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '库存管理_物料出库_车间采购件_查询数据', - param: `请购单明细流水号=${params[0]}` - } - }) -} // 出库 export function submitOutStore(...params) { return request({ diff --git a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js index 2af1fd65..e009013e 100644 --- a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js +++ b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js @@ -67,7 +67,7 @@ export function searchTable1(num) { } }) } -export function searchTable2(check1, machineNameValue, pageCurrent1, pageSize1) { +export function searchTable2(check1, machineNameValue, check2, time1, time2, pageCurrent1, pageSize1) { return request({ url: '', method: 'post', @@ -76,8 +76,21 @@ export function searchTable2(check1, machineNameValue, pageCurrent1, pageSize1) ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_传递后_零件报废补投_查询数据_按机床查询', - param: '机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue, + param: '机床流水号_check=' + check1 + '&机床流水号=' + machineNameValue + '&报废日期_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2, pagination: pageCurrent1 + '&' + pageSize1 } }) } +export function TableDta2Select(CutCode) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_零件工艺计划_报废零件记录_查询工序', + param: '补投流水号=' + CutCode + } + }) +} diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index df5af332..4079d88c 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -145,21 +145,21 @@ export function revisionBatch(num, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, }) } // 编辑 -export function editList(num, a, b, c) { +export function editList(num, a, b, c, d) { return request({ url: '', method: 'post', data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '2', + type: '1', name: '车间生产管理工艺_零件工艺计划_修改批次数量', - param: '工艺计划流水号=' + num + '=int&批次数量=' + a + '=string&机加工开始时间=' + b + '=string&机加工结束时间=' + c + '=string' + param: '工艺计划流水号=' + num + '=int&批次数量=' + a + '=string&机加工开始时间=' + b + '=string&机加工结束时间=' + c + '=string&批次数量中间值=' + d + '=string' } }) } // 编辑 -export function EditNumber(num, num1) { +export function EditNumber(num, num1, num2) { return request({ url: '', method: 'post', @@ -168,7 +168,7 @@ export function EditNumber(num, num1) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_生产计划下达_修改投产数量', - param: '组件零件基本件流水号=' + num + '=int&数量=' + num1 + param: '组件零件基本件流水号=' + num + '=int&数量=' + num1 + '=int&已投数量=' + num2 } }) } @@ -213,3 +213,42 @@ export function searchUrgentItem() { } }) } +export function addUrgentItem(machineValue, groupValue, partValue, partName, Guide, partMumber, basic, ID, b, c, d, e, f, g, h, i, j, k) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_加急件_增加', + param: `图号或者型号=${partValue}&零件名称=${partName}&规格=${Guide}&零件数量=${partMumber}&零件备注=${basic}&机床流水号=${machineValue}&组件流水号=${groupValue}&加件人流水号=${ID}&计划开始时间=${b}&计划结束时间=${c}&工艺计划开始时间=${d}&工艺计划结束时间=${e}&定额计划开始时间=${f}&定额计划结束时间=${g}&计划编制计划开始时间=${h}&计划编制计划结束时间=${i}&机加工开始时间=${j}&机加工结束时间=${k}` + } + }) +} +export function machineSelect() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} + +export function groupSelect(machineValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_组件流水号_查询数据_根据机床', + param: `机床流水号=${machineValue}` + } + }) +} diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js index 6258940a..a33a477e 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/api/TechnologyCenter/QueryParts.js @@ -107,16 +107,3 @@ export function getFileData(MachineDrawValue) { } }) } -export function addUrgentItem(groupValue, partValue, partName, partMumber, basic, ID) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: 'PDM_零件明细表_加急件_增加', - param: `图号或者型号=${partValue}&零件名称=${partName}&零件数量=${partMumber}&零件备注=${basic}&组件流水号=${groupValue}&加件人流水号=${ID}` - } - }) -} diff --git a/src/utils/request.js b/src/utils/request.js index 1aaa917f..0a04c177 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel +export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue index b5fec225..c9ef9091 100644 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue @@ -1,6 +1,6 @@