From c7e6ef17c73feb1a3bf4bf0d6762d46f26fd4709 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 13 八月 2024 08:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 493a805..f6353ea 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,7 +1,13 @@
package com.mes.bigstorage.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
+import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
+import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
@@ -12,6 +18,30 @@
* @author zhoush
* @since 2024-03-27
*/
-public interface BigStorageCageDetailsMapper extends BaseMapper<BigStorageCageDetails> {
+public interface BigStorageCageDetailsMapper extends MPJBaseMapper<BigStorageCageDetails> {
+ /**
+ * 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d
+ *
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAll();
+
+ /**
+ * 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲�
+ *
+ * @return
+ */
+ List<TemperingLayoutDTO> queryTemperingOccupySlot(@Param(value = "count") int count);
+
+
+ List<SlotSequenceDTO> queryGlassMaxAndMin(@Param(value = "engineerId") String engineerId, @Param(value = "temperingLayoutId") Integer temperingLayoutId);
+
+ /**
+ * 鎸夌収鐜荤拑id鍜岀洰鏍囨牸瀛愭洿鏂扮鍐呯幓鐠冧俊鎭�
+ *
+ * @param glassList
+ * @param state
+ */
+ void updateBySlot(@Param(value = "list") List<UpdateBigStorageCageDTO> glassList, @Param(value = "state") int state);
}
--
Gitblit v1.8.0