From d55b5b015eef8c31d9dea6587dc6fd0e02818cd1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 08:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 f8690b6..2392ac2 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
@@ -7,6 +7,7 @@
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.pp.entity.OptimizeProject;
import java.util.List;
import java.util.Map;
@@ -95,7 +96,7 @@
boolean appointTemperingEngineerId(String engineerId);
- List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(List<Integer> deviceIdList);
List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);
@@ -134,4 +135,24 @@
* @return
*/
boolean cancelTemperingTask();
+
+
+ /**
+ * 鏌ヨ宸ョ▼寰呮帓搴忎俊鎭�
+ * @return
+ */
+ List<BigStorageCageDetails> queryEngineer();
+
+ /**
+ * 鏌ヨ4鍙风鍙線5-6鍙风涓嶆弧鏍煎嵈婊¤冻涓埆鐨勮皟搴�
+ * @return
+ */
+ List<BigStorageCageDetails> queryNeedDispatch();
+
+ BigStorageSlotDTO queryNeedDispatchSlotBySequence();
+ /**
+ * 鏌ヨ閽㈠寲鎺掍骇椤哄簭
+ * @return OptimizeProject 閽㈠寲鎺掍骇椤哄簭
+ */
+ List<OptimizeProject> queryTemperingOrder();
}
--
Gitblit v1.8.0