From bdb4046a1ed5358a94cc9ce846f2a1ec88e5d5ec Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 18 六月 2024 10:51:57 +0800
Subject: [PATCH] -

---
 jcdm-ui/src/views/main/kb/stationTerminal/index.vue |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index ab5af44..b11f999 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -575,7 +575,7 @@
       this.endClear()
       clearWorkpieceRelease(param).then(response => {});
       this.headContent.sfcCode = ''
-      this.$message('娓呮鎴愬姛锛�');
+      this.$message('娓呴櫎鎴愬姛锛�');
     },
     scanCompleted(){
       this.$message('鎵爜瀹屾垚'+this.content);
@@ -602,6 +602,12 @@
       });
       this.getListFormulaChild()
       this.addOverStationCollection()
+      const param = {
+        processesCode: this.headContent.processesCode,
+      }
+      fistSetpNumber(param).then(response => {
+        console.log("fistSetpNumber------"+response.msg)
+      });
     },
 
     addBaseData(){
@@ -673,10 +679,10 @@
         if (event.data === "IN") {
           self.cakeLamp.InPlace = 1;
           console.log(self.headContent.processesCode);
-          const param = {
-            processesCode: self.headContent.processesCode,
-          }
-          fistSetpNumber(param).then(response => {});
+          // const param = {
+          //   processesCode: self.headContent.processesCode,
+          // }
+          // fistSetpNumber(param).then(response => {});
         } else if (event.data === "IN0") {
           self.cakeLamp.InPlace = 0;
         } else if (event.data === "OUT") {
@@ -782,11 +788,12 @@
         const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
         console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
 
-        if(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")){
+          }else if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'OP240'){
             this.headContent.cardCode = scanValue
             this.bindcardCode();
           }else {

--
Gitblit v1.9.3