From 004391aaa734854dd498bb6351f32e237138a378 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 17 十二月 2024 10:59:50 +0800
Subject: [PATCH] 1、大理片笼详情按钮修复 2、websocket不在向前端推送详情数据
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index a22ff3c..1429d59 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -69,30 +69,33 @@
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
- //杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageTask> inTaskList = new ArrayList();
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
- for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
- ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
- ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
- if (null != requestWord.getValue()) {
- BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
- task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
- task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
- inTaskList.add(task);
- continue;
+ try{
+ //杩涚墖浠诲姟鏁版嵁
+ List<BigStorageCageTask> inTaskList = new ArrayList();
+ ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+ for (int i = 1; i <= 6; i++) {
+ ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+ ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
+ ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
+ if (null != requestWord.getValue()) {
+ BigStorageCageTask task = new BigStorageCageTask();
+ task.setGlassId(requestWord.getValue() + "");
+ task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
+ task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
+ inTaskList.add(task);
+ continue;
+ }
}
+ jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+ }catch(Exception e){
+ //todo:涓嶅仛浠诲姟澶勭悊
}
- jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+
//鍑虹墖浠诲姟鏁版嵁
List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
- //鐞嗙墖绗艰〃鏍间俊鎭�
- jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());
//閽㈠寲寮�鍏�
boolean temperingSwitch = false;
@@ -116,8 +119,6 @@
List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
- //鐞嗙墖绗艰〃鏍间俊鎭�
- jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());
//鎵撳嵃寮�鍏�
boolean autoPrint = false;
--
Gitblit v1.8.0