From c09ecaaa299017dce450dd5d8fb949697f796744 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 13 三月 2025 14:38:50 +0800
Subject: [PATCH] 1、中空lisec文件生成顺序错乱 2、大理片笼新增生产数量统计 进片：磨边 出片：钢化 3、中空生产数量统计 中空一线 中空二线
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
index 3ce5542..e237003 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
@@ -363,6 +363,7 @@
if (930 == request.getCell()) {
Map<Integer, List<HollowBigStorageCageDetails>> listMap = hollowBigStorageCageDetailsList.stream()
.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getHollowSequence));
+ List<List<HollowGlassQueueInfo>> disorderList = new ArrayList<>();
for (Map.Entry<Integer, List<HollowBigStorageCageDetails>> entry : listMap.entrySet()) {
//鍒涘缓闃熷垪鎺ユ敹涓嶆弧瓒虫垚瀵规儏鍐典笅锛氫竴瀵圭幓鐠冨垎鍑犳涓婅溅鐨勬搴忛棶棰�
List<HollowGlassQueueInfo> tempList = new ArrayList<>();
@@ -372,7 +373,7 @@
for (HollowBigStorageCageDetails item : reverse) {
remainWidth = remainWidth - (int) Math.max(item.getWidth(), item.getHeight());
if (remainWidth < 0) {
- hollowQueues.addAll(CollectionUtil.reverse(tempList));
+ disorderList.add(CollectionUtil.reverse(tempList));
tempList = new ArrayList<>();
remainWidth = carWidth - (int) Math.max(item.getWidth(), item.getHeight());
}
@@ -380,7 +381,7 @@
tempList.add(queueInfo);
remainWidth = remainWidth - glassGap;
}
- hollowQueues.addAll(CollectionUtil.reverse(tempList));
+ disorderList.add(CollectionUtil.reverse(tempList));
HollowBigStorageCageDetails cageDetails = entry.getValue().get(0);
if (cageDetails.getIsPair() == 1) {
isPairCount = isPairCount - cageDetails.getTotalLayer();
@@ -389,6 +390,11 @@
}
}
}
+ //闃叉鐜荤拑涓┖绾跨幓鐠冩棤搴忥紝灏嗙幓鐠冩寜鐓ч『搴忛噸鏂版帓搴�
+ Collections.sort(disorderList, (s1, s2) -> s1.get(0).getHollowSequence() - s2.get(0).getHollowSequence());
+ for (List<HollowGlassQueueInfo> list : disorderList) {
+ hollowQueues.addAll(list);
+ }
} else {
loop:
for (HollowBigStorageCageDetails item : hollowBigStorageCageDetailsList) {
--
Gitblit v1.8.0