From 616068b49ed7ca709877a30d8abc56ecb6454218 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 14 九月 2024 21:00:30 +0800
Subject: [PATCH] 230优化
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 1f80b90..a2a4073 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -125,7 +125,7 @@
<span>鏈�楂樿浆閫燂細</span><span>12000rpm</span><br>
</div>
<div style="margin-top: 4px">
- <span>闃叉姢绛夌骇锛�</span><span>IP68</span><br>
+ <span>闃叉姢绛夌骇锛�</span><span>IP67</span><br>
</div>
<div style="margin-top: 4px">
<span>宄板�煎伐浣滅數娴侊細</span><span>230A</span><br>
@@ -153,15 +153,15 @@
</div>
<div style="margin-top: 4px">
- <span style="font-size: 22px">993083</span><br>
+ <span style="font-size: 22px">993983</span><br>
</div>
<div style="margin-top: 4px">
- <span style="font-size: 22px">9900166410</span><br>
+ <span style="font-size: 22px">9900200461</span><br>
</div>
<div style="margin-top: 4px">
- <span style="font-size: 22px">2407190000002</span>
+ <span style="font-size: 22px">{{headContent.sfcCode}}</span>
</div>
</div>
@@ -172,7 +172,7 @@
</div>
<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 29px">
<span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- P9900166410#T{{headContent.sfcCode}}
+ P9900200461#T{{headContent.sfcCode}}
</span><br>
<span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
#V993983#SSW002.005#HHW001.001#NMCU
@@ -187,7 +187,7 @@
</div>
<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 29px">
<span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- P9900166410#T{{headContent.sfcCode}}
+ P9900200461#T{{headContent.sfcCode}}
</span><br>
<span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
#V993983#SSW002.005#HHW001.001#NMCU
@@ -266,7 +266,7 @@
bindYzSfcFlag,
checkCarCode, checkYzSfcCode,
findBytrolleyYardGetOne,
- listProductionOrde, mozuReceivingWorkOrders,
+ listProductionOrde, listProductionOrdeLoopLine, mozuReceivingWorkOrders,
receivingWorkOrders,
trolleyYardBinDing
} from "@/api/main/om/productionOrde/productionOrde";
@@ -344,7 +344,7 @@
release: 0 //鍏佽鏀捐
},
content: '',
- // url: "ws://10.103.210.248:8080/websocket/message/",
+ // url: "ws://10.103.214.26:8080/websocket/message/",
url: "ws://192.168.20.250:8080/websocket/message/",
passingStationForm: {},
@@ -388,7 +388,7 @@
){
if(this.materialCode.length>25){
let code = this.materialCode.substring(13,26);
- this.headContent.sfcCode = code;
+ // this.headContent.sfcCode = code;
this.queryParams.productNum = code;
this.getList();
this.cakeLamp.scanFinish = 1
@@ -518,9 +518,19 @@
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
- await listProductionOrde(this.queryParams).then(response => {
+ await listProductionOrdeLoopLine(this.queryParams).then(response => {
let rowsData = response.rows[0];
if(rowsData){
+ if(this.headContent.processesCode === 'OP170'
+ ||this.headContent.processesCode === 'OP180'||
+ this.headContent.processesCode === 'OP190'||
+ this.headContent.processesCode === 'OP200'||
+ this.headContent.processesCode === 'OP210'||
+ this.headContent.processesCode === 'OP220'||
+ this.headContent.processesCode === 'OP230'
+ ){
+ this.headContent.sfcCode = rowsData.productNum
+ }
this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
this.workpieceInformation.productCode = rowsData.productCode;
this.workpieceInformation.materialCode = rowsData.materialCode;
@@ -642,6 +652,8 @@
unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 21}).then(response => {});
}else if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
+ }else if(event.data === "twoHundredAndThirtyEND"){
+ self.endClear()
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
} else if (event.data === "END") {
@@ -680,7 +692,9 @@
} else if(event.data.includes("productNum")){//浜у搧搴忓垪鍙�
let productNum = event.data.split(',')[1];
if(self.headContent.processesCode === 'OP165'){
+ console.log("杩涘幓鎴彇鎬绘垚鐮佹柟娉�165宸ョ珯鍘熷鍊兼槸"+productNum+"鎴彇涔嬪悗鐨勬槸"+productNum.substring(13,26))
self.headContent.sfcCode = productNum.substring(13,26)
+ console.log("self.headContent.sfcCode"+self.headContent.sfcCode)
}else {
self.headContent.sfcCode = productNum;
}
@@ -702,7 +716,7 @@
if(self.headContent.processesCode === "OP165"){
// self.test1()
// self.test2()
- self.text = 'P9900166410#T'+self.headContent.sfcCode+' #V993983#SSW002.005#HHW001.001#NMCU#'
+ self.text = 'P9900200461#T'+self.headContent.sfcCode+' #V993983#SSW002.005#HHW001.001#NMCU#'
}
}else if (event.data.includes("[")) {//鎷х揣
--
Gitblit v1.9.3