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/heatingFilmTerminal/index.vue |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index 2eddd7a..d9276f0 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -245,7 +245,7 @@
 import {listWorkReport} from "@/api/main/om/workReport/workReport";
 import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
 import {
-  jrmUpdateResults,
+  jrmUpdateResults, jrmWorkpieceRelease,
   listFormulaChild,
   noPageListFormulaChild,
   releaseCheck,
@@ -409,19 +409,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"){
@@ -518,8 +505,19 @@
       console.log(tab, event);
     },
     clearClick(){
-      this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
-      this.headContent.sfcCode = null
+      const param = {
+        workOrderNo: this.workpieceInformation.workOrderNo,
+        productCode: "1P102S",
+        locationCode: this.headContent.processesCode,
+        productBarcode: this.headContent.moduleA+','+this.headContent.moduleB,
+      }
+      jrmSaveCampaignTimeParameters(param).then(response => {});
+      this.cakeLamp.release = 1;
+      this.endClear()
+      // workpieceRelease(param).then(response => {});
+      jrmWorkpieceRelease(param).then(response => {});
+      // this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
+      // this.headContent.sfcCode = null
     },
     scanCompleted(){
       this.$message('鎵爜瀹屾垚'+this.content);
@@ -609,12 +607,13 @@
             workOrderNo: self.workpieceInformation.workOrderNo,
             productCode: "1P102S",
             locationCode: self.headContent.processesCode,
-            productBarcode: self.headContent.sfcCode,
+            productBarcode: self.headContent.moduleA+','+self.headContent.moduleB,
           }
           jrmSaveCampaignTimeParameters(param).then(response => {});
           self.cakeLamp.release = 1;
           self.endClear()
-          workpieceRelease(param).then(response => {});
+          // workpieceRelease(param).then(response => {});
+          jrmWorkpieceRelease(param).then(response => {});
         } else if (event.data.includes("[")) {
           let formulaChilds = "";
           self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);

--
Gitblit v1.9.3