From d545f19a84599c8664d3a7db87f35e02b1bf93f5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 10 五月 2024 08:33:17 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 150 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 55 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index c29cfdc..8089177 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -85,18 +85,21 @@
</el-col>
</el-row>
-<!-- <el-row style="margin-top: 20px">-->
-<!-- <el-col :span="12">-->
-<!-- <el-input v-model="serialPortContent" style="width: 150px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>-->
+ <el-row v-show="showInput" style="margin-top: 20px">
+ <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-col>-->
-<!-- <el-col :span="12">-->
-<!-- <el-button @click="serialPortMethod" type="primary">涓插彛鑾峰彇鏁版嵁</el-button>-->
+ </el-row>
-<!-- </el-col>-->
-<!-- </el-row>-->
- <el-row style="margin-top: 20px">
- <el-button @click="Release" type="primary">鏀捐</el-button>
+ <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-card>
@@ -112,6 +115,8 @@
<el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps">
</el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
+ </el-table-column>
+ <el-table-column label="鐗╂枡缂栫爜" align="center" prop="materialCode">
</el-table-column>
<el-table-column label="閲囬泦鍊�" align="center" prop="collectData">
</el-table-column>
@@ -302,19 +307,29 @@
} from "@/api/main/bs/formulaChild/formulaChild";
import MySerialPort from "@/utils/MySerialPort";
import USBDevice from "@/utils/usb.json";
-import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
+import {
+ findBytrolleyYardGetOne,
+ listProductionOrde,
+ receivingWorkOrders,
+ trolleyYardBinDing
+} from "@/api/main/om/productionOrde/productionOrde";
import {addPassingStationCollection} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {
addBasicParameters,
addParamCollection,
addTighteningParameters,
- saveCampaignTimeParameters
+ saveCampaignTimeParameters,
+ replaceAssemblyCode,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
name: "stationTerminal",
data() {
return {
+ carCode: '',
+ showInput: false,
+ onLineBinDing: false,
+
serialPortContent: '',
// 鏌ヨ鍙傛暟
formulaChildParams: {
@@ -331,6 +346,8 @@
processesCode: 'OP1010',
processesName: '璐存爣鏈�-璐寸爜',
sfcCode: '',
+ yzSfcCode: '',
+ cardCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -361,7 +378,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.1.100:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -426,8 +443,31 @@
},
},
methods: {
+ bindcardCode(){
+ this.$message('鍙互缁戝畾锛�');
+ let param = {
+ productNum: this.headContent.sfcCode,
+ trolleyYard: this.headContent.cardCode,
+ }
+ trolleyYardBinDing(param).then(response => {
+ });
+
+ },
serialLink() {
this.open1 = true
+ },
+ bindYzSfc(){
+ if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
+ let param = {
+ sfcCode: this.headContent.sfcCode,
+ locationCode: this.headContent.processesCode,
+ yzSfcCode: this.headContent.yzSfcCode
+ }
+ this.$message('鍙互缁戝畾锛�');
+ replaceAssemblyCode(param).then(response => {
+
+ });
+ }
},
Release(){
// this.$message('portsList锛�'+this.portsList.length);
@@ -438,38 +478,8 @@
this.$message('mei杩炴帴浜嗭紒');
}
-
- // //鍒ゆ柇鏄惁鍙互閲婃斁
- // let formulaChildParams = {
- // productCode: this.workpieceInformation.productCode,
- // processesCode: this.headContent.processesCode
- // }
- // releaseCheck(formulaChildParams).then(response => {
- // if(response.data === 0){
- // //鏀瑰彉鐘舵��
- // workpieceRelease(formulaChildParams).then(response => {
- // });
- // this.$message('鏀捐鎴愬姛锛�');
- // this.formulaChildList = []
- // this.getListFormulaChild()
- // // this.resetting()
- // }else {
- // this.$message('姝ラ鏈畬鎴愪笉璁告斁琛岋紒');
- // }
- // });
},
serialPortMethod(value){
- // let formulaChilds = "";
- // this.formulaChildList.forEach((formulaChild) => {
- // let operationType = formulaChild.operationType;
- // let results = formulaChild.results;
- // let materialCode = formulaChild.materialCode;
- // if(operationType === '2' && value.includes(materialCode) && (results === "" || results === null || results === 'NG')){
- // formulaChilds = formulaChild;
- // return; // 浣跨敤return浠ｆ浛break
- // }
- // });
- // console.log(formulaChilds)
let formulaChildParams = {
scanBarcode: value,
sfcBarcode: this.headContent.sfcCode,
@@ -511,11 +521,11 @@
this.cakeLamp.release= 0 //鍏佽鏀捐
this.formulaChildList = []
- this.headContent.sfcCode = null
this.workpieceInformation.productCode = null;
this.workpieceInformation.workOrderNo = null;
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
+ this.headContent.sfcCode = '';
},
changeMenu(tab, event) {
console.log(tab, event);
@@ -564,7 +574,7 @@
inboundTime: new Date()
}
addPassingStationCollection(this.passingStationForm).then(response => {});
- addBasicParameters(this.passingStationForm).then(response => {});
+ // addBasicParameters(this.passingStationForm).then(response => {});
},
exit() {
if (this.ws) {
@@ -593,8 +603,14 @@
}
this.headContent.processesName = rows.processesName
this.headContent.processesCode = rows.processesCode
- console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
+ if(this.headContent.processesCode === 'OP240'){
+ this.onLineBinDing = true
+ }
+ if(this.headContent.processesCode === 'OP260'){
+ this.showInput = true
+ }
+ console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
this.conCom()
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
@@ -621,7 +637,7 @@
saveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
self.endClear()
-
+ workpieceRelease(param).then(response => {});
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -661,23 +677,47 @@
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
- // if(this.cakeLamp.InPlace=== 1){
- if(this.headContent.sfcCode !== ''){
+
+ if(this.headContent.sfcCode !== ''){
+ if(scanValue.includes("P9900173252")){
+ this.headContent.yzSfcCode = scanValue
+ }else if(scanValue.includes("HDY")){
+ this.headContent.cardCode = scanValue
+ }else {
this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
- }else {
- this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
+ }
+ } else {
+ if(this.headContent.processesCode === 'OP240'){
this.headContent.sfcCode = scanValue;
this.queryParams.productNum = scanValue;
this.getList()
- // this.getListFormulaChild()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
+ }else {
+ let param = {
+ trolleyYard: scanValue
+ }
+ findBytrolleyYardGetOne(param).then(response => {
+ if(response.msg !== '2'){
+ this.headContent.sfcCode = response.msg;
+ this.queryParams.productNum = response.msg;
+ this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
+ // this.headContent.sfcCode = scanValue;
+ // this.queryParams.productNum = scanValue;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ }else {
+ this.$message('娌℃湁搴忓垪鍙�'+scanValue);
+ return
+ }
+ });
}
- // }else {
- // this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
- // }
+
+ }
+
}
},
clearHistory() {
--
Gitblit v1.9.3