From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java | 17 ++++++++++++++++-
1 files changed, 16 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 a36efd5..8ad47a8 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,11 @@
import com.mes.base.entity.vo.BigStorageVO;
import com.mes.hollow.entity.HollowBigStorageCageDetails;
import com.mes.hollow.entity.dto.*;
+import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
+import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import java.util.List;
+import java.util.Map;
/**
* (HollowBigStorageCageDetails)琛ㄦ湇鍔℃帴鍙�
@@ -26,7 +29,7 @@
List<HollowBigStorageCageDetails> queryOutGlassList(String flowCardId, int cell);
- List<BigStorageVO> queryHollowbigStorageCageDetail();
+ Map<Integer, List<BigStorageVO>> queryHollowbigStorageCageDetail();
/**
* 鍙栧嚭姣忕粍鐜荤拑鍗犵敤绗煎瓙鐨勬牸瀛愬苟璁＄畻鏍煎瓙鍐呯殑鏈�澶х粍搴忓彿
@@ -55,5 +58,17 @@
* @return
*/
List<HollowBigStorageCageDetails> queryPairGlassList(String flowCardId, Integer totalLayer, Integer totalPairQuantity,Integer isOut);
+
+ /**
+ * 鏇存柊鐞嗙墖绗兼牸瀛愮姸鎬�
+ * @param slot
+ * @param enableState
+ * @return
+ */
+ Boolean updateHollowStorageCageDisabled(int slot, int enableState);
+
+ List<FlowCardVirtualSlotDTO> queryFlowCardIdsAndLayer();
+
+ List<FlowCardGlassInfoDTO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query);
}
--
Gitblit v1.8.0