From 50c5856086b9302fb8a8ecfe3db7e32a35c2ccff Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期五, 05 七月 2024 14:32:47 +0800 Subject: [PATCH] -100-1 bug修复 --- jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 53 +++++++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 30 deletions(-) diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue index 99bdc1e..8db214d 100644 --- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue @@ -627,14 +627,7 @@ this.headContent.cardCode = rowsData.trolleyYard; }); this.getListFormulaChild() - // this.addOverStationCollection() this.workpieceInformation.inboundTime = this.getCurrentTime() - const param = { - processesCode: this.headContent.processesCode, - } - fistSetpNumber(param).then(response => { - console.log("fistSetpNumber------"+response.msg) - }); }, initializedData(){ @@ -827,6 +820,8 @@ self.getList() self.cakeLamp.scanFinish = 1 self.cakeLamp.startWork = 1 + this.cakeLamp.InPlace = 1 + } }; }, @@ -848,10 +843,6 @@ console.log("sfc=--"+this.headContent.sfcCode+"--") if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null && this.headContent.sfcCode !== undefined){ - // if(scanValue.includes("P9900173252")){ - // this.headContent.yzSfcCode = scanValue - // this.bindYzSfc(); - // }else if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'OP240'){ this.headContent.cardCode = scanValue this.bindcardCode(scanValue); @@ -862,30 +853,32 @@ this.serialPortMethod(scanValue) } } else { - if(this.headContent.processesCode === 'OP240'){ + // if(this.headContent.processesCode === 'OP240'){ this.headContent.sfcCode = scanValue; this.queryParams.productNum = scanValue; this.getList() this.cakeLamp.scanFinish = 1 this.cakeLamp.startWork = 1 - }else { - let param = { - trolleyYard: scanValue - } - findBytrolleyYardGetOne(param).then(response => { - if(response.msg !== '2'){ - this.headContent.sfcCode = response.msg; - this.queryParams.productNum = response.msg; - this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue); - this.getList() - this.cakeLamp.scanFinish = 1 - this.cakeLamp.startWork = 1 - }else { - this.$message('娌℃湁搴忓垪鍙�'+scanValue); - return - } - }); - } + this.cakeLamp.InPlace = 1 + // }else { + // let param = { + // trolleyYard: scanValue + // } + // findBytrolleyYardGetOne(param).then(response => { + // if(response.msg !== '2'){ + // this.headContent.sfcCode = response.msg; + // this.queryParams.productNum = response.msg; + // this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue); + // this.getList() + // this.cakeLamp.scanFinish = 1 + // this.cakeLamp.startWork = 1 + // this.cakeLamp.InPlace = 1 + // }else { + // this.$message('娌℃湁搴忓垪鍙�'+scanValue); + // return + // } + // }); + // } } -- Gitblit v1.9.3