From a75d86bc0d41018edf2e25b9740bc0be6978b735 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 07 五月 2024 08:31:09 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 46 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 1f17669..8a79962 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -85,24 +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-col>-->
-<!-- <el-col :span="12">-->
-<!-- <el-button @click="serialPortMethod" type="primary">涓插彛鑾峰彇鏁版嵁</el-button>-->
-
-<!-- </el-col>-->
-<!-- </el-row>-->
<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="Release" type="primary">缁戝畾</el-button>-->
<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-card>
@@ -310,7 +307,12 @@
} 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,
@@ -324,7 +326,10 @@
name: "stationTerminal",
data() {
return {
- showInput: true,
+ carCode: '',
+ showInput: false,
+ onLineBinDing: false,
+
serialPortContent: '',
// 鏌ヨ鍙傛暟
formulaChildParams: {
@@ -342,6 +347,7 @@
processesName: '璐存爣鏈�-璐寸爜',
sfcCode: '',
yzSfcCode: '',
+ cardCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -437,6 +443,16 @@
},
},
methods: {
+ bindcardCode(){
+ this.$message('鍙互缁戝畾锛�');
+ let param = {
+ productNum: this.headContent.sfcCode,
+ trolleyYard: this.headContent.cardCode,
+ }
+ trolleyYardBinDing(param).then(response => {
+ });
+
+ },
serialLink() {
this.open1 = true
},
@@ -462,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,
@@ -617,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 === 'OP250-1' || this.headContent.processesCode === 'OP250-2' || this.headContent.processesCode === 'OP250-3'){
+ this.showInput = true
+ }
+ console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
this.conCom()
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
@@ -689,15 +681,30 @@
if(this.headContent.sfcCode !== ''){
if(scanValue.includes("SS")){
this.headContent.yzSfcCode = scanValue
+ }else if(scanValue.includes("CC")){
+ this.headContent.cardCode = scanValue
}else {
this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
}
} else {
+ if(this.headContent.processesCode === 'OP240'){
+ this.headContent.sfcCode = scanValue;
+ this.queryParams.productNum = scanValue;
+ }else {
+ let param = {
+ trolleyYard: scanValue
+ }
+ findBytrolleyYardGetOne(param).then(response => {
+ this.headContent.sfcCode = response.msg;
+ this.queryParams.productNum = response.msg;
+
+ });
+ }
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- this.headContent.sfcCode = scanValue;
- this.queryParams.productNum = scanValue;
+ // this.headContent.sfcCode = scanValue;
+ // this.queryParams.productNum = scanValue;
this.getList()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
--
Gitblit v1.9.3