From b21caa5499c50384f3a3a5dd795a7a0ad197d36f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 06 十一月 2025 21:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java
index 2b94b2c..7b748bf 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java
@@ -4,8 +4,13 @@
import com.mes.base.entity.vo.BigStorageVO;
import com.mes.hollow.entity.HollowBigStorageCageDetails;
import com.mes.hollow.entity.dto.*;
+import com.mes.hollow.entity.request.HollowBigCageDetailsRequest;
+import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
+import com.mes.hollow.entity.vo.HollowBigCageDetailsVO;
+import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import java.util.List;
+import java.util.Map;
/**
* (HollowBigStorageCageDetails)琛ㄦ湇鍔℃帴鍙�
@@ -26,7 +31,7 @@
List<HollowBigStorageCageDetails> queryOutGlassList(String flowCardId, int cell);
- List<BigStorageVO> queryHollowbigStorageCageDetail();
+ Map<Integer, List<BigStorageVO>> queryHollowbigStorageCageDetail();
/**
* 鍙栧嚭姣忕粍鐜荤拑鍗犵敤绗煎瓙鐨勬牸瀛愬苟璁＄畻鏍煎瓙鍐呯殑鏈�澶х粍搴忓彿
@@ -63,5 +68,11 @@
* @return
*/
Boolean updateHollowStorageCageDisabled(int slot, int enableState);
+
+ List<FlowCardVirtualSlotDTO> queryFlowCardIdsAndLayer();
+
+ List<FlowCardGlassInfoDTO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query);
+
+ List<HollowBigCageDetailsVO> queryVerticalSheetCageDetailsList(HollowBigCageDetailsRequest request);
}
--
Gitblit v1.8.0