From be032257d1562085b507496140dd3551570962e0 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 23 七月 2024 20:31:15 +0800 Subject: [PATCH] 0723联调解决bug --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java index 9c5ad4f..cab1f09 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java @@ -3,10 +3,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.BigStorageDTO; +import com.mes.bigstorage.entity.dto.SlotSequenceDTO; import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; import com.mes.glassinfo.entity.GlassInfo; import java.util.List; +import java.util.Map; /** * <p> @@ -24,9 +26,9 @@ void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails); - void damageBigStorageCageDetails(String glassId); + void damageBigStorageCageDetails(String glassId,int status); - BigStorageCageDetails selectBigStorageCageDetails(String glassId); + List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId); void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails); @@ -41,5 +43,30 @@ */ BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo); - TemperingLayoutDTO temperingIsAll(); + /** + * 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d + * + * @return + */ + List<TemperingLayoutDTO> temperingIsAll(); + + /** + * 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲� + * + * @return + */ + TemperingLayoutDTO queryTemperingOccupySlot(); + + /** + * 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙� + * + * @param engineerId + * @param temperingLayoutId + * @return + */ + List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId); + + boolean TemperingGlass(String temperingLayoutId, String engineerId); + + List<Map<String, Object>> selectTemperingGlass(); } -- Gitblit v1.8.0