From b849c6d6056a6783914546fed92399472e34f9dd Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 26 七月 2024 08:32:42 +0800
Subject: [PATCH] -拧紧返修功能

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

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b230e60..94f9903 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -394,8 +394,8 @@
       content: '',
       activeName: 'first',
       // url: "ws://192.168.2.248:8080/websocket/message/",
-      url: "ws://10.103.210.248:8080/websocket/message/",
-      // url: "ws://192.168.2.76:8080/websocket/message/",
+      // url: "ws://10.103.210.248:8080/websocket/message/",
+      url: "ws://192.168.2.76:8080/websocket/message/",
       message: "",
       text_content: "",
       ws: null,
@@ -426,7 +426,6 @@
       originalArray: [],
       yzSfcFlag: 1,
       endYz: false,
-      artificialNgFlag: null,
     }
   },
   beforeDestroy() {
@@ -536,12 +535,10 @@
       // this.formulaChildList = []
       this.formulaChildParams.productCode = this.workpieceInformation.productCode
       this.formulaChildParams.processesCode = this.headContent.processesCode
-      console.log(this.artificialNgFlag)
-      if(this.artificialNgFlag !== null){
-        this.formulaChildParams.artificialNgFlag = this.artificialNgFlag
+      if(this.formulaChildParams.artificialNgFlag !== null){
         this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
       }
-      console.log(this.formulaChildParams)
+      console.log("getListFormulaChild"+this.formulaChildParams.artificialNgFlag)
       noPageListFormulaChild(this.formulaChildParams).then(response => {
         this.formulaChildList = response.rows;
         if (this.formulaChildList.length >0){
@@ -619,13 +616,14 @@
         this.workpieceInformation.productModel = rowsData.productModel;
         this.workpieceInformation.productName = rowsData.productName;
         this.headContent.cardCode = rowsData.trolleyYard;
-        this.artificialNgFlag = rowsData.artificialNgFlag;
+        this.formulaChildParams.artificialNgFlag = rowsData.artificialNgFlag;
       });
       this.getListFormulaChild()
       // this.addOverStationCollection()
       this.workpieceInformation.inboundTime = this.getCurrentTime()
       const param = {
         processesCode: this.headContent.processesCode,
+        productCode: this.workpieceInformation.productCode
       }
       fistSetpNumber(param).then(response => {
         console.log("fistSetpNumber------"+response.msg)
@@ -800,6 +798,8 @@
             self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝g‘');
             return;
           }
+          self.formulaChildParams.artificialNgFlag = null
+          console.log("self.formulaChildParams.artificialNgFlag"+self.formulaChildParams.artificialNgFlag)
           if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
             updateTighteningFormula(param).then(response => {
               //addTighteningParameters(param).then(response => {});

--
Gitblit v1.9.3