From b365a0879edc787655b908b0dbb65b5e966bb23b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 07 五月 2024 09:03:08 +0800
Subject: [PATCH] 公共yml文件 ip 改回10.153.19.150
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 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..b5c01ee 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.toolkit.JoinWrappers;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
@@ -49,8 +50,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 +91,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
@@ -135,6 +144,9 @@
.orderByAsc("escd.sequence")
);
+
+
+
}
@@ -149,4 +161,6 @@
+
+
}
--
Gitblit v1.8.0