From 2fbce7d8c0b7e5b055bb7ab77e58b1ec9ce61885 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 24 六月 2024 19:00:22 +0800
Subject: [PATCH] 1，优化人工工位参数采集temp表删除方法 pushGeelycvMesFeedback 2，优化人工工位更新过站记录方法 workpieceRelease 3，优化未绑定小车码弹框提示 4，优化人工工位扫码重复会添加参数采集记录的问题及拧紧数据会添加上物料采集上的问题
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b11f999..4872951 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -505,6 +505,8 @@
console.log(response)
if(response.msg === "3"){
this.cakeLamp.release= 1 //鍏佽鏀捐
+ }else if(response.msg === "2"){
+ this.$message.error('鎵爜閲嶅璇烽噸鏂版壂鐮侊紒');
}
this.getListFormulaChild()
});
@@ -700,7 +702,7 @@
}
if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
- self.$message('鎬绘垚鐮佷负绌猴紝璇锋鏌ワ紒')
+ self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒')
return
}
@@ -739,7 +741,9 @@
});
}
}else {
- self.$message('鏈粦瀹氬皬杞︾爜绂佹鏀捐');
+ self.$alert('<strong style="color: red;font-size: 30px">鏈壂鎻忓皬杞︾爜绂佹鏀捐</strong>', '鎻愮ず', {
+ dangerouslyUseHTMLString: true
+ });
}
});
} else if (event.data.includes("[")) {
@@ -750,26 +754,37 @@
for (let i = 0; i < self.formulaChildList.length; i++) {
let formulaChild = self.formulaChildList[i];
let results = formulaChild.results;
+
if (results === '' || results === null || results === 'NG') {
formulaChilds = formulaChild;
break;
}
}
+ if(formulaChilds === ""){
+ self.$message.error('鏈伐浣嶅凡宸ヤ綔瀹屾垚锛�');
+ return;
+ }
const param = {
+ id: formulaChilds.id,
tightenTheArray: event.data,
paramCode: formulaChilds.paramCode,
workOrderNo: self.workpieceInformation.workOrderNo,
productCode: self.workpieceInformation.productCode,
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
+ spareField1: formulaChilds.spareField1,
+ spareField2: formulaChilds.spareField2,
+ spareField3: formulaChilds.spareField3,
+ spareField4: formulaChilds.spareField4,
+ stepSort: formulaChilds.stepSort
}
if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
return;
}
if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
- addTighteningParameters(param).then(response => {});
updateTighteningFormula(param).then(response => {
+ //addTighteningParameters(param).then(response => {});
self.getListFormulaChild()
}).catch(error =>{
self.getListFormulaChild()
@@ -787,7 +802,7 @@
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
-
+ console.log("sfc=--"+this.headContent.sfcCode+"--")
if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null
&& this.headContent.sfcCode !== undefined){
if(scanValue.includes("P9900173252")){
--
Gitblit v1.9.3