From ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 18 十二月 2024 11:44:07 +0800 Subject: [PATCH] 1、大理片笼进出片任务新增限制:进片玻璃数大于可用格子时,不允许进片 2、超过最大尺寸且直通通道有玻璃时 不能进片 3、大理片超过最大高度走直通通道 4、fixbug:笼子厚度限制 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 15 +++++++++++++-- 1 files changed, 13 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 ad784e4..becb3ba 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 @@ -3,6 +3,8 @@ 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.vo.BigStorageDetailsQueryVO; import com.mes.glassinfo.entity.GlassInfo; import java.util.List; @@ -23,12 +25,21 @@ BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); boolean outGlass(); + /** + * 鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭� + * @return + */ + List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query); - List<BigStorageCage> querybigStorageCageDetail(int deviceId); + List<BigStorageCage> querybigStorageCageDetailAll(); - List<BigStorageCage> querybigStorageCageDetail(); + 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