From 2bcc7bbdf9257c5b9e952f7e206123bf1c3d6826 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 15:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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 7aea275..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,9 +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;
@@ -18,31 +19,21 @@
*/
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();
-
-
- /**
- * @param Number
- * @return 杩涚墖
- */
- boolean processInto(String Number);
-
- /**
-
- * @return 绌烘牸
- */
-
- /**
- * @return 鍑虹墖
- */
- boolean processOut();
/**
* @return 鎵惧埌绌烘牸瀛�
*/
- List<DownStorageCageDetails> selectCacheEmpty() ;
+ DownStorageCage selectCacheEmpty(int currentSlot, boolean flag);
+
+ /**
+ * @return 鎵惧埌绌烘牸瀛�
+ */
+ List<DownStorageCageDetails> selectCacheEmpty();
/**
* @param downStorageCage
@@ -61,6 +52,7 @@
*/
List<Map<String, Object>> selectDownStorageCages();
+ List<DownStorageCageDetails> selectCacheMax();
}
--
Gitblit v1.8.0