Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java

@@ -28,8 +28,16 @@

    @Test
    public void testFindPa() {
        List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12);
        log.info("进炉中的玻璃：{}", Arrays.asList(glass));
        List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
        if(!layoutId.isEmpty()) {
            List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
            log.info("已出中的玻璃：{}", Arrays.asList(intoGlass));
            //进炉中的第二个版图
            if (layoutId.size() > 1) {
                List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
                log.info("已出中的玻璃：{}", Arrays.asList(intoGlass2));
            }
        }
    }
    @Test
    public void testFindPa2() {
@@ -46,15 +54,5 @@
    public void testFindPa4() {
        List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
        log.info("钢化后的玻璃：{}", Arrays.asList(glass));
    }
    @Test
    public void testFindPa5() {
        List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
        //进炉中的玻璃
        log.info("版图id：{}", Arrays.asList(layoutId.get(0).getTemperingLayoutId()));
        List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
        log.info("玻璃版图id：{}", Arrays.asList(intoGlass));
        List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
        log.info("玻璃版图id：{}", Arrays.asList(intoGlass2));
    }
}