From b08b4b56f53e4a3458da98178c03d44c3688a914 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 27 六月 2024 17:07:34 +0800 Subject: [PATCH] 下片功能已完成机械臂交互 待改进:界面新增人工出片功能,移除人工出片阈值校验 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 17 +++++++++++++++-- 1 files changed, 15 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 ba78936..1b1479a 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 @@ -46,7 +46,7 @@ * @param end * @return log.info(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 "); */ - List<DownStorageCageDetails> CacheOut(int start, int end); + /** * @return 鍑虹墖 @@ -56,7 +56,20 @@ /** + * @param start + * @param end + * @return 鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖鐨勫皬鐗� + */ + List<DownStorageCageDetails> CacheOut2(int start, int end); +// /** +// * @return 鐩撮�氭煡璇� +// */ +// List<GlassInfo> DirectConnection(); + + /** * @return 鐩撮�氭煡璇� */ - List<GlassInfo> DirectConnection(); + boolean DirectConnection(GlassInfo glassInfo); + + DownStorageCageDetails getGlassInfoMaxCount(); } -- Gitblit v1.8.0