From 2c0eb3b5d5f8586406e7be8731e3553ee26665e0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 十二月 2024 14:24:17 +0800
Subject: [PATCH] 1、大理片笼漏提配置
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 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 f7c5a54..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
@@ -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")
);
@@ -78,19 +77,24 @@
.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")
);
}
HollowBigStorageCageDetails hollowDetails = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot()).in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
+ .eq(HollowBigStorageCageDetails::getFlowCardId, relationInfoOne.getFlowCardId())
+ .eq(HollowBigStorageCageDetails::getLayer, layer)
+ .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) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
- .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1"));
+ .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();
BeanUtils.copyProperties(storageCage, storageDTO);
BeanUtils.copyProperties(relationInfoOne, storageDTO);
@@ -104,7 +108,10 @@
if (null == relationInfoBefore) {
//琛ㄧず搴忓彿娌℃湁鎴栬�� 搴忓彿涓�1鍙堜笉鏄涓�鍧楁潵鐨� 鏂板紑涓�鏍�
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
- .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1"));
+ .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 {
HollowBigStorageCageDetails beforeGlass = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
@@ -114,7 +121,10 @@
);
if (null == beforeGlass) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
- .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1"));
+ .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 {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getSlot, beforeGlass.getSlot()));
@@ -200,6 +210,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 +225,7 @@
hollow.setVirtualSlot(slotNumber++);
hollow.setFilmsId(glassInfo.getFilmsid());
hollow.setThickness(glassInfo.getThickness());
+ hollow.setState(Const.HOLLOW_RELATION_NEW);
newList.add(hollow);
tempHollowList.add(newList);
}
@@ -243,11 +255,16 @@
}
@Override
- public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
+ 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) {
+// List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
+// return lackDetailsList;
+// }
}
--
Gitblit v1.8.0