Merge remote-tracking branch 'origin/master'

wangfei

2025-04-21 09402133807b1e774e658a13ad365b2e6efca25b

 hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java

@@ -2,14 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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;
@@ -49,12 +45,12 @@

    @Autowired
    TaskCacheServiceImpl taskCacheServiceImpl;
    @Autowired
    @Resource
    OptimizeDetailMapper optimizeDetailMapper;
    @Autowired
    GlassInfoService glassInfoService;
    @Autowired
    CacheGlassTask cacheGlassTask;
//    @Autowired
//    CacheGlassTask cacheGlassTask;

    @Autowired
    TaskCacheService taskCacheService;
@@ -65,43 +61,30 @@
        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
//    public void queryChangeGlassInfo() {
//        cacheGlassTask.queryChangeGlassInfo(Const.A10_OUT_TARGET_POSITION, "");
//    }
//
//    @Test
//    public void testChangeCellSize() {
//        cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
//    }
//
//    @Test
//    public void testCellSize() {
//        cacheGlassTask.outTo(0, 0, "", "NG24051802A001|1|1|1|1", 0);
//    }
//
//    @Test
//    public void testinTo() {
//        cacheGlassTask.inTo("NG24051802A001|1|1|2|1", "1", "1");
//    }
//
//    @Test
//    public void testChangeGlassInfo() {
//        cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|1|1|1");
//    }

    @Test
    public void testSqlServer() {
@@ -118,34 +101,28 @@
    }


    @Test
    public void testCacheGlass() {
        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();
        log.info("切割当前版图信息：{}", Arrays.asList(map));
    public void testEngineerTerritory() {
        List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
        log.info("钢化工程版图信息：{}", Arrays.asList(map));
    }

    @Test
    public void testidentWorn() {
        Map<String, String> arguments=new HashMap<>();
        arguments.put("glassId","P24060403|3|6");//玻璃ID
        arguments.put("controlsId","300");        //拿走：200/破损：201
        arguments.put("line","2001");             //线路：
        arguments.put("machine","冷加工");           //设备名称：
        edgStorageCageDetailsService.identWorn(arguments);
        Map<String, Object> arguments=new HashMap<>();
        arguments.put("glassId","NG24051802A002-1-4-2-4");//玻璃ID
        arguments.put("state","8");        //拿走：200/破损：201
        arguments.put("line","1001");             //线路：
        arguments.put("workingProcedure","识别");           //设备名称：
//        edgStorageCageDetailsService.identWorn(arguments);
        log.info("识别台【破损/拿走】：{}", 1);
    }
    @Test
    public void testInToVerify() {
        boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1");
        log.info("是否存在重复ID 》允许进片：{}", result);
    }

    @Test
    public void testPpOptimizeDetail() {