From c7e6ef17c73feb1a3bf4bf0d6762d46f26fd4709 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 13 八月 2024 08:27:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java index f9a3cf8..40e1827 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java @@ -1,9 +1,10 @@ package com.mes.bigstoragetask.service; -import com.mes.bigstorage.entity.BigStorageCageDetails; -import com.mes.bigstoragetask.entity.BigStorageCageFeedTask; import com.baomidou.mybatisplus.extension.service.IService; -import com.mes.bigstoragetask.entity.BigStorageCageOutTask; +import com.github.yulichang.base.MPJBaseService; +import com.mes.bigstorage.entity.BigStorageCageDetails; +import com.mes.bigstorage.entity.BigStorageDTO; +import com.mes.bigstoragetask.entity.BigStorageCageFeedTask; import java.util.List; @@ -15,9 +16,19 @@ * @author zhoush * @since 2024-04-16 */ -public interface BigStorageCageFeedTaskService extends IService<BigStorageCageFeedTask> { +public interface BigStorageCageFeedTaskService extends MPJBaseService<BigStorageCageFeedTask> { void addFeedTask(BigStorageCageDetails slotInfo, Integer plcFeedReqLine, int taskType); List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState); + + /** + * 鏌ヨ鍗ц浆绔嬬幓鐠冩槸鍚﹁繘鐗囧畬鎴� + */ + BigStorageDTO querySitToUpRemainWidth(Integer line); + + /** + * 鏌ヨ鍗ц浆绔嬬幓鐠冩槸鍚﹁繘鐗囧畬鎴� + */ + List<Integer> querySitToUpGlass(); } -- Gitblit v1.8.0