From 2aa1ac49e96999cd58d975afdabe98215f91f534 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期一, 01 七月 2024 14:39:13 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 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 f5d4ad5..0332552 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,6 +1,5 @@ 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; @@ -20,18 +19,21 @@ */ public interface DownStorageCageService extends MPJBaseService<DownStorageCage> { - DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell, String taskType); - DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell, String taskType); + DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, String taskType); + + DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, String taskType); // List<Map<String, Object>> selectCacheLeisure(); - - - /** * @return 鎵惧埌绌烘牸瀛� */ - List<DownStorageCageDetails> selectCacheEmpty() ; + DownStorageCage selectCacheEmpty(int currentSlot, boolean flag); + + /** + * @return 鎵惧埌绌烘牸瀛� + */ + List<DownStorageCageDetails> selectCacheEmpty(); /** * @param downStorageCage -- Gitblit v1.8.0