From 6977fb42d5067f6c938ef3de559a6ad19b542a0b Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期五, 14 六月 2024 11:29:09 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 60ba4df..3d204b7 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,12 +1,12 @@ 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.glassinfo.entity.GlassInfo; -import com.mes.glassinfo.entity.GlassInfo; import java.util.List; +import java.util.Map; /** * <p> @@ -16,7 +16,7 @@ * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageService extends IService<BigStorageCage> { +public interface BigStorageCageService extends MPJBaseService<BigStorageCage> { void updateRemainWidth(int slot); @@ -24,6 +24,9 @@ boolean outGlass(); - List<BigStorageCage> querybigStorageCageDetail(); + List<BigStorageCage> querybigStorageCageDetail(int deviceId); + List<Map<String, Object>> selectBigStorageCageUsage(); + + void updateStorageCageDisabled(int slot,int enableState); } -- Gitblit v1.8.0