From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 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 cab1f09..098362d 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
@@ -1,10 +1,11 @@
package com.mes.bigstorage.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.base.entity.vo.BigStorageVO;
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.bigstorage.entity.vo.BigStorageQueryVO;
+import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
@@ -12,7 +13,7 @@
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -20,13 +21,15 @@
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
- List<BigStorageCageDetails> selectTask(int taskType);
+ List<BigStorageCageDetails> selectFeedTask();
+
+ List<BigStorageCageDetails> selectOutTask();
double selectGetBoard(String plcFeedReqLine);
void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
- void damageBigStorageCageDetails(String glassId,int status);
+ void damageBigStorageCageDetails(String glassId, int status);
List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId);
@@ -55,7 +58,7 @@
*
* @return
*/
- TemperingLayoutDTO queryTemperingOccupySlot();
+ List<TemperingLayoutDTO> queryTemperingOccupySlot();
/**
* 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙�
@@ -66,7 +69,51 @@
*/
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();
+ List<TemperingGlassCountDTO> selectTemperingGlass(int isTempering);
+
+ void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state);
+
+ String temperingSwitch(Boolean flag);
+
+ boolean appointTemperingEngineerId(String engineerId);
+
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+
+ List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);
+
+ String dispatchSwitch(Boolean flag);
+
+ /**
+ * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭�
+ * @param bigStorageQueryVO
+ * @return
+ */
+ List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO);
+
+ String bigStorageGlassDamageByGlassId(String glassId);
+
+ /**
+ * 鎸夌収鏍煎瓙鍙锋洿鏂拌鎯呰〃鍐呯殑鏍煎瓙瀵瑰簲鐨勮澶噄d
+ * @param slotList
+ */
+ void updateDeviceIdBySlot(List<Integer> slotList);
+
+ /**
+ * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇瀹為檯绗煎唴鐨勭幓鐠冧俊鎭�
+ *
+ * @param bigStorageQueryVO
+ * @return
+ */
+ List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO);
+
+ Map<Integer, List<BigStorageVO>> querybigStorageCageDetail();
+
+ /**
+ * 鍙栨秷閽㈠寲浠诲姟
+ *
+ * @return
+ */
+ boolean cancelTemperingTask();
}
--
Gitblit v1.8.0