From 636bd027a92d4bf669410ee550a5ca6324f72c88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 十月 2025 17:30:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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 7548524..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,8 +7,10 @@
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;
/**
* <p>
@@ -39,12 +41,28 @@
void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
/**
+ * 鏌ヨ杩涚墖鏍煎瓙淇℃伅锛氫紭鍏堝伐绋嬫渶灏戙�佸墿浣欐牸瀛愭渶澶氱殑绗煎瓙鍐呯殑鏍煎瓙
+ * @param EngineerId
+ * @param glassId
+ * @param thickness
+ * @return
+ */
+ BigStorageDTO queryTargetSlot(String EngineerId, String glassId, int thickness);
+
+ /**
* 鎸夌収鐗堝浘淇℃伅鑾峰彇杩涚墖绗煎瓙淇℃伅
*
* @param glassInfo
*/
BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo);
+ /**
+ * 鎸囧畾宸ョ▼鐨勭増鍥炬槸鍚﹀埌榻�
+ * @param engineerId
+ * @param temperingLayoutId
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAllByTemperingLayoutId(String engineerId, Integer temperingLayoutId);
/**
* 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d
*
@@ -78,7 +96,7 @@
boolean appointTemperingEngineerId(String engineerId);
- List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(List<Integer> deviceIdList);
List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);
@@ -86,6 +104,7 @@
/**
* 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭�
+ *
* @param bigStorageQueryVO
* @return
*/
@@ -95,6 +114,7 @@
/**
* 鎸夌収鏍煎瓙鍙锋洿鏂拌鎯呰〃鍐呯殑鏍煎瓙瀵瑰簲鐨勮澶噄d
+ *
* @param slotList
*/
void updateDeviceIdBySlot(List<Integer> slotList);
@@ -107,5 +127,32 @@
*/
List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO);
- List<BigStorageVO> querybigStorageCageDetail();
+ Map<Integer, List<BigStorageVO>> querybigStorageCageDetail();
+
+ /**
+ * 鍙栨秷閽㈠寲浠诲姟
+ *
+ * @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