From 353acdfceab45a94d9f5d71e353bd06bf7c2eba6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:41:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
index 3d204b7..ab90c99 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -24,9 +24,11 @@
boolean outGlass();
- List<BigStorageCage> querybigStorageCageDetail(int deviceId);
+ List<BigStorageCage> querybigStorageCageDetailAll();
+
+ Map<Integer, List<BigStorageCage>> querybigStorageCageDetail();
List<Map<String, Object>> selectBigStorageCageUsage();
- void updateStorageCageDisabled(int slot,int enableState);
+ void updateStorageCageDisabled(int slot, int enableState);
}
--
Gitblit v1.8.0