义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wangfei
2024-08-23 051613aa73be3e75af5a6dfdb86a722bcb5af094 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java


@@ -243,9 +243,9 @@


        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))


                .orderByAsc(BigStorageCage::getDeviceId)


                .orderByAsc(BigStorageCage::getSlot);


                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL,Const.GLASS_STATE_OUT_ING))


                        .orderByAsc(BigStorageCage::getDeviceId)


                        .orderByAsc(BigStorageCage::getSlot);


        return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);


    }




@@ -256,7 +256,7 @@


        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));


                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL,Const.GLASS_STATE_OUT_ING));


        List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);


        Map<Integer, List<BigStorageCage>> listMap = bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));


        return listMap;


@@ -283,4 +283,14 @@


        bigStorageCageWrapper.eq(BigStorageCage::getSlot, slot);


        baseMapper.update(bigStorageCage, bigStorageCageWrapper);


    }




    @Override


    public List<Integer> queryFreeDeviceByUsed(double thickness) {


        return baseMapper.queryFreeDeviceByUsed(thickness);


    }




    @Override


    public List<Integer> queryFreeDeviceByNotUsed(double thickness) {


        return baseMapper.queryFreeDeviceByNotUsed(thickness);


    }


}