From 4c42d82f177b24f21dee14dd041035fb6c1ce7ee Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 06 八月 2024 08:11:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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..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,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, Integer taskType);
+
+ DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, Integer taskType);
// List<Map<String, Object>> selectCacheLeisure();
-
-
-
/**
* @return 鎵惧埌绌烘牸瀛�
*/
- List<DownStorageCageDetails> selectCacheEmpty() ;
+ DownStorageCage selectCacheEmpty(int currentSlot, boolean flag);
+
+ /**
+ * @return 鎵惧埌绌烘牸瀛�
+ */
+ List<DownStorageCageDetails> selectCacheEmpty();
/**
* @param downStorageCage
@@ -50,12 +52,7 @@
*/
List<Map<String, Object>> selectDownStorageCages();
-
- /**
- * @return 鏌ヨ缂撳瓨涓渶澶氱殑娴佺▼鍗�
- */
List<DownStorageCageDetails> selectCacheMax();
-
}
--
Gitblit v1.8.0