blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-08-13 8faf6c3fbbdf39ba40b5109bfa142a40713d815e 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java


@@ -2,16 +2,24 @@




import cn.hutool.core.lang.Assert;


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


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


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


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.github.yulichang.query.MPJLambdaQueryWrapper;


import com.github.yulichang.toolkit.JoinWrappers;


import com.github.yulichang.wrapper.MPJLambdaWrapper;


import com.mes.common.config.Const;


import com.mes.damage.entity.Damage;


import com.mes.damage.service.DamageService;


import com.mes.edgglasstask.entity.EdgGlassTaskInfo;


import com.mes.edgglasstask.entity.request.IdentWornRequest;


import com.mes.edgglasstask.service.EdgGlassTaskInfoService;


import com.mes.edgstoragecage.entity.EdgStorageCage;


import com.mes.edgstoragecage.entity.EdgStorageCageDetails;


import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;


import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;


import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;


import com.mes.glassinfo.mapper.GlassInfoMapper;


import com.mes.pp.entity.OptimizeDetail;


import com.mes.pp.entity.OptimizeLayout;


import com.mes.pp.mapper.OptimizeDetailMapper;


@@ -21,9 +29,11 @@


import com.mes.uppattenusage.mapper.UpPattenUsageMapper;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.lang.StringUtils;


import org.springframework.beans.BeanUtils;


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


import org.springframework.stereotype.Service;




import java.util.ArrayList;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;


@@ -48,37 +58,17 @@




    @Autowired


    EdgStorageCageMapper edgStorageCageMapper;


    @Autowired


    GlassInfoMapper glassInfoMapper;




    @Autowired


    TaskCacheService taskCacheService;




    @Autowired


    DamageService damageService;




    /**


     * 识别   拿走:200/破损:201


     *


     * @param glassId


     * @param ControlsId


     * @return


     */


    @Override


    public boolean identWorn(String glassId, int ControlsId) {


        List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));


        if (edgStorageCageDetails.size() == 1) {


            EdgStorageCageDetails item = edgStorageCageDetails.get(0);


            item.setState(ControlsId);


            baseMapper.update(edgStorageCageDetails.get(0), new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));


            return true;


        }


//            Sql版本


//        List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));


//        if (edgStorageCageDetails.size() == 1) {


//            EdgStorageCageDetails item=edgStorageCageDetails.get(0);


//            item.setState(ControlsId);


//            baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));


//            return true;


//        }


        return false;


    }


    @Autowired


    EdgGlassTaskInfoService edgGlassTaskInfoService;




    /**


     * 获取 切割当前版图


@@ -89,20 +79,35 @@


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


        List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()


                .selectAll(UpPattenUsage.class)


                .eq(UpPattenUsage::getState, 1));




                .orderByDesc(UpPattenUsage::getState)


                .orderByDesc(UpPattenUsage::getId));


        if (!upPattenUsage.isEmpty()) {


            UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);


            return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)


            List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)


                    .selectAll(OptimizeDetail.class)


                    .selectAs(OptimizeLayout::getWidth, "olWidth")


                    .selectAs(OptimizeLayout::getWidth, "olHeight")


                    .selectAs(OptimizeLayout::getHeight, "olHeight")


                    .leftJoin(OptimizeLayout.class, on -> on


                            .eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)


                            .eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))


                    .eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())


                    .eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())


            );


            List<Map<String, Object>> ResultcutTerritorys = new ArrayList<>();


            for (Map<String, Object> cutTerritory : cutTerritorys) {


                EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()


                        .selectAll(EdgStorageCageDetails.class)


                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))


                        .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));


//                log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);


                if (edgStorageCageDetails != null) {


                    cutTerritory.put("glass_state", edgStorageCageDetails.getState());


                } else {


                    cutTerritory.put("glass_state", 0);


                }


                ResultcutTerritorys.add(cutTerritory);


            }


            return ResultcutTerritorys;




//            Sql版本


//            return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)


@@ -122,17 +127,40 @@


     * @return


     */


    @Override


    public List<Map<String, Object>> selectCurrentCutTerritory(String current) {




        return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)


    public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {


        //结果


        List<Map<String, Object>> ResultcutTerritorys = new ArrayList<>();


        //此工程的所有优化数据


        List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)


                .selectAll(OptimizeDetail.class)


                .selectAs(OptimizeLayout::getWidth, "olWidth")


                .selectAs(OptimizeLayout::getWidth, "olHeight")


                .selectAs(OptimizeLayout::getHeight, "olHeight")


                .leftJoin(OptimizeLayout.class, on -> on


                        .eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)


                        .eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))


                .eq(OptimizeDetail::getProjectNo, current)


        );




        Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()


                .selectAll(EdgStorageCageDetails.class)


                .eq(EdgStorageCageDetails::getEngineerId, current)


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


        ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails));


        for (Map<String, Object> cutTerritory : cutTerritorys) {


//                log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);


            if (cutTerritory.get("glass_id") == null || "".equals(cutTerritory.get("glass_id"))) {


                log.info("优化数据中glassId存在空值-----内容：{}", cutTerritorys);


                return new ArrayList<>();


            } else if (edgMaps.get(cutTerritory.get("glass_id")) != null) {


                cutTerritory.put("glass_state", edgMaps.get(cutTerritory.get("glass_id")).getState());


            } else {


                cutTerritory.put("glass_state", 0);


            }


            ResultcutTerritorys.add(cutTerritory);


        }


        Map<String, List<Map<String, Object>>> groupBy = ResultcutTerritorys.stream().collect(Collectors.groupingBy(item -> item.get("stock_id").toString()));


//        List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());


        return new ArrayList<>(groupBy.values());


//Sql版本


//        return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)


//                .select("ol.width as olwidth","ol.height as olheight")


@@ -229,22 +257,49 @@


        EdgStorageCageDetails outEdgStorageCageDetails = null;




//        if (queryMaxMinDiff(threshold))


            //todo:逻辑1：获取两条线已出最后一块玻璃在笼内相同尺寸所剩数量，优先走数量少的线


            //todo:需要在卧式理片笼详情表中新增状态，用来表示玻璃进出理片笼情况


            if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {


                log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()


                        , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);


                outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()


                        .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)


                        .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())


                        .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())


                        .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)


                        .last("limit 1"));


                log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);


            }


        //todo:逻辑1：获取两条线已出最后一块玻璃在笼内相同尺寸所剩数量，优先走数量少的线


        //todo:需要在卧式理片笼详情表中新增状态，用来表示玻璃进出理片笼情况


        if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {


            log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()


                    , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);


            outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()


                    .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)


                    .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())


                    .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())


                    .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)


                    .last("limit 1"));


            log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);


        }


        if (outEdgStorageCageDetails == null) {


            outEdgStorageCageDetails = minTemperingLayoutId;


        }


        return outEdgStorageCageDetails;


    }




    @Override


    public String identControls(IdentWornRequest request) {


        //将识别破损的玻璃直接加入破损表


        Damage damage = new Damage();


        BeanUtils.copyProperties(request, damage);


        damage.setType(request.getState());


        damage.setRemark("");


        damage.setStatus(0);


        damageService.insertDamage(damage);


        return "success";


    }




    @Override


    public String edgReportStatus(IdentWornRequest request) {


        //将磨边队列破损的玻璃直接加入破损表


        Damage damage = new Damage();


        BeanUtils.copyProperties(request, damage);


        damage.setType(request.getState());


        damage.setRemark("");


        damage.setStatus(0);


        damageService.insertDamage(damage);


        //修改磨边队列数据状态


        edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()


                .set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));


        return "success";


    }


}