From cf33278c73767f72e35a4898c23765f52a3bfd1d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 09:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywMes'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 1b77d63..74183c1 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
@@ -2,9 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.entity.BigStorageDTO;
-import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
-import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
+import com.mes.bigstorage.entity.dto.*;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;
@@ -21,7 +19,9 @@
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
- List<BigStorageCageDetails> selectTask(int taskType);
+ List<BigStorageCageDetails> selectFeedTask();
+
+ List<BigStorageCageDetails> selectOutTask();
double selectGetBoard(String plcFeedReqLine);
@@ -56,7 +56,7 @@
*
* @return
*/
- TemperingLayoutDTO queryTemperingOccupySlot();
+ List<TemperingLayoutDTO> queryTemperingOccupySlot();
/**
* 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙�
@@ -67,9 +67,19 @@
*/
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);
+
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+
+ List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);
+
+ String dispatchSwitch(Boolean flag);
}
--
Gitblit v1.8.0