From f63e3b1c24d37576eb92f53d40effecd967f4c71 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 19 十二月 2024 14:02:44 +0800
Subject: [PATCH] 部分
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
index 498c557..a61b3dd 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -92,6 +92,7 @@
if (null == hollowDetails) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
+ .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())
.ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())
.orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
HollowBigStorageDTO storageDTO = new HollowBigStorageDTO();
@@ -108,7 +109,9 @@
//琛ㄧず搴忓彿娌℃湁鎴栬�� 搴忓彿涓�1鍙堜笉鏄涓�鍧楁潵鐨� 鏂板紑涓�鏍�
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
- .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness()).orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
+ .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())
+ .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())
+ .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
} else {
HollowBigStorageCageDetails beforeGlass = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
@@ -119,6 +122,7 @@
if (null == beforeGlass) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
+ .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())
.ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())
.orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
} else {
@@ -250,17 +254,17 @@
return dtos.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));
}
- // @Override
-// public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
-// List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
-// Map<Integer, List<LackDetailsDTO>> listMap = lackDetailsList.stream().collect(Collectors.groupingBy(LackDetailsDTO::getLayer));
-// return listMap;
-// }
@Override
- public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) {
+ public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
- return lackDetailsList;
+ Map<Integer, List<LackDetailsDTO>> listMap = lackDetailsList.stream().collect(Collectors.groupingBy(LackDetailsDTO::getLayer));
+ return listMap;
}
+// @Override
+// public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) {
+// List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
+// return lackDetailsList;
+// }
}
--
Gitblit v1.8.0