From e9de57df1ef825a3f17b792e9110f24c407c03fb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 十月 2024 08:31:48 +0800
Subject: [PATCH] Merge branch 'hangzhou_master' of http://bore.pub:10439/r/HangZhouMes into hangzhou_master
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
index 57ca8ad..8daa7b7 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -58,7 +58,7 @@
*
* @return
*/
- TemperingLayoutDTO queryTemperingOccupySlot();
+ List<TemperingLayoutDTO> queryTemperingOccupySlot();
/**
* 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙�
@@ -69,11 +69,13 @@
*/
List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId);
- boolean temperingGlass(String temperingLayoutId, String engineerId);
+ boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence);
List<Map<String, Object>> selectTemperingGlass();
void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state);
String temperingSwitch(Boolean flag);
+
+ void appointEngineerId(String engineerId);
}
--
Gitblit v1.8.0