From 2027077e00eff0b9fa6b0f68f803a9780f065e21 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 四月 2024 11:18:14 +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/DownStorageCageServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index 40c62bb..ecceaf3 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -71,7 +71,7 @@
@Override
public List<DownStorageCageDetails> getCacheOut(int start, int end) {
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ return downStorageCageMapper.selectJoinList(
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
.leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -82,7 +82,6 @@
.orderByDesc("escd.width")
.orderByDesc("escd.height")
);
- return list;
}
@@ -92,19 +91,20 @@
@Override
public List<Map> getCacheInfo() {
log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
- List<Map> map = downStorageCageMapper.selectJoinList(
+ return downStorageCageMapper.selectJoinList(
Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
.leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
.orderByAsc("t.slot")
);
- return map;
+
}
+
+
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
-
List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
@@ -118,10 +118,48 @@
return list;
}
+
+
+
+ @Override
+ public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
+
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .eq("escd.flow_card_id", flowcardid)
+ .gt("t.remain_width", width)
+ .orderByAsc("escd.tempering_feed_sequence")
+ );
+
+ }
+
+
+
+ @Override
+ public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .lt("escd.flow_card_id", flowcardid)
+ // 鏉′欢 t.remain_width - width > 0
+ .apply("t.remain_width - " + width + " > 0")
+ .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+ );
+
+ }
+
+
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ return downStorageCageMapper.selectJoinList(
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
.leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -131,7 +169,7 @@
.apply("t.remain_width - " + width + " > 0")
.orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
);
- return list;
+
}
@@ -139,4 +177,5 @@
+
}
--
Gitblit v1.8.0