From 5170a77babcbf4ee3f8cf2eccb1b5b545b562e66 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Fri, 18 Mar 2022 18:27:09 +0800 Subject: [PATCH] =?UTF-8?q?FQC=20=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/schedule/order_schedule_fqc.vue | 75 +++++++++++++++++-- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/src/views/modules/schedule/order_schedule_fqc.vue b/src/views/modules/schedule/order_schedule_fqc.vue index cf2d219..8dbafc0 100644 --- a/src/views/modules/schedule/order_schedule_fqc.vue +++ b/src/views/modules/schedule/order_schedule_fqc.vue @@ -115,7 +115,7 @@ 可用操作员 - 排产 @@ -127,7 +127,7 @@ - 虚拟机台排产 @@ -363,7 +363,8 @@ export default { scheduleTime: '08:30', specifiedTime: 'Y', scheduleSeqNo: -1, - planStartTime: '' + planStartTime: '', + virtualFlag: 'N' }, searchData: { site: this.$store.state.user.site, @@ -1495,9 +1496,10 @@ export default { }, /*开始排产的操作*/ - scheduleOperatorsBun() { + scheduleOperatorsBun(checkFlag) { //循环判断是否存在需要排产 let scheduleOperators = []; + this.pageData.virtualFlag = 'N'; //处理需要排产的数据 for(let i = 0; i < this.operatorList.length; i++){ let tempOperator = this.operatorList[i]; @@ -1511,15 +1513,74 @@ export default { return false; } //处理参数 - let postData = {'pageData': JSON.stringify(this.pageData), 'operatorList': JSON.stringify(scheduleOperators)} + let postData = {'pageData': JSON.stringify(this.pageData), + 'operatorList': JSON.stringify(scheduleOperators), + 'checkFlag': checkFlag} //提交后台的数据 scheduleFqcOperators(postData).then(({data}) => { if (data.code == 500) { this.$message.error(data.msg); - } else { + } else if (data.code == 201) { + this.$confirm(data.msg, '提示', { + confirmButtonText: '确认', + celButtonText: '取消', + type: 'warning' + }).then(() => { + //重新掉用排产 + this.scheduleOperatorsBun(false); + }); + }else { + this.$message.success(data.msg); + debugger; + //刷新明FQC操作员 + this.getOperatorList(); + this.pageData.virtualFlag = 'N'; + this.pageData.checkFlag = true; + } + }); + }, + + + /*虚拟排产的操作*/ + scheduleVirtualOperatorsBun(checkFlag) { + //循环判断是否存在需要排产 + let scheduleOperators = []; + this.pageData.virtualFlag = 'Y'; + //处理需要排产的数据 + for(let i = 0; i < this.operatorList.length; i++){ + let tempOperator = this.operatorList[i]; + if(parseFloat(tempOperator.qtyToSchedule) > 0){ + scheduleOperators.push(tempOperator); + } + } + //判断是否存在需要排产的操作员 + if(scheduleOperators.length == 0){ + this.$message.error('暂无可排产的操作员!'); + return false; + } + //处理参数 + let postData = {'pageData': JSON.stringify(this.pageData), + 'operatorList': JSON.stringify(scheduleOperators), + 'checkFlag': checkFlag} + //提交后台的数据 + scheduleFqcOperators(postData).then(({data}) => { + if (data.code == 500) { + this.$message.error(data.msg); + } else if (data.code == 201) { + this.$confirm(data.msg, '提示', { + confirmButtonText: '确认', + celButtonText: '取消', + type: 'warning' + }).then(() => { + //重新掉用排产 + this.scheduleVirtualOperatorsBun(false); + }); + }else { this.$message.success(data.msg); //刷新明FQC操作员 this.getOperatorList(); + this.pageData.virtualFlag = 'N'; + this.pageData.checkFlag = true; } }); }, @@ -1546,7 +1607,7 @@ export default { this.pageData.scheduledQty = scheduleRow.qtyRequired; this.pageData.workCenterNo = scheduleRow.workCenterNo; this.pageData.resourceId = scheduleRow.resourceId; - this.pageData.scheduleSeqNo = scheduleRow.scheduleSeqNo; + this.pageData.scheduleSeqNo = scheduleRow.scheduledSeqNo; this.pageData.planStartTime = scheduleRow.planStartTime; //取消排产 cancelSoSchedule(this.pageData).then(({data}) => {