From 700a3a724d4770970960a985d292f96378467488 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Wed, 19 Jan 2022 15:46:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/com_replace_tool.js | 13 + .../modules/yieldReport/com_finish_roll.vue | 34 +- .../yieldReport/com_produce_report_normal.vue | 93 ++++- .../modules/yieldReport/com_produce_tool.vue | 3 +- .../modules/yieldReport/com_replace_tool.vue | 348 ++++++++++++++++++ 5 files changed, 468 insertions(+), 23 deletions(-) create mode 100644 src/api/yieldReport/com_replace_tool.js create mode 100644 src/views/modules/yieldReport/com_replace_tool.vue diff --git a/src/api/yieldReport/com_replace_tool.js b/src/api/yieldReport/com_replace_tool.js new file mode 100644 index 0000000..23aae99 --- /dev/null +++ b/src/api/yieldReport/com_replace_tool.js @@ -0,0 +1,13 @@ +import { createAPI } from '@/utils/httpRequest.js' +//工具上机 +export const countToolUsedQty = data => createAPI('schedule/countToolUsedQty', 'POST', data) + +//检查工具实例编码 +export const checkConnectToolInstanceId = data => createAPI('schedule/checkConnectToolInstanceId', 'POST', data) + +//工具上机 +export const connectToolInstanceId = data => createAPI('schedule/connectToolInstanceId', 'POST', data) + +// 获取不良代码的信息 +export const reportDefectCode = data => createAPI('schedule/reportDefectCode', 'POST', data) + diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 32bb83f..9e40a40 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -532,6 +532,19 @@ export default { this.pageData.totalManufactureTime = data.row.totalManufactureTime; this.pageData.totalManufactureDowntimeTime = data.row.totalManufactureDowntimeTime; this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime; + //先预设一些参数 后期方法再计算 + //生产时间=总生产时间 + this.pageData.sfdcProdTime = this.pageData.totalProdTime; + //调机时间=总调机时间 + this.pageData.sfdcSetupTime = this.pageData.totalSetupTime; + //制造时间=总制造时间 + this.pageData.sfdcManufactureTime = this.pageData.totalManufactureTime; + //调机停机=总调机过程停机时间 + this.pageData.sfdcDownTime = this.pageData.totalDowntimeTimeSetup; + //生产调机=总生产过程停机时间 + this.pageData.sfdcProdSetupTime = this.pageData.totalDowntimeTimeProd; + //停机时间=总制造过程停机时间 + this.pageData.sfdcDownTime = this.pageData.totalManufactureDowntimeTime; }); }).then(() => { //3.刷新派工单的班次信息 @@ -547,14 +560,19 @@ export default { }).then(() => { //5.刷新当前卷的Sfdc表的时间 getSfdcTimeData(this.scheduleData).then(({data}) => { - //判断是否操作成功 - this.pageData.eventTime = data.row.finishTime; - this.pageData.sfdcProdTime = data.row.sfdcProdTime; - this.pageData.sfdcSetupTime = data.row.sfdcSetupTime; - this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime; - this.pageData.sfdcDownTime = data.row.sfdcDownTime; - this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime; - this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime; + //先判断是否成功查询 + if(data.resultCode == 200){ + //判断是否操作成功 + this.pageData.eventTime = data.row.finishTime; + this.pageData.sfdcProdTime = data.row.sfdcProdTime; + this.pageData.sfdcSetupTime = data.row.sfdcSetupTime; + this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime; + this.pageData.sfdcDownTime = data.row.sfdcDownTime; + this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime; + this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime; + }else{ + //暂时不处理数据 + } }); }).then(() => { //6.刷新当前卷的报工数据 diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index aba0e74..653957b 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -151,6 +151,17 @@ border v-loading="dataListLoading" style="width: 100%;"> + + + + + :visible.sync="showToolFlag" + @refreshPageData="refreshPageData"> + + + + + @@ -470,8 +490,11 @@ import comStartTuning from "./com_start_tuning";/*开始调机组件*/ import comStartProduce from "./com_start_produce";/*开始生产组件*/ import comDefectRoll from "./com_defect_roll";/*报告不良品卷*/ import comProduceTool from "./com_produce_tool";/*生产过程的工具组件*/ +import comReplaceTool from "./com_replace_tool";/*生产过程的工具组件*/ import comProduceMaterial from "./com_produce_material";/*生产过程的材料组件*/ -import comProduceDown from "./com_produce_down";/*生产过程的停机组件*/ +import comProduceDown from "./com_produce_down"; +import com_replace_tool from "./com_replace_tool"; +/*生产过程的停机组件*/ export default { name: "com_produce_report_normal", data() { @@ -486,6 +509,7 @@ export default { showProduceFlag: false, showDefectFlag: false, showToolFlag: false, + showReplaceToolFlag: false, showMaterialFlag: false, showDownFlag: false, activeTable: 'sfdc_time', @@ -2637,6 +2661,30 @@ export default { fixed: false } ], + searchData: { + site: this.$store.state.user.site, + userName: this.$store.state.user.name, + seqNo: '', + orderNo: '', + itemNo: 0, + resourceId: '', + scheduledDate: '', + shiftNo: '', + partNo: '', + workCenterNo: '', + workCenterDesc: '', + resourceDesc: '', + rollNo: '', + partDesc: '', + planStartTime: '', + planFinishTime: '', + qtyRequiredOriginal: 0, + preItemDesc: '', + nextItemDesc: '', + nextItemNo: 0, + operatorId: '', + functionName: '' + }, scheduleData: { site: this.$store.state.user.site, userName: this.$store.state.user.name, @@ -2702,6 +2750,7 @@ export default { comStartProduce,/*开始生产组件*/ comDefectRoll,/*报告不良品*/ comProduceTool,/*生产过程的工具组件*/ + comReplaceTool,/*刀模切换组件*/ comProduceMaterial,/*生产过程的材料组件*/ comProduceDown,/*生产过程的停机组件*/ }, @@ -2728,11 +2777,13 @@ export default { }); }, // 获取当前卷的信息 - getCurrentRollOpsBySeqNo() { + getCurrentRollOpsBySeqNoFun() { getCurrentRollOpsBySeqNo(this.currentRollOps).then(({data}) => { this.currentRollOps.rollNo = data.row.rollNo; this.scheduleData.rollNo = data.row.rollNo; this.currentRollOps.finishedFlag = data.row.finishedFlag; + //设置查询的数据 + this.searchData = JSON.parse(JSON.stringify(this.scheduleData)); }); }, @@ -2744,56 +2795,56 @@ export default { //刷新派工单的时间的记录 getSfdcTimeList() { - getSfdcTimeByCon(this.scheduleData).then(({data}) => { + getSfdcTimeByCon(this.searchData).then(({data}) => { this.sfdcTimeList = data.rows; }); }, //刷新工单的工具信息 getOrderToolList() { - getOrderToolByCon(this.scheduleData).then(({data}) => { + getOrderToolByCon(this.searchData).then(({data}) => { this.orderToolList = data.rows; }); }, //刷新派工单的刀模板的记录 getSfdcToolList() { - getSfdcToolByCon(this.scheduleData).then(({data}) => { + getSfdcToolByCon(this.searchData).then(({data}) => { this.sfdcToolList = data.rows; }); }, //刷新工单的bom信息 getOrderBomList() { - getOrderBomByCon(this.scheduleData).then(({data}) => { + getOrderBomByCon(this.searchData).then(({data}) => { this.orderBomList = data.rows; }); }, //刷新派工单的材料表的记录 getSfdcMaterialList() { - getSfdcMaterialByCon(this.scheduleData).then(({data}) => { + getSfdcMaterialByCon(this.searchData).then(({data}) => { this.sfdcMaterialList = data.rows; }); }, //刷新派工单的下机卷的记录 getSfdcRollOpsList() { - getSfdcRollOpsByCon(this.scheduleData).then(({data}) => { + getSfdcRollOpsByCon(this.searchData).then(({data}) => { this.sfdcRollOpsList = data.rows; }); }, //刷新派工单的不良标的记录 getSfdcDefectList() { - getSfdcDefectByCon(this.scheduleData).then(({data}) => { + getSfdcDefectByCon(this.searchData).then(({data}) => { this.sfdcDefectList = data.rows; }); }, //刷新派工单的下机卷的记录 getSfdcRollList() { - getSfdcRollByCon(this.scheduleData).then(({data}) => { + getSfdcRollByCon(this.searchData).then(({data}) => { this.sfdcRollList = data.rows; }); }, @@ -2803,9 +2854,9 @@ export default { //判断是否按照当前卷来查询 if (this.scheduleData.currentRollFlag) { //设置相关的卷号 判断是否存在卷 - this.scheduleData.rollNo = this.currentRollOps.rollNo; + this.searchData.rollNo = this.currentRollOps.rollNo; } else { - this.scheduleData.rollNo = ''; + this.searchData.rollNo = ''; } //区分不同的页签刷新不同的列表数据 if (this.activeTable == 'sfdc_time') { @@ -2859,7 +2910,7 @@ export default { //打开模态框 this.visibleFlag = true; //刷新页面的卷信息 - this.getCurrentRollOpsBySeqNo(); + this.getCurrentRollOpsBySeqNoFun(); }).then(() => { //设置table页签 this.activeTable = 'sfdc_time'; @@ -3104,6 +3155,18 @@ export default { }); }, + /*替换工具的组件*/ + replaceToolModal(toolRow) { + //1.首先调用菜单判断方式 打开生产过程的停机的页面 + //checkProduceButton('produceDownFlag'); + console.log(this.scheduleData,this.scheduleData) + //打开生产过程的工具的页面 + this.$nextTick(() => { + this.showReplaceToolFlag = true; + this.$refs.comReplaceTool.init(this.scheduleData, this.operatorData, toolRow) + }); + }, + //创建新卷的方法 createNewRollDo() { createNewRoll(this.scheduleData).then(({data}) => { @@ -3131,6 +3194,8 @@ export default {