From c576dd18c9781ef1b101aa63128b1c1d57ba010a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 22 四月 2024 09:05:22 +0800
Subject: [PATCH] 更新逻辑
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 e1cdd23..1e0b006 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
@@ -79,7 +79,8 @@
.leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ")
.isNotNull("escd.slot")
.between("dw.workstation_id", start, end)
- .orderByDesc("gi.width, gi.height, escd.tempering_layout_id")
+ .orderByDesc("escd.width")
+ .orderByDesc("escd.height")
);
return list;
}
@@ -118,6 +119,41 @@
}
@Override
+ public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
+
+ List<DownStorageCageDetails> list = 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")
+ );
+ return list;
+ }
+
+
+
+ @Override
+ public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+ List<DownStorageCageDetails> list = 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")
+ );
+ return list;
+ }
+
+
+ @Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
@@ -138,4 +174,5 @@
+
}
--
Gitblit v1.8.0