pjb
7 天以前 28e725ba052ad2a43d154a2be54c837009be92de
src/main/java/com/zy/controller/ConsoleController.java
@@ -141,8 +141,8 @@
//            Short totalBay = locMastMapper.selectTotalBay();
            vo.setOffset((double) new Random().nextInt(560));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  当前列
            vo.setOffset((double) new Random().nextInt(500));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay()));    //  当前列
            /**
             * 堆垛机状态判断
             */
@@ -152,7 +152,7 @@
                if (crnProtocol.getTaskNo()>0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.process(wrkMast.getIoType()) : CrnStatusType.MACHINE_UN_AUTO);
                    } else {
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
                    }