From e70689e688fdc7d228e1bbdc2aa6b0ab96665423 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 七月 2024 19:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/config.js | 8 ++--
UI-Project/src/views/StockBasicData/stockBasicData.vue | 8 +++-
UI-Project/src/views/Returns/returns.vue | 6 +-
UI-Project/src/views/Identify/identify.vue | 32 +++++++++-------
UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue | 8 +++-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 7 ++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java | 8 ++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 1
UI-Project/src/utils/constants.js | 4 +-
UI-Project/src/utils/WebSocketService.js | 3 -
10 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index b15a1a5..7df122b 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,7 +1,7 @@
export default {
- serverUrl: "10.153.19.150:88/api",
-// serverUrl: "192.168.1.199:88/api",
- serverUrl2: "10.153.19.150:88"
- // serverUrl2: "192.168.1.199:88"
+// serverUrl: "10.153.19.150:88/api",
+ serverUrl: "192.168.1.199:88/api",
+ // serverUrl2: "10.153.19.150:88"
+ serverUrl2: "192.168.1.199: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 4ad03b7..f74df0a 100644
--- a/UI-Project/src/utils/WebSocketService.js
+++ b/UI-Project/src/utils/WebSocketService.js
@@ -1,7 +1,7 @@
// WebSocketService.js
let socket = null;
-let messages = '';
+let messages='' ;
export const initializeWebSocket = (socketUrl, messageHandler) => {
if (typeof WebSocket === "undefined") {
console.log("Your browser does not support WebSocket");
@@ -18,7 +18,6 @@
if (!msg.data) {
return;
}
-
const isLastChunk = msg.data.endsWith('<END>');
//鏄惁涓烘渶鍚庝竴鍧楁秷鎭�
messages += msg.data;
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 67d36d2..9a2423c 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,3 +1,3 @@
-// export const WebSocketHost = "192.168.1.199";
-export const WebSocketHost = "10.153.19.150";
+export const WebSocketHost = "192.168.1.199";
+// export const WebSocketHost = "10.153.19.150";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 74f05a1..64df621 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -103,13 +103,15 @@
// 鐮存崯
const handleDamage = async () => {
try {
- var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
- console.log(url);
- const response = await request.post(url)
- // const response = await request.post('/cacheGlass/taskCache/identControls', {
- // identId: currentGlassId.value,
- // controlsId: 201,
- // })
+ // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
+ // console.log(url);
+ // const response = await request.post(url)
+ const response = await request.post('/cacheGlass/taskCache/identControls', {
+ identId: currentGlassId.value,
+ controlsId: 201,
+ line: 1001,
+ machine: '璇嗗埆',
+ })
if (response.code == 200) {
ElMessage.success(response.message);
// window.location.reload()
@@ -128,13 +130,15 @@
// 浜哄伐鎷胯蛋
const handleManualTake = async () => {
try {
- var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
- console.log(url);
- const response = await request.post(url)
- // const response = await request.post('/cacheGlass/taskCache/identControls', {
- // identId: currentGlassId.value,
- // controlsId: 200,
- // })
+ // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
+ // console.log(url);
+ // const response = await request.post(url)
+ const response = await request.post('/cacheGlass/taskCache/identControls', {
+ identId: currentGlassId.value,
+ controlsId: 200,
+ line: 1001,
+ machine: '璇嗗埆',
+ })
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 85ae736..6d0153a 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -594,11 +594,11 @@
console.error('WebSocket杩炴帴寮傚父鍏抽棴');
}
};
-
// 鐩戝惉WebSocket鐨勬秷鎭簨浠�
ws.onmessage = (event) => {
try {
- const data = JSON.parse(event.data); // 瑙ｆ瀽娑堟伅涓篔SON
+
+ const data = JSON.parse(event.data.replace('<END>', '')); // 瑙ｆ瀽娑堟伅涓篔SON
if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) {
if(data.InkageStatus!=null){
@@ -610,7 +610,7 @@
}
} else {
// 澶勭悊閿欒鎯呭喌鎴栨棤鏁堟暟鎹�
- console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);
+ // console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);
}
} catch (error) {
console.error('瑙ｆ瀽WebSocket娑堟伅鏃跺彂鐢熼敊璇�', error);
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index d20f65a..8b0da31 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -50,7 +50,9 @@
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
glassId: row.GlassId,
- controlsId: 300
+ controlsId: 300,
+ line: 2001,
+ machine: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -81,7 +83,9 @@
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
glassId: row.GlassId,
- controlsId: 301
+ controlsId: 301,
+ line: 2001,
+ machine: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
index 583b2ba..8775761 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -50,7 +50,9 @@
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
glassId: row.GlassId,
- controlsId: 300
+ controlsId: 300,
+ line: 2002,
+ machine: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -81,7 +83,9 @@
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
glassId: row.GlassId,
- controlsId: 301
+ controlsId: 301,
+ line: 2002,
+ machine: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java
index 480921c..5e4ac88 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java
@@ -122,7 +122,7 @@
if(this.session.isOpen()){
int maxChunkSize = 50000; // 瀹氫箟鏈�澶х殑鍒嗗潡澶у皬
int length = message.length();
- if(length>50000){
+// if(length>50000){
int chunks = (int) Math.ceil((double) length / maxChunkSize);
//鍒嗗潡鍙戦�佹秷鎭�
for (int i = 0; i < chunks; i++) {
@@ -138,9 +138,9 @@
// 鍙戦�佸垎鍧楁秷鎭紝骞朵紶閫掓槸鍚︽槸鏈�鍚庝竴鍧楁秷鎭殑鏍囪瘑
this.session.getBasicRemote().sendText(chunk);
}
- }else{
- this.session.getBasicRemote().sendText(message);
- }
+// }else{
+// this.session.getBasicRemote().sendText(message);
+// }
}
} catch (Exception e) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 01b49c4..8de5698 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -388,6 +388,7 @@
public List<Map<String, Object>> selectTemperingGlass(){
QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
+ .in("state",Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL)
.groupBy("engineer_id,tempering_layout_id");
List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
return TemperingGlass;
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 8c66de2..9c1a54e 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
@@ -120,7 +120,10 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- jsonObject.append("prioritylist", upPattenUsages);
+ if(upPattenUsages!=null){
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
@@ -145,7 +148,7 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
- //String inkageStatus ="1";
+// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
--
Gitblit v1.8.0