zhoushihao
2024-06-13 2b08f709d68c6b3a162bfd4c80f15e826ca4e578
大理片笼问题修复
卧式缓存测试类
3个文件已修改
60 ■■■■ 已修改文件
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -1,16 +1,15 @@
package com.mes;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.mes.common.config.Const;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.job.CacheGlassTask;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.entity.OptimizeLayout;
import com.mes.pp.mapper.OptimizeDetailMapper;
@@ -24,6 +23,7 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -35,15 +35,14 @@
 */
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CacheGlassModuleApplication.class)
@SpringBootTest(classes = CacheGlassModuleApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class CacheGlassModuleApplicationTest {
    @Autowired
    EdgStorageCageService edgStorageCageService;
    @Autowired
    EdgStorageCageDetailsService edgStorageCageDetailsService;
    @Autowired
    @Resource
    TaskCacheMapper taskCacheMapper;
    @Autowired
@@ -52,11 +51,51 @@
    OptimizeDetailMapper optimizeDetailMapper;
    @Autowired
    GlassInfoService glassInfoService;
    @Autowired
    CacheGlassTask cacheGlassTask;
    @Test
    public void testFindPath() {
        String url=getClass().getResource("").getPath();
        log.info("完整路径:{}", Arrays.asList(url));
    }
    @Test
    public void queryChangeGlassInfo() {
        cacheGlassTask.queryChangeGlassInfo(Const.A10_OUT_TARGET_POSITION, "");
    }
    @Test
    public void testChangeCellSize() {
//        String url=getClass().getResource("").getPath();
//        log.info("完整路径:{}", Arrays.asList(url));
        cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
    }
    @Test
    public void testCellSize() {
//        String url=getClass().getResource("").getPath();
//        log.info("完整路径:{}", Arrays.asList(url));
        cacheGlassTask.outTo(0, 0, "", "NG24051802A001|1|1|1|1", 0);
    }
    @Test
    public void testinTo() {
//        String url=getClass().getResource("").getPath();
//        log.info("完整路径:{}", Arrays.asList(url));
//        NG24051802A001|1|4|1|4
//        cacheGlassTask.inTo("NG24051802A001|1|1|1|1", "1", "1");
//        cacheGlassTask.inTo("NG24051802A001|1|4|1|4", "1", "1");
        cacheGlassTask.inTo("NG24051802A001|1|1|2|1", "1", "1");
    }
    @Test
    public void testChangeGlassInfo() {
//        String url=getClass().getResource("").getPath();
//        log.info("完整路径:{}", Arrays.asList(url));
//        NG24051802A001|1|4|1|4
        cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|1|1|1");
//        cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|4|1|4");
    }
    @Test
@@ -84,11 +123,13 @@
        List<Map<String, Object>> map= edgStorageCageService.selectEdgStorageCages();
        log.info("笼内信息:{}", Arrays.asList(map));
    }
    @Test
    public void testSelectCacheEmpty() {
        List<EdgStorageCage> map= edgStorageCageService.selectCacheEmpty();
        log.info("笼内空格:{}", Arrays.asList(map));
    }
    @Test
    public void testScan() {
        List<Map<String, Object>> map= edgStorageCageDetailsService.selectCutTerritory();
@@ -104,6 +145,7 @@
        log.info("切割当前版图信息:{}", Arrays.asList(optimizeDetail));
    }
    @Test
    public void testOptimizeDetail() {
        List<Map<String, Object>> map2=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -222,7 +222,7 @@
//                .last("limit 1");
        BigStorageDTO bigStorageDTO = null;
        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
                .selectAll(BigStorageDTO.class)
                .selectAsClass(BigStorageCage.class, BigStorageDTO.class)
                .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
                .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
                .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
@@ -245,7 +245,7 @@
        bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
                .eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
                .last("limit 1"));
        Assert.isTrue(null == bigStorageCage, "没有空余的笼子存放玻璃");
        Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
        bigStorageDTO = new BigStorageDTO();
        bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
        bigStorageDTO.setSlot(bigStorageCage.getSlot());
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
@@ -42,7 +42,7 @@
     * 目标位置
     */
    @ApiModelProperty(value = "目标位置", position = 4)
    private Integer tragetSlot;
    private Integer targetSlot;
    /**
     * 玻璃类型