From e9e2c4dba5e42c8b07ee7d4f1cf8fdbd8f0b4bc7 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 02 八月 2024 15:41:52 +0800
Subject: [PATCH] -bug修改
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 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 4c35bf7..94f9903 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: [],
@@ -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)
@@ -702,12 +711,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;
@@ -735,6 +750,14 @@
inboundTime: self.workpieceInformation.inboundTime,
formulaChildEntity: self.formulaChildList[formulaChildIndex]
}
+
+ // if(param.locationCode === 'POP430'){
+ // let enterWeighingparam = {
+ // sfcCode: param.productBarcode,
+ // }
+ // enterWeighing(enterWeighingparam).then(response => {
+ // });
+ // }
console.log("杩涘叆鏈�缁堟柟娉�")
self.endSaveData(param)
@@ -775,6 +798,8 @@
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 => {});
--
Gitblit v1.9.3