From 6091a9cac0ef3236bd05137a5fae9a9cf1913ed4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 16:03:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index 26d7f16..1764024 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -49,8 +49,8 @@
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("t.*")
.leftJoin("(SELECT t1.* FROM down_storage_cage_details t1 "
- + "JOIN (SELECT flow_card_id, MAX(width) AS max_width FROM glass_info GROUP BY flow_card_id) t "
- + "ON t1.flow_card_id = t.flow_card_id WHERE t1.width = t.max_width) t3"
+ + "JOIN (SELECT flow_card_id, MAX(width*height) AS max_width FROM glass_info GROUP BY flow_card_id) t "
+ + "ON t1.flow_card_id = t.flow_card_id WHERE t1.width*t1.height = t.max_width) t3"
+ " ON t.glass_id = t3.glass_id")
.leftJoin("down_workstation t4 ON t3.flow_card_id = t4.flow_card_id")
.isNull(Boolean.parseBoolean("t.glass_id"), "SELECT glass_id FROM down_glass_info")
@@ -90,7 +90,15 @@
}
-
+ @Override
+ public List<DownStorageCageDetails> selectCacheEmpty2(){
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCage>()
+ .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ .leftJoin("down_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+ .isNull("escd.slot")
+ );
+ }
@Override
--
Gitblit v1.8.0