From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件，添加线路，备注显示
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 9905baf..0f9bf92 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
@@ -466,7 +466,7 @@
if (temperingGlassInfoList.size() == 0) {
MPJLambdaWrapper<GlassInfo> wrapper = JoinWrappers.lambda(GlassInfo.class)
- .select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.glass_type,t.width,t.height" +
+ .select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.layer,t.glass_type,t.width,t.height" +
",t.thickness,t.ishorizontal,t.tempering_layout_id,t.tempering_feed_sequence,t.x_coordinate,t.y_coordinate," +
"t.angle,t1.slot,t.engineer_id")
.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
@@ -525,9 +525,17 @@
}
@Override
- public Map<Integer, List<BigStorageVO>> querybigStorageCageDetail() {
+ public Map<Object, Map<Integer, List<BigStorageVO>>> querybigStorageCageDetail() {
List<BigStorageVO> bigStorageCages = baseMapper.querybigStorageCageDetail();
- return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
+ // 宓屽鍒嗙粍锛氬厛鎸塻lot鍒嗙粍锛屽啀鎸塪eviceId鍒嗙粍
+
+ return bigStorageCages.stream()
+ // 绗竴灞傚垎缁勶細key=slot鍊硷紝value=璇lot涓嬬殑鎵�鏈塀igStorageVO
+ .collect(Collectors.groupingBy(
+ BigStorageVO::getDeviceId, // 绗竴灞傚垎缁勪緷鎹細slot
+ // 绗簩灞傚垎缁勶細瀵圭涓�灞傜殑value缁х画鎸塪eviceId鍒嗙粍
+ Collectors.groupingBy(BigStorageVO::getSlot)
+ ));
}
@Override
--
Gitblit v1.8.0