From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 5f1d50f..4fc5b37 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
@@ -1,10 +1,13 @@
package com.mes.bigstorage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
+import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;
+import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.largenscreen.entity.PieChartVO;
import java.util.List;
import java.util.Map;
@@ -17,17 +20,34 @@
* @author zhoush
* @since 2024-03-27
*/
-public interface BigStorageCageService extends IService<BigStorageCage> {
+public interface BigStorageCageService extends MPJBaseService<BigStorageCage> {
void updateRemainWidth(int slot);
BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
boolean outGlass();
+ /**
+ * 鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�
+ * @return
+ */
+ List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query);
- List<BigStorageCage> querybigStorageCageDetail(int deviceId);
+ List<BigStorageCage> querybigStorageCageDetailAll();
+
+ Map<Integer, List<BigStorageCage>> querybigStorageCageDetail();
List<Map<String, Object>> selectBigStorageCageUsage();
- boolean selectWidthSufficient(BigStorageCageDetails layoutSlotInfo,double width);
+ void updateStorageCageDisabled(int slot, int enableState);
+
+ List<Integer> queryFreeDeviceByUsed(double thickness);
+
+ List<BigStorageSummaryDTO> selectBigStorageSummary();
+
+ Boolean resetCage();
+
+ List<PieChartVO> queryPieChart();
+
+// List<Integer> queryFreeDeviceByNotUsed(double thickness);
}
--
Gitblit v1.8.0