From 24bc065e9009bfb3c778e762921268a389aeaf49 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 09:00:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 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 d699497..cac7777 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
@@ -64,8 +64,7 @@
.eq(HollowGlassRelationInfo::getWidth, width)
.eq(HollowGlassRelationInfo::getHeight, height)
.eq(HollowGlassRelationInfo::getLayer, layer)
- .isNull(HollowGlassRelationInfo::getTemperingLayoutId)
- .isNull(HollowGlassRelationInfo::getTemperingFeedSequence)
+ .eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW)
.orderByAsc(HollowGlassRelationInfo::getHollowSequence)
.last("limit 1")
);
@@ -85,7 +84,7 @@
);
}
HollowBigStorageCageDetails hollowDetails = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getSlot, relationInfoOne.getVirtualSlot()).in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
+ .eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot()).in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
.orderByDesc(HollowBigStorageCageDetails::getSequence).last("limit 1"));
HollowBigStorageCage storageCage = null;
if (null == hollowDetails) {
@@ -97,8 +96,8 @@
return storageDTO;
}
HollowGlassRelationInfo relationInfoBefore = hollowGlassRelationInfoService.getOne(new LambdaQueryWrapper<HollowGlassRelationInfo>()
- .eq(HollowGlassRelationInfo::getEngineerId, relationInfoOne.getEngineerId())
- .eq(HollowGlassRelationInfo::getTemperingLayoutId, relationInfoOne.getTemperingLayoutId())
+ .eq(HollowGlassRelationInfo::getFlowCardId, relationInfoOne.getFlowCardId())
+ .eq(HollowGlassRelationInfo::getLayer, relationInfoOne.getLayer())
.eq(HollowGlassRelationInfo::getVirtualSlot, relationInfoOne.getVirtualSlot())
.eq(HollowGlassRelationInfo::getSlotSequence, relationInfoOne.getSlotSequence() - 1));
if (null == relationInfoBefore) {
@@ -200,6 +199,7 @@
hollow.setVirtualSlot(temp.get(0).getVirtualSlot());
hollow.setFilmsId(glassInfo.getFilmsid());
hollow.setThickness(glassInfo.getThickness());
+ hollow.setState(Const.HOLLOW_RELATION_NEW);
temp.add(hollow);
flag = true;
break;
@@ -214,6 +214,7 @@
hollow.setVirtualSlot(slotNumber++);
hollow.setFilmsId(glassInfo.getFilmsid());
hollow.setThickness(glassInfo.getThickness());
+ hollow.setState(Const.HOLLOW_RELATION_NEW);
newList.add(hollow);
tempHollowList.add(newList);
}
@@ -242,16 +243,16 @@
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, int layer) {
-
- return this.baseMapper.queryLackByFlowCard(flowCardId, layer);
-// return this.list(new LambdaQueryWrapper<HollowGlassRelationInfo>()
-// .eq(HollowGlassRelationInfo::getFlowCardId,flowCardId)
-// .eq(HollowGlassRelationInfo::getLayer,layer)
-// .isNull(HollowGlassRelationInfo::getTemperingLayoutId)
-// .isNull(HollowGlassRelationInfo::getTemperingFeedSequence)
-// );
+ public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) {
+ List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
+ return lackDetailsList;
}
}
--
Gitblit v1.8.0