From 6617d5f71e3cb24621e1cd40eea6aff6467e5380 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 24 四月 2024 15:55:36 +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 |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 df02802..c3c26cb 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
@@ -2,13 +2,14 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mes.downstorage.entity.DownStorageCage;
+import com.mes.downstorage.entity.DownStorageCageDetails;
 
 import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  鏈嶅姟绫�
+ * 鏈嶅姟绫�
  * </p>
  *
  * @author zhoush
@@ -18,10 +19,16 @@
     public List<Map> gettask();
 
     //    List<Map<String, Object>> selectCacheLeisure();
-    List<Map> getCacheLeisure();
-    List<Map> getCacheOut(int start, int end);
+    List<DownStorageCageDetails> getCacheLeisure();
+    List<DownStorageCageDetails> getCacheOut(int start, int end);
     List<Map> getCacheInfo();
-    List<Map> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width);
-    List<Map> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width);
+    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();
+
 
 }

--
Gitblit v1.8.0