From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 12 五月 2025 21:13:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 38 insertions(+), 11 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 0f0c840..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,26 +1,53 @@ 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.mapper.BigStorageCageDetailsMapper; -import com.mes.bigstorage.mapper.BigStorageCageMapper; -import com.mes.uppattenusage.entity.GlassInfo; -import org.springframework.beans.factory.annotation.Autowired; +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.largenscreen.entity.PieChartVO; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import java.util.Map; /** * <p> - * 鏈嶅姟绫� + * 鏈嶅姟绫� * </p> * * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageService extends IService<BigStorageCage> { - public void updateRemainWidth(int Slot); - public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); +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> querybigStorageCageDetailAll(); + + Map<Integer, List<BigStorageCage>> querybigStorageCageDetail(); + + List<Map<String, Object>> selectBigStorageCageUsage(); + + 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