From 00debf220201157e9f12ddc19e15bf3f1b0ef0ed Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 八月 2024 16:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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 d234fd9..d8d39e9 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
@@ -557,7 +557,7 @@
if (endcell == Const.A10_OUT_TARGET_POSITION) {
wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
- "on t.glass_id = t1.glass_id and (t1.first_length >= " + minOneFirstLength + " and t1.second_length >= " + minOneSecondLength);
+ "on t.glass_id = t1.glass_id and (t1.first_length >= " + minOneFirstLength + " and t1.second_length >= " + minOneSecondLength + ")");
} else {
wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
@@ -680,7 +680,7 @@
}
/**
- * 娣诲姞鐞嗙墖绗间换鍔�
+ * 娣诲姞纾ㄨ竟闃熷垪淇℃伅
*
* @param glassInfo
* @param endcell
@@ -764,7 +764,7 @@
@Scheduled(fixedDelay = 1000)
public void cacheGlassIsRun() {
JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
+ //姝ｅ湪杩涜鐨勭（杈逛换鍔�
List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun();
jsonObject.append("taskCaches", taskCaches);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun");
--
Gitblit v1.8.0