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/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
index e86fbc3..a141d91 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
@@ -1,15 +1,17 @@
package com.mes.edgstoragecage.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
+import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
+import com.mes.largenscreen.entity.PieChartVO;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
-import java.util.Map;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author zhoush
@@ -17,4 +19,19 @@
*/
public interface EdgStorageCageDetailsMapper extends MPJBaseMapper<EdgStorageCageDetails> {
+ EdgStorageCageDetails queryEdgStorageDetailsBySize(@Param("deviceId") int deviceId, @Param("currentSlot") int currentSlot, @Param("width") double width,
+ @Param("height") double height, @Param("cell") int cell, @Param("maxThickness") int maxThickness);
+
+ EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(@Param("deviceId") int deviceId, @Param("currentCell") Integer currentCell,
+ @Param("width") double width, @Param("height") double height, @Param("cell") int cell,
+ @Param("minOneFirstLength") int minOneFirstLength, @Param("minOneSecondLength") int minOneSecondLength,
+ @Param("maxTwoFirstLength") int maxTwoFirstLength, @Param("maxTwoSecondLength") int maxTwoSecondLength,
+ @Param("maxThickness") int maxThickness);
+
+ List<CutDrawingVO> queryCutDrawingByEngineerId(@Param("engineerId") String engineerId, @Param("patternSequence") int patternSequence, @Param("isAll") int isAll);
+
+ List<EdgSlotRemainVO> querySlotRemainWidth(@Param("cellLength") int cellLength, @Param("glassGap") int glassGap);
+
+
+ List<PieChartVO> queryPieChart();
}
--
Gitblit v1.8.0