diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js index 72682aef..dc985372 100644 --- a/src/api/ManufacturingCenter/CreatePreparationBill.js +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -33,7 +33,7 @@ export function edit(num1) { data: { type: '2', name: '车间生产管理工艺_备料单导出_状态更改', - param: '工艺计划流水号=' + num1 + param: `工艺计划流水号=${num1}&备料打印=1` } }) } @@ -45,7 +45,7 @@ export function edit2(num1) { data: { type: '2', name: '车间生产管理工艺_备料单导出_外购备料', - param: '工艺计划流水号=' + num1 + param: `工艺计划流水号组=${num1}&是否外购备料=1` } }) } diff --git a/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js b/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js new file mode 100644 index 00000000..1c15d649 --- /dev/null +++ b/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function getData(num, num1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_设备运行情况_查询数据', + param: '工位号=' + num + '&日期=' + num1, + pagination: pageCurrent + '&' + pageSize + } + }) +} +export function getData1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_设备运行情况_查询数据_全员', + param: '日期=' + num + } + }) +} +export function getData2(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_设备运行情况_查询数据_折线图', + param: '工位号=' + num + '&开始时间=' + num1 + '&结束时间=' + num2 + } + }) +} +// 初始化 人员和工位 +export function getMachine() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工顺序调整_查询工位及人员' + } + }) +} diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index cb7e60ce..bc39c86d 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -122,4 +122,15 @@ export function dele(num, a, b) { } }) } - +// 打回 +export function edit(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'MRP_计划订单_组件零件清单_基本件_打回数据', + param: '组件零件基本件流水号=' + num + } + }) +} diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js index 5c7cf3b6..7595f247 100644 --- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -98,3 +98,15 @@ export function handlechange2(Number, code) { }) } +// 打回 +export function edit(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料单导出_状态更改', + param: `工艺计划流水号=${num1}&备料打印=0` + } + }) +} diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 396fcb93..8649d062 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -85,7 +85,7 @@ export function importBasics(establishment, proofread, review, date, projectName data: { type: '2', name: '组件明细表_基本件_导入数据gj', - param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}` + param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output` } }) } @@ -96,7 +96,7 @@ export function importTotal(establishment, projectName, machineNum, machineName, data: { type: '2', name: '组件明细表_总图_导入数据gj', - param: `编制=${establishment}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件数量=${componentNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}` + param: `编制=${establishment}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件数量=${componentNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&导入类型=0=int=output` } }) } diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index d136a8b7..2ce93a00 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -173,3 +173,15 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c } }) } +// 打回备料 +export function edit2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料单导出_外购备料', + param: `工艺计划流水号组=${num1}&是否外购备料=0` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 7ea41aab..4f2bcb33 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ 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://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue new file mode 100644 index 00000000..1a67ff33 --- /dev/null +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -0,0 +1,350 @@ + + + + + diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 16670b26..a2d0fe69 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -186,6 +186,7 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> + 打回 投产 合并生产 @@ -332,7 +333,7 @@