From 4f5d1a4c178231bf0eb5db2f8e6f158fffbf5635 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 01 七月 2024 17:57:07 +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 | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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..29c215b 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;
@@ -45,11 +46,37 @@
* @param end
* @return log.info(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 ");
*/
- List<DownStorageCageDetails> CacheOut(int start, int end);
+
/**
- * @return 鏌ヨ绌烘牸瀛�
+ * @return 鍑虹墖
*/
- // List<DownStorageCageDetails> selectCacheEmpty2();
+ List<DownStorageCageDetails> CacheOut1(int start, int end);
+
+
+ /**
+ * @param start
+ * @param end
+ * @return 鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖鐨勫皬鐗�
+ */
+ List<DownStorageCageDetails> CacheOut2(int start, int end);
+// /**
+// * @return 鐩撮�氭煡璇�
+// */
+// List<GlassInfo> DirectConnection();
+
+ /**
+ * @return 鐩撮�氭煡璇�
+ */
+ boolean DirectConnection(GlassInfo glassInfo);
+
+ DownStorageCageDetails getGlassInfoMaxCount();
+
+ /**
+ * @param glassId
+ * @param ControlsId
+ * @return 鐮存崯
+ */
+ boolean identWorn(String glassId, int ControlsId);
}
--
Gitblit v1.8.0