From 9f03850e058066a7c7bb3a3320c5010bb9d162d2 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 09 十二月 2024 13:48:49 +0800
Subject: [PATCH] 大理片笼表格更改，新增调度开关，钢化调整版图大小
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 a1e6a58..487d00e 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
@@ -62,7 +62,7 @@
carPostion.add(0.5);
jsonObject.append("carPostion", carPostion);
//鐣岄潰灞曠ず绗煎瓙淇℃伅
- jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
+// jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
//杩涚墖浠诲姟鏁版嵁
List<BigStorageCageTask> inTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_in_one_task");
@@ -74,10 +74,10 @@
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
- jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
+// jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
//鐞嗙墖绗艰〃鏍间俊鎭�
- jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());
+// jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());
//閽㈠寲寮�鍏�
boolean temperingSwitch = false;
@@ -87,6 +87,14 @@
temperingSwitch = redisUtil.getCacheObject("temperingSwitch");
}
jsonObject.append("temperingSwitch", temperingSwitch);
+ //璋冨害寮�鍏�
+ boolean dispatchSwitch = false;
+ if (redisUtil.getCacheObject("dispatchSwitch") == null) {
+ redisUtil.setCacheObject("dispatchSwitch", false);
+ } else {
+ dispatchSwitch = redisUtil.getCacheObject("dispatchSwitch");
+ }
+ jsonObject.append("dispatchSwitch", dispatchSwitch);
//鎵撳嵃寮�鍏�
boolean autoPrint = false;
if (redisUtil.getCacheObject("autoPrint") == null) {
--
Gitblit v1.8.0