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

wu

2024-08-16 5985a3693d4d902455b9fd46b052362417b044d7

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

@@ -138,7 +138,7 @@

    @Test
    public void testEngineerCutTerritory() {
        List<Map<String, Object>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806");
        List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806");
        log.info("切割工程版图信息：{}", Arrays.asList(map));
    }

@@ -149,7 +149,7 @@
        arguments.put("controlsId","300");        //拿走：200/破损：201
        arguments.put("line","2001");             //线路：
        arguments.put("machine","冷加工");           //设备名称：
        edgStorageCageDetailsService.identWorn(arguments);
//        edgStorageCageDetailsService.identWorn(arguments);
        log.info("识别台【破损/拿走】：{}", 1);
    }