diff --git a/src/api/ManufacturingCenter/ManHourAnalysis.js b/src/api/ManufacturingCenter/ManHourAnalysis.js index 5499b998..e66013bf 100644 --- a/src/api/ManufacturingCenter/ManHourAnalysis.js +++ b/src/api/ManufacturingCenter/ManHourAnalysis.js @@ -33,3 +33,51 @@ export function searchPerson() { } }) } +export function search4(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_质检数据分析_查询数据', + param: '时间_check=' + num1 + '&开始时间=' + num2 + '&结束时间=' + num3 + } + }) +} +export function search5(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` SELECT CAST(SUM(CONVERT(float, 持续时间))/CONVERT(float, datediff(SECOND, '${num1}','${num2}')) as decimal(38, 2)) * 100 as 持续时间,工位号 + FROM [MES_机加工MES_设备数据采集_工位信息_历史数据表] + where 日期 >= '${num1}' and 日期 <= '${num2}' + group by 工位号` + } + }) +} +export function getOPname() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` SELECT 设备号 from MES_工作站_设备状态表` + } + }) +} +export function search6(num, ceck, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` SELECT CAST(SUM(CONVERT(float, 持续时间))/CONVERT(float, datediff(SECOND, '${num1}','${num2}')) as decimal(38, 2)) * 100 as 持续时间 + ,DATEPART(mm,日期) as 月份 + FROM [MES_机加工MES_设备数据采集_工位信息_历史数据表] + where 持续时间 is not null and 工位号 = '${num}' and 日期 >= '${num1}' and 日期 <= '${num2}' + group by DATEPART(mm,日期)` + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingPartsQuery.js b/src/api/Outsourcing/OutsourcingPartsQuery.js index f0a94fb9..210226ee 100644 --- a/src/api/Outsourcing/OutsourcingPartsQuery.js +++ b/src/api/Outsourcing/OutsourcingPartsQuery.js @@ -13,15 +13,27 @@ export function getprocedure(processPlan, single) { }) } // 查询外协零件 -export function searchTable(check, supplierNameValue, check1, MaterialsValue, pageSize, pageCurrent) { +export function searchTable(check, supplierNameValue, check1, MaterialsValue, check2, time1, time2, pageSize, pageCurrent) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理_外协零件_查询数据', - param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue, + param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2, Pagination: pageCurrent + '&' + pageSize } }) } +// 查询外协零件 +export function getExport(check, supplierNameValue, check1, MaterialsValue, check2, time1, time2, pageSize, pageCurrent) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协零件_查询数据', + param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2 + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index 0445867b..85e6001b 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -30,7 +30,7 @@ export function searchTable1(...params) { method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_分配后_加供应商', + name: '采购管理_采购部采购_查询物料_分配后_加供应商_新', param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}`, Pagination: params[4] + '&' + params[5] } @@ -43,7 +43,7 @@ export function searchTable2(...params) { method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新', param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}`, Pagination: params[4] + '&' + params[5] } diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..059fb22e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的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 @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue index dd57da6a..128da7f9 100644 --- a/src/views/Assembly/QualityBasicData/index.vue +++ b/src/views/Assembly/QualityBasicData/index.vue @@ -1,7 +1,7 @@