From b049e8f345c6725899fcfbe2da89548500515fba Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 22 十月 2025 17:05:57 +0800
Subject: [PATCH] 1、 钢化前理片笼进片/直通已开发,调度框架已搭建等待补充

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 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 06aa8cb..b26b486 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;
@@ -40,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
      *
@@ -79,7 +96,7 @@
 
     boolean appointTemperingEngineerId(String engineerId);
 
-    List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+    List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(List<Integer> deviceIdList);
 
     List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);
 
@@ -87,6 +104,7 @@
 
     /**
      * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭�
+     *
      * @param bigStorageQueryVO
      * @return
      */
@@ -96,6 +114,7 @@
 
     /**
      * 鎸夌収鏍煎瓙鍙锋洿鏂拌鎯呰〃鍐呯殑鏍煎瓙瀵瑰簲鐨勮澶噄d
+     *
      * @param slotList
      */
     void updateDeviceIdBySlot(List<Integer> slotList);
@@ -109,4 +128,18 @@
     List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO);
 
     Map<Integer, List<BigStorageVO>> querybigStorageCageDetail();
+
+    /**
+     * 鍙栨秷閽㈠寲浠诲姟
+     *
+     * @return
+     */
+    boolean cancelTemperingTask();
+
+
+    /**
+     * 鏌ヨ宸ョ▼寰呮帓搴忎俊鎭�
+     * @return
+     */
+    List<BigStorageCageDetails> queryEngineer();
 }

--
Gitblit v1.8.0