From 62681d14e34466f4ed4eafaa2cef197c53e6fd82 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 二月 2025 14:07:05 +0800
Subject: [PATCH] 修改打印样式 修改报工界面查询条件 修改磨边获取出片线路条件 大理片非钢化出片添加宽度与数量限制
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index c4bd971..ddd2c77 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -108,6 +108,13 @@
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
.isNotNull(BigStorageCageFeedTask::getTargetSlot);
List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
+
+ List<String> glassIds = bigStorageCageDetailsList.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
+ List<BigStorageCageFeedTask> feedTasks = bigStorageCageFeedTaskList.stream()
+ .filter(task -> !glassIds.contains(task.getGlassId()))
+ .collect(Collectors.toList());
+
+
Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
@@ -116,6 +123,14 @@
BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
}
+ for (BigStorageCageFeedTask bigStorageCageFeedTask : feedTasks
+ ) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+ bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+ bigStorageCageDetailsList.add(bigStorageCageDetails);
+ }
+ bigStorageCageDetailsList.sort(Comparator
+ .comparing((BigStorageCageDetails detail) -> detail.getBigStorageCageFeedTask().getId()));
return bigStorageCageDetailsList;
}
--
Gitblit v1.8.0