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/BigStorageCageDetailsService.java | 65 +++++++++++++++++++++++++++++++- 1 files changed, 62 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 7b0a0a4..8703694 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,13 +2,18 @@ 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.bigstoragetask.entity.UpdateBigStorageCageDTO; import com.mes.glassinfo.entity.GlassInfo; import java.util.List; +import java.util.Map; /** * <p> - * 鏈嶅姟绫� + * 鏈嶅姟绫� * </p> * * @author zhoush @@ -16,7 +21,61 @@ */ public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> { - List<BigStorageCageDetails> selectTask(int taskType); + List<BigStorageCageDetails> selectFeedTask(); - boolean selectGetBoard(GlassInfo glassInfo, String plcFeedReqLine); + List<BigStorageCageDetails> selectOutTask(); + + double selectGetBoard(String plcFeedReqLine); + + void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails); + + void damageBigStorageCageDetails(String glassId, int status); + + 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 + */ + List<TemperingLayoutDTO> temperingIsAll(); + + /** + * 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲� + * + * @return + */ + List<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(); + + void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state); + + String temperingSwitch(Boolean flag); + + void appointEngineerId(String engineerId); } -- Gitblit v1.8.0