From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期二, 16 四月 2024 13:30:45 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java index 454897c..8607c8d 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.downglassinfo.entity.DownGlassInfo; +import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downworkstation.entity.DownWorkstation; import org.apache.ibatis.annotations.*; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; import java.util.List; @@ -21,15 +21,21 @@ * @since 2024-03-27 */ @Mapper + @Repository @InterceptorIgnore(tenantLine = "true") @DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧� + public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> { //鏌ヨ宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲� @Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1") List<DownWorkstation> selectdownWorkstationstate(); + + +// @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;") +// List<DownGlassTask> selectunloadingtaskstate(); //鏇存柊钀芥灦鏁伴噺 // @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " + // "WHERE flow_card_id = #{flowCardId}") -- Gitblit v1.8.0