From 7956f09935a708f17b0f1b29a6625475f53c7509 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 16 十月 2024 09:52:15 +0800
Subject: [PATCH] 版本整合03

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 b6e2506..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
@@ -21,7 +21,9 @@
  */
 public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
 
-    List<BigStorageCageDetails> selectTask(int taskType);
+    List<BigStorageCageDetails> selectFeedTask();
+
+    List<BigStorageCageDetails> selectOutTask();
 
     double selectGetBoard(String plcFeedReqLine);
 
@@ -56,7 +58,7 @@
      *
      * @return
      */
-    TemperingLayoutDTO queryTemperingOccupySlot();
+    List<TemperingLayoutDTO> queryTemperingOccupySlot();
 
     /**
      * 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙�
@@ -67,9 +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