pang.jiabao
2025-05-10 8f4904e6e0ca9635eb216760fd1746a4ea7fb7c0
wcs堆垛机移动动画
2个文件已修改
29 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/ConsoleController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/realtimeWatch/console.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -148,7 +148,7 @@
//            Short totalBay = locMastMapper.selectTotalBay();
            vo.setOffset((double) new Random().nextInt(560));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  当前列
            vo.setBay(crnProtocol.getBay());    //  当前列
            /**
             * 堆垛机状态判断
             */
@@ -156,9 +156,10 @@
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
//                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
                    if (taskWrk != null) {
                        vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
                    } else {
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
                    }
src/main/webapp/views/realtimeWatch/console.html
@@ -635,19 +635,25 @@
                    for (var i = 0; i < crns.length; i++) {
                        var crnEl = $("#crn-" + crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
                        if (crns[i].bay < 0) {
                            crns[i].bay = 1;
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 1;
                        var offSet = 800;
                        // crns[i].bay = 41;
                        if (crns[i].crnId === 1) {
                            let unit = 111
                            let offSet = 600;
                        if(crns[i].bay === 1){
                            crnEl.animate({left: offSet + 'px'}, 1000);
                        } else {
                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                                crnEl.animate({left: (offSet + unit*(crns[i].bay-1)) + 'px'}, 1000);
                            }
                        } else {
                            let unit = 83
                            let offSet = 600;
                            if(crns[i].bay === 1){
                                crnEl.animate({left: offSet + 'px'}, 1000);
                            } else {
                                crnEl.animate({left: (offSet + unit*(crns[i].bay -1)) + 'px'}, 1000);
                            }
                        }
                    }