From 8cfe20288690f2ba46c804f41f39e8aa48c2dea0 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 15 六月 2024 09:08:30 +0800
Subject: [PATCH] 上传逻辑大版本更新

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

diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index 992b6aa..0bec12d 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,
@@ -511,13 +511,26 @@
       this.workpieceInformation.productModel = null;
       this.workpieceInformation.productName = null;
       this.headContent.sfcCode = '';
+      this.headContent.moduleB = '';
+      this.headContent.moduleA = '';
     },
     changeMenu(tab, event) {
       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);
@@ -605,14 +618,15 @@
         } else if (event.data === "END") {
           const param = {
             workOrderNo: self.workpieceInformation.workOrderNo,
-            productCode: self.workpieceInformation.productCode,
+            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);
@@ -663,7 +677,7 @@
             this.headContent.moduleB = scanValue;
             this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
             this.getList()
-            this.cakeLamp.InPlace = 1
+            // this.cakeLamp.InPlace = 1
             this.cakeLamp.scanFinish = 1
             this.cakeLamp.startWork = 1
           }

--
Gitblit v1.9.3