From b21caa5499c50384f3a3a5dd795a7a0ad197d36f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 06 十一月 2025 21:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 6b9f1f8..3ef60d6 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,14 +1,16 @@
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.*;
+import com.mes.bigstorage.entity.request.BigCageDetailsRequest;
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
+import com.mes.bigstorage.entity.vo.BigCageDetailsVO;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
-import java.util.Map;
/**
@@ -20,6 +22,15 @@
* @since 2024-03-27
*/
public interface BigStorageCageDetailsMapper extends MPJBaseMapper<BigStorageCageDetails> {
+
+ /**
+ * 鎸囧畾宸ョ▼鐨勭増鍥炬槸鍚﹀埌榻�
+ *
+ * @param engineerId
+ * @param temperingLayoutId
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAllByTemperingLayoutId(String engineerId, Integer temperingLayoutId);
/**
* 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d
@@ -48,11 +59,28 @@
List<TemperingGlassCountDTO> selectTemperingGlassCount(int isTempering);
- List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+ 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);
+
+ /**
+ * 锛堝垪琛級鎸夊垪琛ㄧ収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�
+ *
+ * @param request
+ * @return
+ */
+ List<BigCageDetailsVO> queryVerticalSheetCageDetailsList(BigCageDetailsRequest request);
}
--
Gitblit v1.8.0