ZengTao
2025-09-11 61cae17b15d6a7d256e25ce42f0a4ef4163fd088
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -248,18 +248,20 @@
                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .orderByAsc(BigStorageCage::getDeviceId)
                .orderByAsc(BigStorageCage::getSlot);
                .orderByAsc(BigStorageCage::getSlot)
                .orderByAsc(BigStorageCageDetails::getTemperingFeedSequence);
        return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
    }
    //查询大理片信息,前端展示用
    @Override
    public Map<Integer, List<BigStorageCage>> querybigStorageCageDetail() {
        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
        wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING));
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING)
                        .orderByAsc(BigStorageCage::getSlot)
                        .orderByAsc(BigStorageCageDetails::getTemperingFeedSequence));
        List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
        Map<Integer, List<BigStorageCage>> listMap = bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
        return listMap;
@@ -287,11 +289,16 @@
    }
    @Override
    public List<Integer> queryFreeDeviceByUsed(double thickness) {
        return baseMapper.queryFreeDeviceByUsed(thickness);
    public List<Integer> queryFreeDeviceByUsed(double thickness, double slotHeight) {
        return baseMapper.queryFreeDeviceByUsed(thickness, slotHeight);
    }
//    @Override
//    public List<PieChartVO> queryPieChart() {
//        return baseMapper.queryPieChart();
//    }
//    @Override
//    public List<Integer> queryFreeDeviceByNotUsed(double thickness) {
//        return baseMapper.queryFreeDeviceByNotUsed(thickness);
//    }