From 8cc26dd54779273f895a3cbc3f84c8933a02a0dc Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 10 七月 2024 14:44:47 +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 | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 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 38e5f48..a5a3a3c 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 @@ -56,7 +56,27 @@ /** + * @param start + * @param end + * @return 鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖鐨勫皬鐗� + */ + List<DownStorageCageDetails> CacheOut2(int start, int end); +// /** +// * @return 鐩撮�氭煡璇� +// */ +// List<GlassInfo> DirectConnection(); + + /** * @return 鐩撮�氭煡璇� */ - List<GlassInfo> DirectConnection(); + boolean DirectConnection(GlassInfo glassInfo); + + String getGlassInfoMaxCount(String glassId); + + /** + * @param glassId + * @param ControlsId + * @return 鐮存崯 + */ + boolean identWorn(String glassId, int ControlsId); } -- Gitblit v1.8.0