From 1fff00ffd54ad172816fd019ce73440093b3ee80 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 七月 2024 15:34:40 +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 | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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 3764770..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
@@ -1,37 +1,37 @@
package com.mes.downstorage.service;
+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;
-public interface DownStorageCageDetailsService {
+public interface DownStorageCageDetailsService extends MPJBaseService<DownStorageCageDetails> {
/**
-
- * @return //娣诲姞鐞嗙墖绗煎唴淇℃伅
+ * @return //娣诲姞鐞嗙墖绗煎唴淇℃伅
*/
void addDownStorageCageDetails(DownStorageCageDetails details);
/**
-
- * @return //淇敼鐞嗙墖绗煎唴淇℃伅
+ * @return //淇敼鐞嗙墖绗煎唴淇℃伅
*/
boolean updatedownStorageCageDetails(DownStorageCageDetails details);
- List<DownStorageCageDetails> getCacheLeisure();
+
+ // List<DownStorageCageDetails> getCacheLeisure();
/**
* @param start
* @param end
* @return 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�
*/
- List<DownStorageCageDetails> getCacheOut(int start, int end);
+ // List<DownStorageCageDetails> getCacheOut(int start, int end);
/**
- * @return 鏌ヨ绗煎瓙鍐呬俊鎭�
+ * @return 鏌ヨ绗煎瓙鍐呬俊鎭�
*/
- List<Map> getCacheInfo();
+ List<Map<String, Object>> getCacheInfo();
/**
@@ -39,16 +39,44 @@
* @param width
* @return 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌绌烘牸
*/
- List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
+ // List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
/**
* @param start
* @param end
- * @return log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
+ * @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