From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 09 十月 2024 15:47:59 +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 | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 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 a9bb2b5..14eb11a 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,11 +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.uppattenusage.entity.GlassInfo; +import com.mes.glassinfo.entity.GlassInfo; import java.util.List; +import java.util.Map; /** * <p> @@ -15,11 +16,23 @@ * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageService extends IService<BigStorageCage> { +public interface BigStorageCageService extends MPJBaseService<BigStorageCage> { - void updateRemainWidth(int Slot); + void updateRemainWidth(int slot); - BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); + BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); - List<BigStorageCage> querybigStorageCageDetail(); + boolean outGlass(); + + 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<Integer> queryFreeDeviceByNotUsed(double thickness); } -- Gitblit v1.8.0