From 6877ca889fcc8e9963bb12fe27bff106bcc79ebd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 28 五月 2024 09:06:57 +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/DownStorageCageDetailsService.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index f5388ed..ba78936 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -2,6 +2,7 @@
 
 import com.github.yulichang.base.MPJBaseService;
 import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.glassinfo.entity.GlassInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -48,8 +49,14 @@
     List<DownStorageCageDetails> CacheOut(int start, int end);
 
     /**
-     * @return 鏌ヨ绌烘牸瀛�
+     * @return 鍑虹墖
      */
-   // List<DownStorageCageDetails> selectCacheEmpty2();
 
+    List<DownStorageCageDetails> CacheOut1(int start, int end);
+
+
+    /**
+     * @return 鐩撮�氭煡璇�
+     */
+    List<GlassInfo>  DirectConnection();
 }

--
Gitblit v1.8.0