From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 09 十月 2024 15:47:59 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- 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 220ccab..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.uppattenusage.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 SelectTemperingFeedSlot(GlassInfo glassInfo); - - 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