From 5f75515d78809c336cb1a004a8cacf53c982344b Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 26 七月 2024 20:25:03 +0800
Subject: [PATCH] -加420订阅
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 151 +++++++++++++++++++++-----------------------------
1 files changed, 63 insertions(+), 88 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index e91c97d..94f9903 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -308,10 +308,10 @@
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
clearWorkpieceRelease,
- fistSetpNumber,
- listFormulaChild,
+ fistSetpNumber, inPlaceInspection,
+ listFormulaChild, manualNgOffline,
noPageListFormulaChild,
- releaseCheck,
+ releaseCheck, unfinishedProcess,
updateResults,
updateTighteningFormula,
workpieceRelease
@@ -332,7 +332,7 @@
addParamCollection,
addTighteningParameters,
saveCampaignTimeParameters,
- replaceAssemblyCode, checkRecordDataDone,
+ replaceAssemblyCode, checkRecordDataDone, enterWeighing,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -350,6 +350,8 @@
pageSize: 10,
productCode: null,
processesCode: null,
+ artificialNgFlag: null,
+ sfcBarcode: null,
},
// 閰嶆柟閰嶇疆瀛愪俊鎭〃鏍兼暟鎹�
formulaChildList: [],
@@ -392,8 +394,8 @@
content: '',
activeName: 'first',
// 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/",
+ // url: "ws://10.103.210.248:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -533,7 +535,10 @@
// this.formulaChildList = []
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
- console.log(this.formulaChildParams)
+ if(this.formulaChildParams.artificialNgFlag !== null){
+ this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
+ }
+ console.log("getListFormulaChild"+this.formulaChildParams.artificialNgFlag)
noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
if (this.formulaChildList.length >0){
@@ -573,6 +578,8 @@
this.headContent.sfcCode = '';
this.headContent.yzSfcCode = '';
this.headContent.cardCode = '';
+ this.formulaChildParams.artificialNgFlag = null
+ this.formulaChildParams.sfcBarcode = null
},
changeMenu(tab, event) {
console.log(tab, event);
@@ -609,12 +616,14 @@
this.workpieceInformation.productModel = rowsData.productModel;
this.workpieceInformation.productName = rowsData.productName;
this.headContent.cardCode = rowsData.trolleyYard;
+ this.formulaChildParams.artificialNgFlag = rowsData.artificialNgFlag;
});
this.getListFormulaChild()
// this.addOverStationCollection()
this.workpieceInformation.inboundTime = this.getCurrentTime()
const param = {
processesCode: this.headContent.processesCode,
+ productCode: this.workpieceInformation.productCode
}
fistSetpNumber(param).then(response => {
console.log("fistSetpNumber------"+response.msg)
@@ -680,14 +689,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
- }
-
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
+ inPlaceInspection({processesCode: this.headContent.processesCode}).then(response => {
+ console.log(response)
+ this.cakeLamp.InPlace = response.data
+ });
});
this.conCom()
@@ -702,13 +708,22 @@
this.ws.onmessage = function (event) {
if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
- console.log(self.headContent.processesCode);
- // const param = {
- // processesCode: self.headContent.processesCode,
- // }
- // fistSetpNumber(param).then(response => {});
- } else if (event.data === "IN0") {
- self.cakeLamp.InPlace = 0;
+ } else if (event.data === "NG") {
+ //缁檖lc鍙戜笅绾夸俊鍙�
+ //娓呴櫎鏁版嵁
+ self.$confirm('鎷х揣涓夋NG锛岃纭涓嬬嚎锛侊紒锛�', '娑堟伅', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ showCancelButton: false,
+ type: 'warning'
+ }).then(() => {
+ self.ngFunction();
+ this.$message({
+ type: 'success',
+ message: '纭鎴愬姛!'
+ });
+ });
+
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
} else if (event.data === "END") {
@@ -716,12 +731,14 @@
const formulaChildIndex = self.formulaChildList.length-1
if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 26}).then(response => {});
self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒')
return;
}
if(self.formulaChildList[formulaChildIndex].results !== 'OK'){
self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 25}).then(response => {});
return;
}
@@ -734,72 +751,16 @@
formulaChildEntity: self.formulaChildList[formulaChildIndex]
}
- console.log("杩涘叆鏈�缁堟柟娉�")
- self.endSaveData(param)
-
-
- // if(self.headContent.processesCode === "OP260"){
- // checkYzSfcCode(orderParam).then(response => {
- // if(response.data === 0){
- // self.$message('鏈粦瀹氭�绘垚鐮佺姝㈡斁琛�');
- // return;
- // }else {
- // self.endSaveData(param)
- // // saveCampaignTimeParameters(param).then(response => {
- // // self.cakeLamp.release = 1;
- // // self.endClear()
- // // workpieceRelease(param).then(response => {});});
- // }
- // })
- // }else {
- // self.endSaveData(param)
- // // saveCampaignTimeParameters(param).then(response => {
- // // self.cakeLamp.release = 1;
- // // self.endClear()
- // // workpieceRelease(param).then(response => {});
- // // });
+ // if(param.locationCode === 'POP430'){
+ // let enterWeighingparam = {
+ // sfcCode: param.productBarcode,
+ // }
+ // enterWeighing(enterWeighingparam).then(response => {
+ // });
// }
- // checkCarCode(orderParam).then(response => {
- // console.log(response.data)
- // if(response.data === 1){
- // if(self.headContent.processesCode === "OP260"){
- // checkYzSfcCode(orderParam).then(response => {
- // if(response.data === 1){
- // saveCampaignTimeParameters(param).then(response => {
- // checkRecordDataDone(param).then(response => {
- // if(response.msg === "21"){
- // self.cakeLamp.release = 1;
- // self.endClear()
- // workpieceRelease(param).then(response => {});
- // }else {
- // self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
- // }
- // });
- // });
- // }else {
- // self.$message('璇峰厛缁戝畾棰勮鎬绘垚');
- // }
- // });
- // }else {
- // saveCampaignTimeParameters(param).then(response => {
- // checkRecordDataDone(param).then(response => {
- // if(response.msg === "21"){
- // self.cakeLamp.release = 1;
- // self.endClear()
- // workpieceRelease(param).then(response => {});
- // }else {
- // self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
- // }
- // });
- // });
- // }
- // }else {
- // self.$alert('<strong style="color: red;font-size: 30px">鏈壂鎻忓皬杞︾爜绂佹鏀捐</strong>', '鎻愮ず', {
- // dangerouslyUseHTMLString: true
- // });
- // }
- // });
+ console.log("杩涘叆鏈�缁堟柟娉�")
+ self.endSaveData(param)
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -830,12 +791,15 @@
spareField2: formulaChilds.spareField2,
spareField3: formulaChilds.spareField3,
spareField4: formulaChilds.spareField4,
- stepSort: formulaChilds.stepSort
+ stepSort: formulaChilds.stepSort,
+ ngTimes: formulaChilds.ngTimes,
}
if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
return;
}
+ self.formulaChildParams.artificialNgFlag = null
+ console.log("self.formulaChildParams.artificialNgFlag"+self.formulaChildParams.artificialNgFlag)
if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
updateTighteningFormula(param).then(response => {
//addTighteningParameters(param).then(response => {});
@@ -856,6 +820,17 @@
});
},
+ ngFunction(){
+ const param = {
+ locationCode: this.headContent.processesCode,
+ sfcBarcode: this.headContent.sfcCode,
+ productCode: this.workpieceInformation.productCode,
+ }
+ manualNgOffline(param).then(response => {});
+ clearWorkpieceRelease(param).then(releaseCheck =>{});
+ this.endClear()
+ },
+
//鎺ュ彈鏁版嵁鐨勫洖璋�
callBack(value) {
if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
@@ -869,7 +844,7 @@
// this.headContent.yzSfcCode = scanValue
// this.bindYzSfc();
// }else
- if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'POP240'){
+ if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'POP230'){
this.headContent.cardCode = scanValue
this.bindcardCode(scanValue);
this.serialPortMethod(scanValue)
@@ -879,7 +854,7 @@
this.serialPortMethod(scanValue)
}
} else {
- if(this.headContent.processesCode === 'POP240'){
+ if(this.headContent.processesCode === 'POP230'){
this.headContent.sfcCode = scanValue;
this.queryParams.productNum = scanValue;
this.getList()
--
Gitblit v1.9.3