From 8190ef14609e5b1298a1065ff8b07ae09664fa87 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 21 二月 2025 15:14:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
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 17b0050..adcf7cb 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
@@ -123,17 +123,19 @@
if(upPattenUsages!=null){
jsonObject.append("prioritylist", upPattenUsages);
}
+ //鏌ヨ1鍙风嚎鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
+ jsonObject.append("loadTask1", upPattenUsages1);
+ //鏌ヨ2鍙风嚎鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
+ jsonObject.append("loadTask2", upPattenUsages2);
+ //鏌ヨ宸ヤ綅浠诲姟
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
- //鏄惁寮�濮嬪伐绋�
- Engineering engineering = engineeringService.selectInitiate(1);
- if (engineering != null){
- jsonObject.append("engineering", engineering);
- }else {
- jsonObject.append("engineering", "0");
- }
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -156,7 +158,7 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
- //String inkageStatus ="1";
+// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
@@ -172,13 +174,13 @@
@Scheduled(fixedDelay = 1000)
public void loadGlassIsRun() {
JSONObject jsonObject = new JSONObject();
+ //鏄惁寮�濮嬪伐绋�
Engineering engineering = engineeringService.selectInitiate(1);
- if (engineering != null){
jsonObject.append("engineering", engineering);
- }else {
- jsonObject.append("engineering", "0");
- }
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("IsRun");
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0