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

@@ -47,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Author : zhoush
@@ -219,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>()
@@ -267,6 +268,7 @@

    @Resource
    TemperingGlassInfoService temperingGlassInfoService;

    @Test
    public void computeOutMoreGlassInfo() {
        List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
@@ -275,15 +277,25 @@
                .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() {
//        GlassInfo glassInfo=glassInfoService.getOne(
//                new LambdaQueryWrapper<GlassInfo>()
//                .eq(GlassInfo::getGlassId,"P24120801|1|2")
//                .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");
@@ -302,8 +314,8 @@
//        plcStorageCageTask.computeSlot("P24121401|1|6");
//        plcStorageCageTask.computeSlot("P24121401|1|4");

        List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
        log.info("sd"+temperingOccupySlotList);
//        List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
//        log.info("sd"+temperingOccupySlotList);
    }

    @Test