卧式理片笼线程改造优化

zhoushihao

2024-05-09 9e97ded305585c0bdc22aef3468dd031567c38a3

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -24,7 +24,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -41,13 +40,13 @@
@Slf4j
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {

    @Resource
    @Autowired
    UpPattenUsageMapper upPattenUsageMapper;

    @Autowired
    OptimizeDetailMapper optimizeDetailMapper;

    @Resource
    @Autowired
    EdgStorageCageMapper edgStorageCageMapper;

    @Autowired
@@ -144,7 +143,6 @@

    /**
     * 查询笼内版图差值范围内的  此尺寸玻璃  如无则按照 钢化版图序号 以及玻璃序号
     *
     * @param glassId
     * @param poor
     * @return
@@ -154,19 +152,70 @@
        //1.去笼内查询此尺寸的玻璃 目前版图差值内的玻璃  是否有同尺寸的
        //1.1 有同尺寸的 则生成同尺寸的任务
        //1.2 无同尺寸的 则生成版图顺序最小的出片
        log.info("按照玻璃id：{}获取玻璃信息", glassId);
        EdgStorageCageDetails edgStorageCageDetails= baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
                .selectAll(EdgStorageCageDetails.class)
                .eq(EdgStorageCageDetails::getGlassId,glassId)
        );
        List<EdgStorageCageDetails> listEdgStorageCageDetails= baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
                .lt(EdgStorageCageDetails::getState,200)
                .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
        );
        EdgStorageCageDetails minTemperingLayoutId=new EdgStorageCageDetails();
        if(!listEdgStorageCageDetails.isEmpty()){
            minTemperingLayoutId=listEdgStorageCageDetails.get(0);
        }
        EdgStorageCageDetails result=new EdgStorageCageDetails();
        if(edgStorageCageDetails!=null&&minTemperingLayoutId!=null){
            result=edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
                    .selectAll(EdgStorageCageDetails.class)
                    .leftJoin(EdgStorageCageDetails.class,on->on
                            .eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
                            .eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
                    .isNotNull(EdgStorageCageDetails::getSlot)
                    .eq(EdgStorageCageDetails::getWidth,edgStorageCageDetails.getWidth())
                    .eq(EdgStorageCageDetails::getHeight,edgStorageCageDetails.getHeight())
                    .ge(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId())
                    .le(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId()+poor)
                    .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
            );
        }

        if (result==null){
            result=edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
                    .selectAll(EdgStorageCageDetails.class)
                    .leftJoin(EdgStorageCageDetails.class,on->on
                            .eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
                            .eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
                    .isNotNull(EdgStorageCageDetails::getSlot)
                    .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
            );
        }
        return result;
    }

    /**
     * 查询笼内版图差值范围内的  此尺寸玻璃  如无则按照 钢化版图序号 以及玻璃序号
     *
     * @param glassId
     * @param poor
     * @return
     */
    @Override
    public EdgStorageCageDetails selectOutGlass(String glassId, int poor) {
        EdgStorageCageDetails oldEdgStorageCageDetails = null;
        if (StringUtils.isNotEmpty(glassId)) {
            oldEdgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
                    .selectAll(EdgStorageCageDetails.class)
                    .eq(EdgStorageCageDetails::getGlassId, glassId));
        }
        log.info("按照玻璃id：{}获取玻璃信息{}", glassId, oldEdgStorageCageDetails);

        LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<TaskCache>().select(TaskCache::getGlassId).eq(TaskCache::getTaskType, "2");
        List<TaskCache> taskCacheList = taskCacheService.list(wrapper);
        List<String> glassIds = taskCacheList.stream().map(TaskCache::getGlassId).collect(Collectors.toList());
        log.info("获取笼内所有已出片的玻璃id信息:{}", glassIds);

        //获取笼内最小版图id及版序为最小的玻璃信息（玻璃id不在任务表中的出片记录中）
        EdgStorageCageDetails minTemperingLayoutId = baseMapper.selectOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
                .eq(EdgStorageCageDetails::getState, 100)
                .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
@@ -177,36 +226,24 @@
                minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);

        EdgStorageCageDetails outEdgStorageCageDetails = null;

        //todo:获取笼子内最大版图id和最小版图id插值，判断是否大于阈值，大于阈值直接出最小版图玻璃
        //todo:逻辑1：获取两条线已出最后一块玻璃在笼内相同尺寸所剩数量，优先走数量少的线
        //todo:逻辑2：优先走空闲的线
        //todo:需要在卧式理片笼详情表中新增状态，用来表示玻璃进出理片笼情况
        if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
            log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()
                    , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + poor);
            outEdgStorageCageDetails = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
                    .selectAll(EdgStorageCageDetails.class)
                    .leftJoin(EdgStorageCageDetails.class, on -> on
                            .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
                            .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
                    .isNotNull(EdgStorageCageDetails::getSlot)
            outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
                    .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
                    .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
                    .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
                    .ge(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId())
                    .le(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId() + poor)
                    .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
                    .last("limit 1")
            );
                    .last("limit 1"));
            log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);
        }

        if (outEdgStorageCageDetails == null) {
            outEdgStorageCageDetails = minTemperingLayoutId;
//            outEdgStorageCageDetails = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
//                    .selectAll(EdgStorageCageDetails.class)
//                    .leftJoin(EdgStorageCageDetails.class, on -> on
//                            .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
//                            .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
//                    .isNotNull(EdgStorageCageDetails::getSlot)
//                    .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
//                    .last("limit 1")
//            );
        }
        return outEdgStorageCageDetails;
    }