From f9ac6553e1e96f07b58ea4e0b51f6af9875219ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 28 二月 2025 10:32:42 +0800
Subject: [PATCH] 1、中空创建任务界面新增厚度查询，按流程卡升序排序
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index 0d97557..7d726bc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -72,12 +72,15 @@
public List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId) {
List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>()
.selectAll(EdgStorageCage.class)
- .selectCollection(EdgStorageCageDetails.class,EdgStorageCageVO::getDetails)
+ .selectCollection(EdgStorageCageDetails.class, EdgStorageCageVO::getDetails)
.leftJoin(EdgStorageCageDetails.class, on -> on
- .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
- .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
- .eq(EdgStorageCage::getDeviceId, deviceId));
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
+ .eq(EdgStorageCage::getDeviceId, deviceId)
+ .orderByAsc(EdgStorageCage::getSlot)
+ .orderByAsc(EdgStorageCageDetails::getId)
+ );
return storageCageVOS;
}
--
Gitblit v1.8.0