From c1f06f52a6b7f3337bacd98feb55aca6af8e6e2c Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 05 七月 2024 08:32:09 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java index 7fd31e5..fac40d1 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java @@ -2,10 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.downglassinfo.entity.DownGlassInfo; -import org.apache.ibatis.annotations.Delete; +import com.mes.downworkstation.entity.dto.DownGlassInfoDTO; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; import java.util.List; @@ -13,11 +11,10 @@ @Repository public interface DownGlassInfoMapper extends BaseMapper<DownGlassInfo> { -// @Select("SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId} LIMIT 1") -// Integer getMaxSequenceByFlowCardId(@Param("flowCardId") String flowCardId); -//// -// @Delete("delete from down_glass_task where flow_card_id = #{flowCardId}") -// void deletetask(@Param("flowCardId") String flowCardId); + DownGlassInfoDTO queryDownGlassMaxLayer(@Param(value = "flowCardId") String flowCardId); + Integer queryMaxSequence(@Param(value = "flowCardId") String flowCardId, @Param(value = "layer") int layer); + + List<DownGlassInfoDTO> queryWorkStationIsIn(@Param(value = "isDownload") Boolean isDownload); } -- Gitblit v1.8.0