From f62353986a6afff2e2a5a17cfdec30d04a4e600d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 07 十二月 2024 16:50:09 +0800
Subject: [PATCH] 1、fixbug:缺片详情临时解决 将所有缺片信息返回 2、新增膜系 状态：避免同一块玻璃占用完相同尺寸关系表 3、中空界面注释开始暂停按钮 4、领取/强制执行任务增加限制，必须在本条线没有任务的情况下可以领取
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 f7c5a54..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")
);
@@ -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,11 +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 Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
+ public 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;
+ return lackDetailsList;
}
}
--
Gitblit v1.8.0