wangfei
2024-10-17 0b8f1db9b9db6ec216091e953303a752c91aa307
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -29,7 +29,7 @@
    public List<TemperingGlassInfo> selectWaitingGlass() {
        //获取等待进炉中的玻璃信息
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        wrapper.select("Top 1 *").in("state",1,0);
        wrapper.select("Top 1 *").in("state",1,0,-1);
        TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
        if(glass!=null) {
            QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
@@ -88,7 +88,7 @@
        wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
                .eq("state",2)
                .groupBy("tempering_layout_id,engineer_id")
                .orderByDesc("id");
                .orderByAsc("id");
        return temperingMapper.selectList(wrapper);
    }