From a92d86ece26b6b0a7ef0c25b384ebcc10b8145ed Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期二, 02 七月 2024 10:06:35 +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/BigStorageCageDetailsService.java | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 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 9d6169f..83d86fe 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 @@ -2,6 +2,10 @@ 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; @@ -21,13 +25,43 @@ 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); void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails); void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails); + + /** + * 鎸夌収鐗堝浘淇℃伅鑾峰彇杩涚墖绗煎瓙淇℃伅 + * + * @param glassInfo + */ + BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo); + + /** + * 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d + * + * @return + */ + TemperingLayoutDTO temperingIsAll(); + + /** + * 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲� + * + * @return + */ + TemperingLayoutDTO queryTemperingOccupySlot(); + + /** + * 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙� + * + * @param engineerId + * @param temperingLayoutId + * @return + */ + List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId); } -- Gitblit v1.8.0