义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2025-03-10 976cee4892eec261f6c2927e788e476e5cc5028e 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java


@@ -3,11 +3,15 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.core.toolkit.StringUtils;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.github.yulichang.wrapper.MPJLambdaWrapper;


import com.mes.bigstorage.entity.BigStorageCage;


import com.mes.bigstorage.entity.BigStorageCageDetails;


import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;


import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;


import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;


import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;


import com.mes.bigstorage.mapper.BigStorageCageMapper;


import com.mes.bigstorage.service.BigStorageCageService;


@@ -18,6 +22,7 @@


import com.mes.temperingglass.service.TemperingGlassInfoService;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


@@ -48,6 +53,12 @@




    @Resource


    private GlassInfoService glassInfoService;




    @Value("${mes.glassGap}")


    private Integer glassGap;




    @Value("${mes.slotWidth}")


    private Integer slotWidth;




    //进片逻辑


    @Override


@@ -190,13 +201,10 @@


                            .orderByDesc(GlassInfo::getTemperingFeedSequence);


                    List<GlassInfo> glassInfoList = glassInfoService.list(glassInfoWrapper);


                    if (glassInfoList.size() == Integer.parseInt(temperingNo.toString())) {


                        for (GlassInfo glassInfo : glassInfoList


                        ) {




                        for (GlassInfo glassInfo : glassInfoList) {


                            TemperingGlassInfo temperingGlassInfo = new TemperingGlassInfo();


                            BeanUtils.copyProperties(glassInfo, temperingGlassInfo);


                            temperingGlassInfoService.save(temperingGlassInfo);




                        }


                        key = true;


                    }


@@ -209,6 +217,20 @@


        return false;


    }




    @Override


    public List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {


        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();


        wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)


                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)


                        .like(StringUtils.isNotBlank(query.getFilmsId()), BigStorageCageDetails::getFilmsId, query.getFilmsId())


                        .like(StringUtils.isNotBlank(query.getFlowCardId()), BigStorageCageDetails::getFlowCardId, query.getFlowCardId())


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


                .eq(BigStorageCage::getDeviceId, query.getDeviceId())


                .orderByAsc(BigStorageCage::getDeviceId)


                .orderByAsc(BigStorageCage::getSlot);


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


    }




    //计算格子剩余宽度


    @Override


    public void updateRemainWidth(int slot) {


@@ -217,15 +239,13 @@


        LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper();


        bigStorageCageDetailsWrapper


                .eq(BigStorageCageDetails::getSlot, slot)


                .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)


                .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);


                .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL);




        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);


        for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList


        ) {


            double widths = bigStorageCageDetails.getWidth();


            double gap = bigStorageCageDetails.getGap();


            width -= widths + gap;


            double widths = Math.max(bigStorageCageDetails.getWidth(), bigStorageCageDetails.getHeight());


            width = width - widths - glassGap;


        }


        //修改格子剩余宽度


        BigStorageCage bigStorageCage = new BigStorageCage();


@@ -241,9 +261,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,Const.GLASS_STATE_OUT_ING))


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


    }




@@ -254,7 +274,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,Const.GLASS_STATE_OUT_ING));


                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).orderByAsc(BigStorageCageDetails::getUpdateTime));


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


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


        return listMap;


@@ -264,8 +284,7 @@


    @Override


    public List<Map<String, Object>> selectBigStorageCageUsage() {


        QueryWrapper<BigStorageCage> wrapper = new QueryWrapper<>();


        wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) / COUNT(device_id), 2) AS percentage,SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) AS count")




        wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = " + slotWidth + " THEN 1 ELSE 0 END) / COUNT(device_id), 2)*100 AS percentage,SUM(CASE WHEN remain_width = " + slotWidth + " THEN 1 ELSE 0 END) AS count")


                .groupBy("device_id");


        List<Map<String, Object>> bigStorageCageUsages = baseMapper.selectMaps(wrapper);




@@ -281,4 +300,19 @@


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


        baseMapper.update(bigStorageCage, bigStorageCageWrapper);


    }




    @Override


    public List<Integer> queryFreeDeviceByUsed(double thickness) {


        return baseMapper.queryFreeDeviceByUsed(thickness);


    }




    @Override


    public List<BigStorageSummaryDTO> selectBigStorageSummary() {


        return baseMapper.selectBigStorageSummary();


    }




//    @Override


//    public List<Integer> queryFreeDeviceByNotUsed(double thickness) {


//        return baseMapper.queryFreeDeviceByNotUsed(thickness);


//    }


}