blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ZengTao
2025-03-13 fb475fba72f99e9df89ddbd739664909a1cc91ba 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java


@@ -6,6 +6,7 @@


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.github.yulichang.query.MPJQueryWrapper;


import com.mes.glassinfo.entity.GlassInfo;


import com.mes.glassinfo.entity.LoadGlassInfo;


import com.mes.glassinfo.mapper.GlassInfoMapper;


import com.mes.temperingglass.entity.TemperingGlassInfo;


import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;


@@ -151,11 +152,11 @@


    }




    @Override


    public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {


        List<GlassInfo> glassInfos = null;


        glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>()


                .select("IFNULL(b.status, 0) AS status,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")


                .leftJoin("(SELECT glass_id, MAX(status) AS status FROM damage GROUP BY glass_id) b\n" +


    public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) {


        List<LoadGlassInfo> glassInfos = null;


        glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()


                .select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")


                .leftJoin("(SELECT glass_id, MAX(type) AS state FROM damage GROUP BY glass_id) b\n" +


                        "ON t.glass_id = b.glass_id")


                .eq("engineer_id", glassInfo.getEngineerId())


                .eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));