From 2bbc7c7398f59e844e942203615732dcc79de0a5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 13 九月 2024 16:19:42 +0800
Subject: [PATCH] 主线人工工位进站给plc写使能1
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 23 ++++++++++++++---------
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 2 ++
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index e4e6c25..1bfcdd1 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -121,6 +121,8 @@
productNum = "productNum,"+ productNum;
WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ String str = thoroughfare + "." + device + ".MESScrew";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(1).build());//鎷х揣姝ラ
}
}
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 9c08027..1f80b90 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -83,7 +83,7 @@
<div style="text-align: center;margin-top: 64px">
<span style="font-size: 29px;">鐢甸┍绯荤粺鎬绘垚</span>
</div>
- <div style="display: flex;margin-top: 2px;margin-left: 44px;font-size: 15px">
+ <div style="display: flex;margin-top: 2px;margin-left: 39px;font-size: 15px">
<div class="div1">
<div >
<span>鐢垫満鍨嬪彿锛�</span><span>TZ180XSDSZX01</span><br>
@@ -111,7 +111,7 @@
</div>
</div>
- <div class="div2" style="font-size: 15px;margin-left: 12px">
+ <div class="div2" style="font-size: 15px;margin-left: 4px">
<div>
<span>鎺у埗鍣ㄥ瀷鍙凤細</span><span>KTZ34X23SZX07</span><br>
</div>
@@ -138,7 +138,7 @@
</div>
</div>
</div>
- <div style="margin-top: 2px;margin-left: 80px">
+ <div style="margin-top: 2px;margin-left: 70px">
<span style="font-size: 26px;">婀栧窞鏅鸿姱鍔ㄥ姏绯荤粺鍙戝睍鏈夐檺鍏徃</span>
</div>
@@ -166,11 +166,11 @@
</div>
</div>
- <div style="margin-top: 61px;display: flex;margin-left: 48px">
+ <div style="margin-top: 61px;display: flex;margin-left: 40px">
<div style="width: 30%;flex: 1">
<VueQr :size='80' :margin='0' :text='this.text'></VueQr>
</div>
- <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
+ <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}}
</span><br>
@@ -181,11 +181,11 @@
</div>
</div>
- <div style="margin-top: 48px;display: flex;margin-left: 48px">
+ <div style="margin-top: 48px;display: flex;margin-left: 40px">
<div style="width: 30%;flex: 1">
<VueQr :size='80' :margin='0' :text='this.text'></VueQr>
</div>
- <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
+ <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}}
</span><br>
@@ -639,6 +639,7 @@
this.ws.onmessage = function (event) {
if (event.data === "print") {
document.getElementById('print').click();
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 21}).then(response => {});
}else if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
} else if (event.data === "OUT") {
@@ -678,7 +679,11 @@
} else if(event.data.includes("productNum")){//浜у搧搴忓垪鍙�
let productNum = event.data.split(',')[1];
- self.headContent.sfcCode = productNum;
+ if(self.headContent.processesCode === 'OP165'){
+ self.headContent.sfcCode = productNum.substring(13,26)
+ }else {
+ self.headContent.sfcCode = productNum;
+ }
self.queryParams.productNum = productNum;
self.getList()
self.cakeLamp.scanFinish = 1
@@ -697,7 +702,7 @@
if(self.headContent.processesCode === "OP165"){
// self.test1()
// self.test2()
- self.text = 'P9900166410#T'+self.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
+ self.text = 'P9900166410#T'+self.headContent.sfcCode+' #V993983#SSW002.005#HHW001.001#NMCU#'
}
}else if (event.data.includes("[")) {//鎷х揣
--
Gitblit v1.9.3