From 54aeb39206453ccfd2d1c89fe4f9def88b2c985c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 06 八月 2024 10:06:45 +0800
Subject: [PATCH] 1、解决冲突
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 fa22c2d..54966ee 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
@@ -65,8 +65,18 @@
// * @return 鐩撮�氭煡璇�
// */
// List<GlassInfo> DirectConnection();
+
/**
* @return 鐩撮�氭煡璇�
*/
boolean DirectConnection(GlassInfo glassInfo);
+
+ String getGlassInfoMaxCount(String glassId, List<Integer> workList);
+
+ /**
+ * @param glassId
+ * @param ControlsId
+ * @return 鐮存崯
+ */
+ boolean identWorn(String glassId, int ControlsId);
}
--
Gitblit v1.8.0