Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-25 78311acaaf04aab09f400a5c958c9d6cbc2b4aae

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -32,10 +32,14 @@
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        wrapper.select("Top 1 *").eq("state",1);
        TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
        QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
        glassinfo.eq("engineer_id",glass.getEngineerId())
                .eq("tempering_layout_id", glass.getTemperingLayoutId());
        return temperingMapper.selectList(glassinfo);
        if(glass!=null) {
            QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
            glassinfo.eq("engineer_id", glass.getEngineerId())
                    .eq("tempering_layout_id", glass.getTemperingLayoutId());
            return temperingMapper.selectList(glassinfo);
        }else {
            return null;
        }
    }

    @Override
@@ -55,11 +59,14 @@
        wrap.select("Top 1 *").eq("state",3);
        TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
        //根据工程号和版图获取数据
        QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
        wapper.eq("engineer_id",glass.getEngineerId())
                .eq("tempering_layout_id", glass.getTemperingLayoutId())
                .orderByAsc("tempering_layout_id","tempering_feed_sequence");
        return temperingMapper.selectList(wapper);
        if(glass != null) {
            QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
            wapper.eq("engineer_id", glass.getEngineerId())
                    .eq("tempering_layout_id", glass.getTemperingLayoutId())
                    .orderByAsc("tempering_layout_id", "tempering_feed_sequence");
            return temperingMapper.selectList(wapper);
        }
            return  null;
    }

    @Override