#

luxiaotao1123

2020-08-20 5b17b77e1eec4980eeb06d6b3bdbde4d1ce190ca

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -126,10 +126,10 @@
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType()));
                    vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
                }
            } else {
                vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);
                vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
            }
            vos.add(vo);