From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index 87359ce..64f90bd 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -244,7 +244,7 @@
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
- clearWorkpieceRelease,
+ clearWorkpieceRelease, inPlaceInspection,
jrmUpdateResults, jrmWorkpieceRelease,
listFormulaChild,
noPageListFormulaChild,
@@ -331,8 +331,9 @@
},
content: '',
activeName: 'first',
- url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.2.76:8080/websocket/message/",
+ // 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/",
message: "",
text_content: "",
ws: null,
@@ -424,7 +425,7 @@
let formulaChildParams = {
scanBarcode: value,
sfcBarcode: this.headContent.module,
- // workOrderNo: this.workpieceInformation.workOrderNo,
+ // workOrderNo: '-',
productCode: 'PE01B',
locationCode: this.headContent.processesCode,
collectionTime: new Date()
@@ -592,12 +593,11 @@
}
this.headContent.processesName = rows.processesName
this.headContent.processesCode = rows.processesCode
- if(this.headContent.processesCode === 'OP240'){
- this.onLineBinDing = true
- }
- if(this.headContent.processesCode === 'OP260'){
- this.showInput = true
- }
+
+ inPlaceInspection({processesCode: this.headContent.processesCode}).then(response => {
+ console.log(response)
+ this.cakeLamp.InPlace = response.data
+ });
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
@@ -633,7 +633,8 @@
productCode: "PE01B",
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.module,
- inboundTime: self.workpieceInformation.inboundTime
+ inboundTime: self.workpieceInformation.inboundTime,
+ workOrderNo: '-'
}
jrmSaveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
@@ -681,15 +682,20 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
if(this.headContent.module !== ''){
+ console.log('this.headContent.module !== \'\' true')
+ this.$message('鎵爜妯＄粍鐗╂枡鐮�'+scanValue);
this.serialPortMethod(scanValue)
} else {
- if(scanValue.includes("9900168136")){
+ console.log('this.headContent.module !== \'\' false')
+ if(scanValue.includes("0RSMB")){
this.headContent.module = scanValue;
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
this.getList()
// this.cakeLamp.InPlace = 1
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
+ }else {
+ this.$message.error('鎵爜璇嗗埆閿欒鐨勪骇鍝佸簭鍒楀彿'+scanValue+'璇烽噸鏂版壂鐮�');
}
}
}
--
Gitblit v1.9.3