义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
3 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391 
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java


@@ -7,6 +7,7 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.mes.common.config.Const;


import com.mes.common.config.ConstSysConfig;


import com.mes.glassinfo.entity.GlassInfo;


import com.mes.glassinfo.service.GlassInfoService;


import com.mes.hollow.controller.HollowBigStorageCageController;


@@ -23,6 +24,8 @@


import com.mes.hollow.service.HollowGlassRelationInfoService;


import com.mes.hollowqueue.entity.HollowGlassQueueInfo;


import com.mes.hollowqueue.service.HollowGlassQueueInfoService;


import com.mes.largenscreen.entity.PieChartVO;


import com.mes.sysconfig.service.SysConfigService;


import com.mes.tools.DateUtil;


import com.mes.utils.Blank;


import com.mes.utils.RedisUtil;


@@ -32,8 +35,8 @@


import freemarker.template.Version;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


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


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.io.*;


@@ -61,24 +64,28 @@


    HollowFormulaDetailsService hollowFormulaDetailsService;


    @Resource


    HollowGlassRelationInfoService hollowGlassRelationInfoService;


    @Resource


    SysConfigService sysConfigService;




    @Resource


    RedisUtil redisUtil;




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


    private Integer glassGap;




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


    private Integer carWidth;


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


//    private Integer glassGap;


//


//    @Value("${mes.carWidth}")


//    private Integer carWidth;




    private static final int ID_RATIO = 10;




    @Override


    @Transactional


    public HollowGlassOutRelationInfo receiveTask(HollowTaskRequest request) {


        return childrenTask(request, 0);


    }




    @Override


    @Transactional


    public HollowGlassOutRelationInfo forceOutGlass(HollowTaskRequest request) {


        return childrenTask(request, 1);


    }


@@ -358,7 +365,9 @@


                .queryOutGlassList(request.getFlowCardId(), request.getCell());


        int isPairCount = glassInfo.getTotalLayer() * request.getTotalPairQuantity();


        List<HollowGlassQueueInfo> hollowQueues = new ArrayList<>();




        Integer carWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_CAR_WIDTH);


//        Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);


        Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(hollowBigStorageCageDetailsList.get(0).getThickness());


        if (930 == request.getCell()) {


            Map<Integer, List<HollowBigStorageCageDetails>> listMap = hollowBigStorageCageDetailsList.stream()


                    .collect(Collectors.groupingBy(HollowBigStorageCageDetails::getHollowSequence));


@@ -425,5 +434,10 @@


        queueInfo.setUpdateTime(new Date());


        return queueInfo;


    }




    @Override


    public List<PieChartVO> queryPieChart() {


        return baseMapper.queryPieChart();


    }


}