Merge branch 'master' of http://10.153.19.25:10105/r/HangZhouMes

wangfei

2024-12-30 e08f1e0b40dd9aeb349e86534ffe2d83ddc42552

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java

@@ -11,6 +11,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
@@ -23,6 +24,8 @@
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.job.PlcSlicecage;
import com.mes.job.PlcStorageCageTask;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
@@ -44,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Author : zhoush
@@ -67,6 +71,8 @@
    EdgGlassTaskInfoService edgGlassTaskInfoService;
    @Autowired
    BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
    @Autowired
    GlassInfoService glassInfoService;


//    @Autowired
@@ -214,7 +220,7 @@

    @Test
    public void testttt() {
        List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6);
        List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6, 1);
        List<Integer> deviceUseds = deviceUsedList;
        List<BigStorageCageDetails> engineerCount1 = bigStorageCageDetailsService.list(
                new LambdaQueryWrapper<BigStorageCageDetails>()
@@ -262,6 +268,7 @@

    @Resource
    TemperingGlassInfoService temperingGlassInfoService;

    @Test
    public void computeOutMoreGlassInfo() {
        List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
@@ -270,17 +277,45 @@
                .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
                .isNull(BigStorageCageOutTask::getGlassId)
                .orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
        plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfoList,true,1);
        plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfoList, true, 1);
    }

    @Test
    public void ca111() {
        List<Integer> slotList = new ArrayList<>(Arrays.asList(62));  // 注意 null 元素
        Set<Integer> remainSlotList = new HashSet<>(Arrays.asList(62));
//        GlassInfo glassInfo=glassInfoService.getOne(
//                new LambdaQueryWrapper<GlassInfo>()
//                .eq(GlassInfo::getGlassId,"P24121602|1|10")
//        );
//        bigStorageCageDetailsService.queryTargetSlotByTempering(glassInfo);
        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
                new LambdaQueryWrapper<BigStorageCageDetails>()
                        .eq(BigStorageCageDetails::getState, 100)
                        .in(BigStorageCageDetails::getGlassId, "P24122201|1|1", "P24122201|2|3")
        );
        List<BigStorageCageDetails> overSizeGlass = bigStorageCageDetailsList.stream().filter(
                t -> Math.min(t.getWidth(), t.getHeight()) > 2500
        ).collect(Collectors.toList());
        log.info("sadfd" + overSizeGlass);
//        bigStorageCageDetailsService.queryTargetSlotByTempering(glassInfo);
//        List<String> glassIdsCar=new ArrayList<>();
//        glassIdsCar.add("P24120801|4|3");
//        List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
//                new LambdaQueryWrapper<BigStorageCageFeedTask>()
//                        .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
//                        .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
//                        .eq(BigStorageCageFeedTask::getTargetSlot, 0)
//        );
//        if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)){
//            log.info("获取到的进片任务信息{}", bigStorageCageFeedTasks);
//            plcStorageCageTask.computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
//        }
//        plcStorageCageTask.queryAndChangeGlass("P24111102|1|6");
//        bigStorageCageDetailsService.selectFeedTask();
//        plcStorageCageTask.computeSlot("P24121401|1|6");
//        plcStorageCageTask.computeSlot("P24121401|1|4");

        slotList.removeAll(remainSlotList);
        log.info("1");
//        plcStorageCageTask.computeSlot("P24111102|1|1");
//        List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
//        log.info("sd"+temperingOccupySlotList);
    }

    @Test