From 8cfe20288690f2ba46c804f41f39e8aa48c2dea0 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 15 六月 2024 09:08:30 +0800
Subject: [PATCH] 上传逻辑大版本更新
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 166 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 136 insertions(+), 30 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 8089177..ab5af44 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -89,18 +89,17 @@
<el-col></el-col>
<span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
</el-row>
- <el-row v-show="showInput" style="margin-top: 20px">
- <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
-
- </el-row>
+<!-- <el-row v-show="showInput" style="margin-top: 20px">-->
+<!-- <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>-->
+<!-- </el-row>-->
<el-row v-show="onLineBinDing" style="margin-top: 20px">
<el-col></el-col>
<span style="width: 130px;" class="head-font">灏忚溅鐮� : {{headContent.cardCode}}</span>
</el-row>
- <el-row v-show="onLineBinDing" style="margin-top: 20px">
- <el-button @click="bindcardCode" type="primary">缁戝畾</el-button>
- </el-row>
+<!-- <el-row v-show="onLineBinDing" style="margin-top: 20px">-->
+<!-- <el-button @click="bindcardCode" type="primary">缁戝畾</el-button>-->
+<!-- </el-row>-->
</el-card>
</el-col>
@@ -110,9 +109,12 @@
<span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
<el-col :span="24">
<el-table height="500" :cell-style="rowStyle" :data="formulaChildList">
- <el-table-column label="鎺掑簭" width="60" align="center" type="index">
+<!-- <el-table-column label="鎺掑簭" width="60" align="center" type="index">-->
+<!-- </el-table-column>-->
+ <el-table-column label="鎷х揣姝ュ彿" align="center" prop="stepSort">
</el-table-column>
- <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps">
+<!-- <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps">-->
+ <el-table-column label="鎿嶄綔鍐呭" align="center" prop="operationSteps">
</el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
</el-table-column>
@@ -122,6 +124,7 @@
</el-table-column>
<el-table-column label="缁撴灉" align="center" prop="results">
</el-table-column>
+
</el-table>
</el-col>
<!-- <el-col :span="14">-->
@@ -298,6 +301,8 @@
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
+ clearWorkpieceRelease,
+ fistSetpNumber,
listFormulaChild,
noPageListFormulaChild,
releaseCheck,
@@ -308,6 +313,8 @@
import MySerialPort from "@/utils/MySerialPort";
import USBDevice from "@/utils/usb.json";
import {
+ bindYzSfcFlag,
+ checkCarCode, checkYzSfcCode,
findBytrolleyYardGetOne,
listProductionOrde,
receivingWorkOrders,
@@ -319,7 +326,7 @@
addParamCollection,
addTighteningParameters,
saveCampaignTimeParameters,
- replaceAssemblyCode,
+ replaceAssemblyCode, checkRecordDataDone,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -407,6 +414,7 @@
passingStationForm: {},
originalArray: [],
+ yzSfcFlag: 1,
}
},
beforeDestroy() {
@@ -444,7 +452,7 @@
},
methods: {
bindcardCode(){
- this.$message('鍙互缁戝畾锛�');
+ this.$message('缁戝畾鎴愬姛锛�');
let param = {
productNum: this.headContent.sfcCode,
trolleyYard: this.headContent.cardCode,
@@ -463,9 +471,14 @@
locationCode: this.headContent.processesCode,
yzSfcCode: this.headContent.yzSfcCode
}
- this.$message('鍙互缁戝畾锛�');
+ const orderParam = {
+ productNum: this.headContent.sfcCode,
+ }
replaceAssemblyCode(param).then(response => {
-
+ this.$message('缁戝畾鎴愬姛锛�');
+ bindYzSfcFlag(orderParam).then(response => {
+ this.yzSfcFlag = 1
+ });
});
}
},
@@ -512,6 +525,26 @@
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
+ if (this.formulaChildList.length >0){
+ let pos = 0
+ const tempArr = this.formulaChildList.filter(x=> 'OK' === x.results)
+ if (tempArr.length>0){
+ pos = tempArr.length
+ this.$nextTick(() => {
+ let temp33 = document.getElementsByClassName('el-table__row')
+ console.log('temp33',temp33)
+ console.log('len',temp33.item(pos))
+ if (temp33.length > 0){
+ console.log('1111111111111111')
+ let arr = temp33[pos-1]
+ console.log('srr',arr)
+ arr.scrollIntoView({ block: 'center' })
+ }
+ })
+ }
+
+ }
+
});
},
endClear(){
@@ -526,13 +559,23 @@
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
this.headContent.sfcCode = '';
+ this.headContent.yzSfcCode = '';
+ this.headContent.cardCode = '';
},
changeMenu(tab, event) {
console.log(tab, event);
},
clearClick(){
- this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
- this.headContent.sfcCode = null
+ const param = {
+ workOrderNo: this.workpieceInformation.workOrderNo,
+ productCode: this.workpieceInformation.productCode,
+ locationCode: this.headContent.processesCode,
+ productBarcode: this.headContent.sfcCode,
+ }
+ this.endClear()
+ clearWorkpieceRelease(param).then(response => {});
+ this.headContent.sfcCode = ''
+ this.$message('娓呮鎴愬姛锛�');
},
scanCompleted(){
this.$message('鎵爜瀹屾垚'+this.content);
@@ -553,12 +596,16 @@
this.workpieceInformation.productCode = rowsData.productCode;
this.workpieceInformation.productModel = rowsData.productModel;
this.workpieceInformation.productName = rowsData.productName;
- this.timer = setInterval(() => {
- this.workpieceInformation.beat++;
- }, 1000);
+ // this.timer = setInterval(() => {
+ // this.workpieceInformation.beat++;
+ // }, 1000);
});
this.getListFormulaChild()
this.addOverStationCollection()
+ },
+
+ addBaseData(){
+ addBasicParameters(this.passingStationForm).then(response => {});
},
/** 鍏ョ珯澧炲姞杩囩珯閲囬泦璁板綍 **/
@@ -611,6 +658,7 @@
}
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
+
});
this.conCom()
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
@@ -619,10 +667,16 @@
const self = this;
this.ws.onopen = function (event) {
this.$message('websocket杩炴帴鎴愬姛锛�');
+
};
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 === "OUT") {
@@ -634,10 +688,54 @@
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
}
- saveCampaignTimeParameters(param).then(response => {});
- self.cakeLamp.release = 1;
- self.endClear()
- workpieceRelease(param).then(response => {});
+
+ const orderParam = {
+ productNum: self.headContent.sfcCode,
+ }
+
+ if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
+ self.$message('鎬绘垚鐮佷负绌猴紝璇锋鏌ワ紒')
+ return
+ }
+
+ 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.$message('鏈粦瀹氬皬杞︾爜绂佹鏀捐');
+ }
+ });
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -659,12 +757,18 @@
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
}
- addTighteningParameters(param).then(response => {});
- updateTighteningFormula(param).then(response => {
- self.getListFormulaChild()
- }).catch(error =>{
- self.getListFormulaChild()
- });
+ 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 => {
+ self.getListFormulaChild()
+ }).catch(error =>{
+ self.getListFormulaChild()
+ });
+ }
}
};
},
@@ -681,10 +785,12 @@
if(this.headContent.sfcCode !== ''){
if(scanValue.includes("P9900173252")){
this.headContent.yzSfcCode = scanValue
- }else if(scanValue.includes("HDY")){
+ this.bindYzSfc();
+ }else if(scanValue.includes("0RSP1TE")){
this.headContent.cardCode = scanValue
+ this.bindcardCode();
}else {
- this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
+ this.$message('宸ヤ綅缁堢鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
}
--
Gitblit v1.9.3