Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-04-24 18f6e14f2cb0e19fc8726e9821bc4db172a04d17

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -32,20 +32,22 @@
    @Override
    public int getGlassInfoCountByFlowCardId(String flowCardId) {
        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("flowcard_id", flowCardId);
        queryWrapper.eq("flow_card_id", flowCardId);

        return baseMapper.selectCount(queryWrapper);
    }

    @Override
    public List<Map<String, Object>> getFlowCardId() {
        return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flowcard_id"));
        return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flow_card_id"));
    }



    @Override
    public GlassInfo selectGlassId(String id) {
        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", id);
        queryWrapper.eq("glass_id", id);

        return baseMapper.selectOne(queryWrapper);
    }