From c5a2b71990cabc221834b856c99954677f1b5646 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 06 八月 2024 10:03:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 34 ++++++++++++++++-
UI-Project/config.js | 7 ++-
UI-Project/src/views/Caching/cachingun.vue | 5 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 15 +++++--
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 10 ++--
UI-Project/src/utils/constants.js | 3 +
UI-Project/src/utils/WebSocketService.js | 13 ++++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 2
8 files changed, 71 insertions(+), 18 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index b15a1a5..8801d0c 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,7 +1,10 @@
export default {
- serverUrl: "10.153.19.150:88/api",
+// serverUrl: "10.153.19.150:88/api",
// serverUrl: "192.168.1.199:88/api",
- serverUrl2: "10.153.19.150:88"
+ serverUrl: "127.0.0.1:88/api",
+ // serverUrl2: "10.153.19.150:88"
// serverUrl2: "192.168.1.199:88"
+ serverUrl2: "127.0.0.1:88"
+
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/utils/WebSocketService.js b/UI-Project/src/utils/WebSocketService.js
index 0c2d76f..695f679 100644
--- a/UI-Project/src/utils/WebSocketService.js
+++ b/UI-Project/src/utils/WebSocketService.js
@@ -1,4 +1,5 @@
// WebSocketService.js
+
let socket = null;
export const initializeWebSocket = (socketUrl, messageHandler) => {
let messages='' ;
@@ -6,10 +7,13 @@
console.log("Your browser does not support WebSocket");
return null;
}
+
const socket = new WebSocket(socketUrl);
+
socket.onopen = function () {
console.log("WebSocket is now open");
};
+
socket.onmessage = (msg) => {
if (!msg.data) {
return;
@@ -21,14 +25,23 @@
messages= messages.replace('<END>', '');
const obj = JSON.parse(messages);
messages='';
+
// 璋冪敤娑堟伅澶勭悊鍑芥暟锛屽皢鏁版嵁浼犻�掔粰 Vue 缁勪欢
if (messageHandler) {
messageHandler(obj);
}
}
+
+
+
+
+
};
+
return socket;
};
+
+
export const closeWebSocket = (socket) => {
if (socket && socket.readyState === WebSocket.OPEN) {
socket.close();
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 67d36d2..7e57f58 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,3 +1,4 @@
// export const WebSocketHost = "192.168.1.199";
-export const WebSocketHost = "10.153.19.150";
+// export const WebSocketHost = "10.153.19.150";
+export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 7b55968..737c1de 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -210,11 +210,10 @@
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- tableData.value = data.params2[0]
- // tableData.splice(0, tableData.length, ...data.params2[0]);
+ tableData.splice(0, tableData.length, ...data.params[0]);
// tableData.value = data.params[0]
// adjustedRects.value = data.EdgStorageCageinfos[0]
- adjustedRects.value = data.params2[0].map(rect => ({
+ adjustedRects.value = data.params[0].map(rect => ({
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
width: rect.width * 0.5 ,
id: rect.id * 10,
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index c0fbde6..844a323 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -15,6 +15,7 @@
import { WebSocketHost ,host} from '@/utils/constants'
const dialogFormVisiblea = ref(false)
const dialogFormVisiblea2 = ref(false)
+const dialogFormVisibleaDownGlass = ref(false)
// 鏁版嵁
const loading = ref(false);
// 寮规鏄剧ず鎺у埗
@@ -25,6 +26,7 @@
const flowCardId = ref('');
const flowCardOptions = ref('[]');
const tableData = reactive([]);
+const downGlass= ref([]);
// 鏂规硶
const handleSelectionChange = () => {
// 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
@@ -144,7 +146,13 @@
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- tableData.splice(0, tableData.length, ...data.params[0]);
+ if(data.sendDownGlass!=null){
+ downGlass.value=data.sendDownGlass[0][1];
+ console.log(downGlass.value);
+ console.log(tableData.value);
+ }
+ // tableData.splice(0, tableData.length, ...data.params[0]);
+
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
@@ -208,6 +216,7 @@
</script>
<template>
<div>
+ <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisibleaDownGlass = true">钀芥灦璇︽儏</el-button>
<el-card style="flex: 1;" v-loading="loading">
<el-card style="flex: 1;margin-left: 4px;margin-top: 1px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
@@ -230,7 +239,6 @@
prop="enableState"
>
<template #default="scope">
-
<el-tag :type="getTagType(scope.row.enableState)" @click="toggleStatus(scope.row)">
{{ scope.row.enableState === 1 ? $t('reportWork.enable') : $t('reportWork.unenable') }}
</el-tag>
@@ -241,9 +249,29 @@
<el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">{{ $t('reportWork.bindingshelves') }}</el-button>
<el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">{{ $t('reportWork.clear') }}</el-button>
</template>
+
</el-table-column>
</el-table>
+
</div>
+ <el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
+ <el-table height="200px" ref="table"
+ @selection-change="handleSelectionChange"
+ :data="downGlass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="workStationId" align="center" :label="$t('宸ヤ綅鍙�')" min-width="80" />
+ <el-table-column prop="engineerId" align="center" :label="$t('宸ョ▼鍙�')" min-width="80" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('娴佺▼鍗″彿')" min-width="80" />
+ <el-table-column prop="layer" align="center" :label="$t('灞�')" min-width="120" />
+ <el-table-column prop="sequence" align="center" :label="$t('椤哄簭')" min-width="150" />
+ <el-table-column prop="width" align="center" :label="$t('瀹�')" min-width="120" />
+ <el-table-column prop="height" align="center" :label="$t('楂�')" min-width="120" />
+ <el-table-column prop="Filmsid" align="center" :label="$t('鑶滅郴')" min-width="120" />
+ <el-table-column prop="thickness" align="center" label="鍘氬害" min-width="120" />
+ <el-table-column prop="glassId" align="center" :label="$t('鐜荤拑id')" min-width="120" />
+
+ </el-table>
+ </el-dialog>
+
</el-card>
<!-- workstationId: '1',
workstationId: '1005',
@@ -260,6 +288,7 @@
</div>
</div>
</el-card>
+
</div>
<el-dialog v-model="dialogFormVisiblea" top="21vh" width="40%" :title="$t('reportWork.bindingshelves')">
@@ -279,6 +308,7 @@
</div>
<template #footer>
<div id="dialog-footer">
+
<el-button type="primary" @click="handleConfirm">
{{ $t('reportWork.sure') }}
</el-button>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index d076724..813c75d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -174,20 +174,23 @@
//鏌ヨ鐜荤拑骞惰繘琛屼氦鎹�
GlassInfo glassInfo = queryAndChangeGlass(glassId);
- log.info("3銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
+ if (glassInfo == null) {
+ return;
+ }
+ log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
EdgStorageCageDetails details = new EdgStorageCageDetails();
BeanUtils.copyProperties(glassInfo, details);
details.setState(Const.GLASS_STATE_IN);
details.setSlot(nearestEmpty.getSlot());
details.setDeviceId(nearestEmpty.getDeviceId());
edgStorageCageDetailsService.save(details);
- log.info("4銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
+ log.info("5銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
//娣诲姞杩涚墖浠诲姟
boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
- log.info("5銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
+ log.info("6銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 1);
- log.info("6銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
+ log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
}
@@ -202,6 +205,10 @@
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
// .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));
Assert.isFalse(null == glassInfo, "鐜荤拑淇℃伅涓嶅瓨鍦�");
+ if ((glassInfo.getWidth() < Double.parseDouble(minTwoFirstLength) && glassInfo.getHeight() < Double.parseDouble(minTwoSecondLength)) || (glassInfo.getWidth() < Double.parseDouble(minTwoSecondLength) && glassInfo.getHeight() < Double.parseDouble(minTwoFirstLength))) {
+ log.info("3銆佺幓鐠冧俊鎭笉绗﹀悎杩涘叆鐞嗙墖绗兼渶灏忓昂瀵革紝鐜荤拑淇℃伅涓簕}", glassInfo);
+ return null;
+ }
//鎸夌収鐜荤拑灏哄
LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getWidth, glassInfo.getWidth())
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 7ecbf06..0a371fb 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -43,7 +43,7 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 30000)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鑱旀満鐘舵��
@@ -87,7 +87,7 @@
}
}
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 30000)
public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
@@ -152,8 +152,8 @@
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
-// String inkageStatus ="1";
+// String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
+ String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
@@ -175,7 +175,7 @@
}else {
jsonObject.append("engineering", "0");
}
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("IsRun");
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index e0a91f0..4a9356e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -76,7 +76,7 @@
//姝ｅ湪杩涜鐨勪换鍔�
List<TemperingGlassInfo>temperingTaskType=temperingAgoService.selectTaskType();
jsonObject.append("temperingTaskType", temperingTaskType);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0