From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +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 |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 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..5d2a5d5 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,34 @@
 
 
     /**
+     * @param start
+     * @param end
+     * @return   鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖鐨勫皬鐗�
+     */
+    List<DownStorageCageDetails> CacheOut2(int start, int end);
+//    /**
+//     * @return 鐩撮�氭煡璇�
+//     */
+//    List<GlassInfo>  DirectConnection();
+
+    /**
      * @return 鐩撮�氭煡璇�
      */
-    List<GlassInfo>  DirectConnection();
+    boolean DirectConnection(GlassInfo glassInfo);
+
+    /**
+     * 鑾峰彇褰撳墠闈炴湰鏋跺瓙鍙惤鏋剁殑鐜荤拑淇℃伅
+     *
+     * @param glassId
+     * @param workList G06/G11:浼犲叆G06瀹為檯鑾峰彇鐨勪负鍙惤鏋禛11鐨勭幓鐠� 鍙嶄箣鍚岀悊
+     * @return
+     */
+    String getGlassInfoMaxCount(String glassId, List<Integer> workList);
+
+    /**
+     * @param glassId
+     * @param ControlsId
+     * @return 鐮存崯
+     */
+    boolean identWorn(String glassId, int ControlsId);
 }

--
Gitblit v1.8.0