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/preInstalledTerminal/index.vue |   83 ++++++++++++++++++++++++-----------------
 1 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index 3cc833e..68e47eb 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -189,6 +189,9 @@
 <script>
 import {getIpv4, listStationConf} from "@/api/main/sc/stationConf";
 import {
+  checkMaterialCode,
+  clearWorkpieceRelease,
+  fistSetpNumber,
   noPageListFormulaChild,
   workpieceRelease,
   yzUpdateResults,
@@ -324,20 +327,6 @@
     serialLink() {
       this.open1 = true
     },
-    bindYzSfc(){
-      if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
-        let param = {
-          sfcCode: this.headContent.sfcCode,
-          locationCode: this.headContent.processesCode,
-          yzSfcCode: this.headContent.yzSfcCode
-        }
-        this.$message('鍙互缁戝畾锛�');
-        replaceAssemblyCode(param).then(response => {
-
-        });
-      }
-    },
-
     Release(){
       // this.$message('portsList锛�'+this.portsList.length);
       if(this.btnType === "danger"){
@@ -405,8 +394,14 @@
       console.log(tab, event);
     },
     clearClick(){
-      this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
-      this.headContent.sfcCode = null
+      const param = {
+        productCode: '1P102S',
+        locationCode: this.headContent.processesCode,
+      }
+      clearWorkpieceRelease(param).then(response => {});
+      this.headContent.sfcCode = ''
+      this.formulaChildList = [];
+      this.$message('娓呴櫎鎴愬姛锛�');
     },
     scanCompleted(){
       this.$message('鎵爜瀹屾垚'+this.content);
@@ -420,6 +415,10 @@
     },
     /** 鏌ヨ宸ュ崟鍒楄〃 */
     async getList() {
+      const param = {
+        processesCode: this.headContent.processesCode,
+      }
+      fistSetpNumber(param).then(response => {});
       this.getListFormulaChild()
       this.addOverStationCollection()
     },
@@ -528,25 +527,41 @@
             locationCode: self.headContent.processesCode,
             productBarcode: self.headContent.sfcCode,
           }
-          addTighteningParameters(param).then(response => {});
-          yzUpdateTighteningFormula(param).then(response => {
-            console.log(response.msg)
-            if(response.msg === "1"){
-                self.getListFormulaChild()
-
-            }else {
-              const param = {
-                workOrderNo: self.workpieceInformation.workOrderNo,
-                productCode: "1P102S",
-                locationCode: self.headContent.processesCode,
-                productBarcode: self.headContent.sfcCode,
-              }
-              saveCampaignTimeParameters(param).then(response => {});
-              workpieceRelease(param).then(response => {});
-              self.formulaChildList = [];
-              self.headContent.sfcCode = '';
+          if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
+            self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
+            return;
+          }
+          if(self.headContent.sfcCode === null||self.headContent.sfcCode ===''){
+            self.$message('鏈壘鍒版�绘垚鐮侊紝璇峰厛鎵爜锛�');
+            return;
+          }
+          checkMaterialCode(param).then(response => {
+            if(response.msg === "2"){
+              self.$message('鏈壂鎻忕墿鏂欑爜瀹屾瘯锛�');
+              return;
             }
           });
+
+          yzUpdateTighteningFormula(param).then(response => {
+          console.log(response)
+          if(response.msg === "1" || response.msg === "3"){
+              self.getListFormulaChild()
+          }else {
+            const param = {
+              workOrderNo: self.workpieceInformation.workOrderNo,
+              productCode: "1P102S",
+              locationCode: self.headContent.processesCode,
+              productBarcode: self.headContent.sfcCode,
+            }
+            saveCampaignTimeParameters(param).then(response => {});
+            workpieceRelease(param).then(response => {});
+            self.formulaChildList = [];
+            self.headContent.sfcCode = '';
+          }
+        });
+        addTighteningParameters(param).then(response => {});
+        // self.getListFormulaChild()
+
         }
       };
     },
@@ -561,7 +576,7 @@
         console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
 
         if(this.headContent.sfcCode !== ''){
-          this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
+          this.$message('棰勮宸ヤ綅鎵弿鐗╂枡缂栫爜'+scanValue);
           console.log(scanValue)
           this.serialPortMethod(scanValue)
         } else {

--
Gitblit v1.9.3