From 112ff5924fd5f6114c1562af60ca16e6eba6f7fb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十月 2025 08:34:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
index 5831a80..0e91ac2 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -1,9 +1,10 @@
package com.mes.bigstorage.mapper;
import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.base.entity.vo.BigStorageVO;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-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 org.apache.ibatis.annotations.Param;
@@ -21,6 +22,15 @@
public interface BigStorageCageDetailsMapper extends MPJBaseMapper<BigStorageCageDetails> {
/**
+ * 鎸囧畾宸ョ▼鐨勭増鍥炬槸鍚﹀埌榻�
+ *
+ * @param engineerId
+ * @param temperingLayoutId
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAllByTemperingLayoutId(String engineerId, Integer temperingLayoutId);
+
+ /**
* 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d
*
* @return
@@ -32,7 +42,7 @@
*
* @return
*/
- TemperingLayoutDTO queryTemperingOccupySlot(@Param(value = "count") int count);
+ List<TemperingLayoutDTO> queryTemperingOccupySlot(@Param(value = "count") int count);
List<SlotSequenceDTO> queryGlassMaxAndMin(@Param(value = "engineerId") String engineerId, @Param(value = "temperingLayoutId") Integer temperingLayoutId);
@@ -44,4 +54,23 @@
* @param state
*/
void updateBySlot(@Param(value = "list") List<UpdateBigStorageCageDTO> glassList, @Param(value = "state") int state);
+
+ List<TemperingGlassCountDTO> selectTemperingGlassCount(int isTempering);
+
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(@Param("deviceIdList") List<Integer> deviceIdList);
+
+ List<BigStorageSequenceDTO> queryNeedDispatchSlot(BigStorageRelationDTO bigStorageRelationDTO);
+
+ List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO);
+
+ void updateDeviceIdBySlot(@Param("list") List<Integer> slotList);
+
+ List<BigStorageVO> querybigStorageCageDetail();
+
+ List<BigStorageCageDetails> queryNeedDispatch();
+
+
+ BigStorageSlotDTO queryNeedDispatchSlotBySequence();
+
+ List<TemperingGlassCountDTO> queryTemperingGlassCountSummary(int isTempering);
}
--
Gitblit v1.8.0