From 288790d3b02242a073769db87a20f0912adcdf56 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 13 五月 2024 10:22:39 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 8a79962..5d4b36d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -526,6 +526,8 @@
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
this.headContent.sfcCode = '';
+ this.headContent.yzSfcCode = '';
+ this.headContent.cardCode = '';
},
changeMenu(tab, event) {
console.log(tab, event);
@@ -574,7 +576,7 @@
inboundTime: new Date()
}
addPassingStationCollection(this.passingStationForm).then(response => {});
- addBasicParameters(this.passingStationForm).then(response => {});
+ // addBasicParameters(this.passingStationForm).then(response => {});
},
exit() {
if (this.ws) {
@@ -606,7 +608,7 @@
if(this.headContent.processesCode === 'OP240'){
this.onLineBinDing = true
}
- if(this.headContent.processesCode === 'OP250-1' || this.headContent.processesCode === 'OP250-2' || this.headContent.processesCode === 'OP250-3'){
+ if(this.headContent.processesCode === 'OP260'){
this.showInput = true
}
@@ -679,9 +681,9 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
if(this.headContent.sfcCode !== ''){
- if(scanValue.includes("SS")){
+ if(scanValue.includes("P9900173252")){
this.headContent.yzSfcCode = scanValue
- }else if(scanValue.includes("CC")){
+ }else if(scanValue.includes("HDY")){
this.headContent.cardCode = scanValue
}else {
this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
@@ -692,22 +694,30 @@
if(this.headContent.processesCode === 'OP240'){
this.headContent.sfcCode = scanValue;
this.queryParams.productNum = scanValue;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
}else {
let param = {
trolleyYard: scanValue
}
findBytrolleyYardGetOne(param).then(response => {
- this.headContent.sfcCode = response.msg;
- this.queryParams.productNum = response.msg;
-
+ if(response.msg !== '2'){
+ this.headContent.sfcCode = response.msg;
+ this.queryParams.productNum = response.msg;
+ this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
+ // this.headContent.sfcCode = scanValue;
+ // this.queryParams.productNum = scanValue;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ }else {
+ this.$message('娌℃湁搴忓垪鍙�'+scanValue);
+ return
+ }
});
}
- this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- // this.headContent.sfcCode = scanValue;
- // this.queryParams.productNum = scanValue;
- this.getList()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
+
}
}
--
Gitblit v1.9.3