From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 07 八月 2024 16:26:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java index c3c26cb..5281217 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java @@ -1,8 +1,10 @@ package com.mes.downstorage.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; +import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downstorage.entity.DownStorageCage; import com.mes.downstorage.entity.DownStorageCageDetails; +import com.mes.glassinfo.entity.GlassInfo; import java.util.List; import java.util.Map; @@ -15,20 +17,42 @@ * @author zhoush * @since 2024-03-27 */ -public interface DownStorageCageService extends IService<DownStorageCage> { - public List<Map> gettask(); +public interface DownStorageCageService extends MPJBaseService<DownStorageCage> { + DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType); + + DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, Integer taskType); // List<Map<String, Object>> selectCacheLeisure(); - List<DownStorageCageDetails> getCacheLeisure(); - List<DownStorageCageDetails> getCacheOut(int start, int end); - List<Map> getCacheInfo(); - List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width); - List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width); - List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width); - List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width); - List<Map> selectCacheEmpty(); - boolean processInto(String Number); - boolean processOut(); + /** + * @return 鎵惧埌绌烘牸瀛� + */ + DownStorageCage selectCacheEmpty(int currentSlot, boolean flag); + + /** + * @return 鎵惧埌绌烘牸瀛� + */ + List<DownStorageCageDetails> selectCacheEmpty(); + + /** + * @param downStorageCage + * @return 淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愬惎鐢�/绂佺敤銆� + */ + boolean updateDownStorageCage(DownStorageCage downStorageCage); + + /** + /** + *淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆� + */ + boolean updateDownStorageCageDetails(int downStorageCageId,DownStorageCageDetails downStorageCageDetails); + + /** + * @return 鏌ヨ绗煎瓙淇℃伅 + */ + List<Map<String, Object>> selectDownStorageCages(); + + List<DownStorageCageDetails> selectCacheMax(); } + + -- Gitblit v1.8.0