义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2025-02-26 a8c1dd008f9a096cb01774f17a8bceda5aafed88 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java


@@ -3,12 +3,15 @@


import com.baomidou.dynamic.datasource.annotation.DS;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.github.yulichang.query.MPJQueryWrapper;


import com.mes.glassinfo.entity.GlassInfo;


import com.mes.glassinfo.mapper.GlassInfoMapper;


import com.mes.temperingglass.entity.TemperingGlassInfo;


import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;


import com.mes.temperingglass.service.TemperingGlassInfoService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import com.github.yulichang.base.MPJBaseServiceImpl;




import javax.annotation.Resource;


import java.util.List;


@@ -22,10 +25,12 @@


 * @since 2024-04-07


 */


@Service


@DS("salve_hangzhoumes")


@DS("salve_northGlassMes")


public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {


    @Resource


    TemperingGlassInfoMapper temperingMapper;


    @Autowired


    private GlassInfoMapper glassInfoMapper;




    @Override


    public List<TemperingGlassInfo> selectWaitingGlass() {


@@ -133,4 +138,31 @@


        }


        return result;


    }




    @Override


    public GlassInfo selectTempering(GlassInfo glassInfo) {




        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();


        wrapper.select("max(tempering_layout_id)as id")


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




        return glassInfoMapper.selectOne(wrapper);


    }




    @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" +


                        "ON t.glass_id = b.glass_id")


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


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


        return glassInfos;


//        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();


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


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


//                .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");


//        return glassInfoMapper.selectList(wrapper);


    }


}