From 0aaabac24ac4ebc2fe3e54c56e95f250ea238d5b Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 18 七月 2024 14:31:16 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 4c35bf7..b230e60 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -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,
@@ -424,6 +426,7 @@
originalArray: [],
yzSfcFlag: 1,
endYz: false,
+ artificialNgFlag: null,
}
},
beforeDestroy() {
@@ -533,6 +536,11 @@
// this.formulaChildList = []
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
+ console.log(this.artificialNgFlag)
+ if(this.artificialNgFlag !== null){
+ this.formulaChildParams.artificialNgFlag = this.artificialNgFlag
+ this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
+ }
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
@@ -573,6 +581,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,6 +619,7 @@
this.workpieceInformation.productModel = rowsData.productModel;
this.workpieceInformation.productName = rowsData.productName;
this.headContent.cardCode = rowsData.trolleyYard;
+ this.artificialNgFlag = rowsData.artificialNgFlag;
});
this.getListFormulaChild()
// this.addOverStationCollection()
@@ -702,12 +713,18 @@
} else if (event.data === "NG") {
//缁檖lc鍙戜笅绾夸俊鍙�
//娓呴櫎鏁版嵁
- this.$confirm('<span style="font-size: 20px;color: red">鎷х揣瓒呰繃涓夋璇ヤ骇鍝丯G涓嬬嚎锛岃纭锛�</span>', '閫氱煡', {
+ 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;
@@ -736,6 +753,14 @@
formulaChildEntity: self.formulaChildList[formulaChildIndex]
}
+ // if(param.locationCode === 'POP430'){
+ // let enterWeighingparam = {
+ // sfcCode: param.productBarcode,
+ // }
+ // enterWeighing(enterWeighingparam).then(response => {
+ // });
+ // }
+
console.log("杩涘叆鏈�缁堟柟娉�")
self.endSaveData(param)
} else if (event.data.includes("[")) {
--
Gitblit v1.9.3