From cb921a68fe5f01012125fb522086acea2aa255ba Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 27 十二月 2024 14:43:40 +0800
Subject: [PATCH] 1、中空理片笼新增配方相关功能，用于用户自定义保存中空线相关参数，避免重复输入相同的参数 2、领取任务/强制出片改造：在流程卡、路线、数量基础上新增配方id，用于关联本地流程卡的中空的参数配方 3、增加限制：同一条线路的同个流程卡仅能存在一个未完成的任务 4、卧式理片笼新增日期格式
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 39f344b..cafa468 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
@@ -63,6 +63,7 @@
.eq(HollowGlassRelationInfo::getFlowCardId, flowCardId)
.eq(HollowGlassRelationInfo::getWidth, width)
.eq(HollowGlassRelationInfo::getHeight, height)
+ .eq(HollowGlassRelationInfo::getTotalLayer, totalLayer)
.eq(HollowGlassRelationInfo::getLayer, layer)
.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW)
.orderByAsc(HollowGlassRelationInfo::getHollowSequence)
@@ -76,6 +77,7 @@
.eq(HollowGlassRelationInfo::getFlowCardId, flowCardId)
.eq(HollowGlassRelationInfo::getWidth, width)
.eq(HollowGlassRelationInfo::getHeight, height)
+ .eq(HollowGlassRelationInfo::getTotalLayer, totalLayer)
.eq(HollowGlassRelationInfo::getLayer, layer)
.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW)
.orderByAsc(HollowGlassRelationInfo::getHollowSequence)
@@ -84,6 +86,7 @@
}
HollowBigStorageCageDetails hollowDetails = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.eq(HollowBigStorageCageDetails::getFlowCardId, relationInfoOne.getFlowCardId())
+ .eq(HollowBigStorageCageDetails::getTotalLayer, totalLayer)
.eq(HollowBigStorageCageDetails::getLayer, layer)
.eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot())
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
@@ -102,6 +105,7 @@
}
HollowGlassRelationInfo relationInfoBefore = hollowGlassRelationInfoService.getOne(new LambdaQueryWrapper<HollowGlassRelationInfo>()
.eq(HollowGlassRelationInfo::getFlowCardId, relationInfoOne.getFlowCardId())
+ .eq(HollowGlassRelationInfo::getTotalLayer, relationInfoOne.getTotalLayer())
.eq(HollowGlassRelationInfo::getLayer, relationInfoOne.getLayer())
.eq(HollowGlassRelationInfo::getVirtualSlot, relationInfoOne.getVirtualSlot())
.eq(HollowGlassRelationInfo::getSlotSequence, relationInfoOne.getSlotSequence() - 1));
@@ -254,17 +258,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