From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
index bd01771..99d6bb8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
@@ -1,32 +1,22 @@
 package com.mes.bigstorage.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mes.bigstorage.entity.BigStorageCage;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * <p>
- *  Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
  * </p>
  *
  * @author zhoush
  * @since 2024-03-27
  */
-public interface BigStorageCageMapper extends BaseMapper<BigStorageCage> {
+public interface BigStorageCageMapper extends MPJBaseMapper<BigStorageCage> {
 
-
-    BigStorageCageDetails SelectEmptyFeedSlot();
-
-    @Update("update big_storage_cage set remain_width = #{width} where slot=#{slot}")
-    public void UpdateRemainWidth(int slot,int width);
-
-
-
-    BigStorageCageDetails SelectOtherFeedSlot();
-
-    List<String> selectTemperingId();
+    List<Integer> queryFreeDeviceByUsed(@Param(value = "thickness") double thickness);
+//
+//    List<Integer> queryFreeDeviceByNotUsed(@Param(value = "thickness") double thickness);
 }

--
Gitblit v1.8.0