From 09d18582d9f431ed38c31615aa4cac7f7f3954b2 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Fri, 18 Feb 2022 17:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E9=87=8F=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/com_finish_part_roll.js | 47 + src/api/yieldReport/produce_report_normal.js | 5 + .../yieldReport/com_finish_part_roll.vue | 865 ++++++++++++++++++ .../yieldReport/com_produce_report_normal.vue | 105 ++- 4 files changed, 1018 insertions(+), 4 deletions(-) create mode 100644 src/api/yieldReport/com_finish_part_roll.js create mode 100644 src/views/modules/yieldReport/com_finish_part_roll.vue diff --git a/src/api/yieldReport/com_finish_part_roll.js b/src/api/yieldReport/com_finish_part_roll.js new file mode 100644 index 0000000..107e72d --- /dev/null +++ b/src/api/yieldReport/com_finish_part_roll.js @@ -0,0 +1,47 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取当前的卷的报工汇总数据 +export const getCurrentRollReportedQty = data => createAPI('schedule/getCurrentRollReportedQty', 'POST', data) + +// 获取上机卷的时间信息汇总 +export const countSfdcTimeQty = data => createAPI('schedule/countSfdcTimeQty', 'POST', data) + +// 获取派工单的班次信息 +export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data) + +// 获取sfdc表的时间信息汇总 +export const getSfdcTimeData = data => createAPI('schedule/getSfdcTimeData', 'POST', data) + +// 获取当前时间记录信息 +export const getSfdcTimeMaxAndMinTime = data => createAPI('schedule/getSfdcTimeMaxAndMinTime', 'POST', data) + +// 获取当前卷sfdc表的报工数据 +export const getSfdcReportedData = data => createAPI('schedule/getSfdcReportedData', 'POST', data) + +// 获取当前卷的材料记录--在线的 +export const getSfdcMaterialByRollNo = data => createAPI('schedule/getSfdcMaterialByRollNo', 'POST', data) + +// 获取当前派工单的材料记录 +export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data) + +// 获取当前派工单的上机卷记录 +export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data) + +// 获取当前派工单的不良卷记录 +export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data) + +// 获取当前上机卷信息 +export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data) + +// 结束卷的验证 +export const checkFinishRollWithNoFqc = data => createAPI('schedule/checkFinishRollWithNoFqc', 'POST', data) + +// 结束卷的操作 +export const finishRollWithNoFqc = data => createAPI('schedule/finishRollWithNoFqc', 'POST', data) + + + + + + + diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 504d091..8f79455 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -46,6 +46,11 @@ export const reopenSfdcRolls = data => createAPI('schedule/reopenSfdcRolls', 'PO //删除sfdcRolls export const deleteSfdcRolls = data => createAPI('schedule/deleteSfdcRolls', 'POST', data) +//执行工具的结束使用的方法 +export const processFinishTool = data => createAPI('schedule/processFinishTool', 'POST', data) + +//执行材料结束使用 且未剩余的方法 +export const processFinishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data) diff --git a/src/views/modules/yieldReport/com_finish_part_roll.vue b/src/views/modules/yieldReport/com_finish_part_roll.vue new file mode 100644 index 0000000..8fb0cbc --- /dev/null +++ b/src/views/modules/yieldReport/com_finish_part_roll.vue @@ -0,0 +1,865 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 577a3e4..4ba2375 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -167,7 +167,7 @@ @@ -246,7 +246,7 @@ >换料 下料 - 生产结束 @@ -407,7 +407,7 @@
+ style="margin-left: 600px; margin-bottom: 0px; width: 200px; height: 100px;"> 停机 @@ -418,6 +418,19 @@
+ +
+ 其他操作 + + + + 产量报告 + + + +
@@ -439,12 +452,20 @@ :visible.sync="showSeparateFlag" @refreshPageData="refreshPageData"> + + + + + + @@ -539,12 +560,15 @@ import { createNewRoll, reopenSfdcRolls,/*重新打开卷操作*/ deleteSfdcRolls,/*删除sfdcRolls的操作*/ + processFinishTool,/*执行工具的结束使用的方法*/ + finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */ } from "@/api/yieldReport/produce_report_normal.js"; /*引入组件*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ import comSwitchRoll from "./com_switch_roll";/*切换卷操作*/ import comSeparateRoll from "./com_separate_roll"; import comFinishRoll from "./com_finish_roll";/*结束卷数的组件*/ +import comFinishPartRoll from "./com_finish_part_roll";//产量报告的组件 import comMergeRoll from "./com_merge_roll";/*合并卷的组件*/ import comStartTuning from "./com_start_tuning";/*开始调机组件*/ import comStartProduce from "./com_start_produce";/*开始生产组件*/ @@ -566,6 +590,7 @@ export default { showSwitchFlag: false, showSeparateFlag: false, showFinishFlag: false, + showFinishPartFlag: false, showMergeFlag: false, showTuningFlag: false, showProduceFlag: false, @@ -2810,6 +2835,7 @@ export default { comSwitchRoll,/*切换卷操作*/ comSeparateRoll,/*創建分卷组件*/ comFinishRoll,/*结束卷的组件*/ + comFinishPartRoll,/*产量报告的组件*/ comMergeRoll,/*合并卷组件*/ comStartTuning,/*开始调机组件*/ comStartProduce,/*开始生产组件*/ @@ -2992,7 +3018,7 @@ export default { await this.refreshCurrentTabTable(); //刷新当前的菜单 - //await this.refreshPageButtons(); + await this.refreshPageButtons(); }, @@ -3151,6 +3177,17 @@ export default { }); }, + /*产量报告的卷操作*/ + finishPartRollModal() { + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('finishRollFlag'); + //打开结束卷的页面 + this.$nextTick(() => { + this.showFinishPartFlag = true; + this.$refs.comFinishPartRoll.init(this.scheduleData, this.operatorData) + }); + }, + /*合并卷modal*/ mergeRollModal() { //1.首先调用菜单判断方式 看看是否可以结束卷 @@ -3354,6 +3391,66 @@ export default { }); }, + /*结束使用 工具确认功能*/ + warnFinishToolConfirm(toolRow){ + this.$confirm('确实要结束该工具的使用吗?', '提示', { + confirmButtonText: '确认', + celButtonText: '取消', + type: 'warning' + }).then(() =>{ + //执行结束使用工具的的操作 + this.finishToolOperation(toolRow); + }); + }, + + /*执行删除sfdcRolls的数据功能*/ + finishToolOperation(toolRow){ + let toolData = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, + 'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo, + 'histSeqNo': toolRow.histSeqNo, 'toolInstanceId': toolRow.toolInstanceId}; + //执行删除卷的操作 + processFinishTool(toolData).then(({data}) => { + //判断是否成功 + if(data.code == 500){ + this.$message.error(data.msg); + }else{ + this.$message.info(data.msg); + //刷新报工的页面 + this.refreshPageData(); + } + }); + }, + + /*结束使用 材料确认功能*/ + warnFinishMaterialWithNoRemainderConfirm(materialRow){ + this.$confirm('确实要结束该工具的使用吗?', '提示', { + confirmButtonText: '确认', + celButtonText: '取消', + type: 'warning' + }).then(() =>{ + //执行结束使用材料的的操作 + this.finishMaterialWithNoRemainderOperation(materialRow); + }); + }, + + /*执行结束使用 材料的数据功能*/ + finishMaterialWithNoRemainderOperation(materialRow){ + let materialData = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, + 'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo, + 'histSeqNo': materialRow.histSeqNo, 'rollNo': materialRow.rollNo}; + //执行结束使用材料卷且无剩余的操作 + finishMaterialWithNoRemainder(materialData).then(({data}) => { + //判断是否成功 + if(data.code == 500){ + this.$message.error(data.msg); + }else{ + this.$message.info(data.msg); + //刷新报工的页面 + this.refreshPageData(); + } + }); + }, + }, created() { // this.factoryList()