*

lsh

2025-04-03 c4ceb834b1bbd302c59bd0e783a878c5831a1a55

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

@@ -147,7 +147,7 @@
            /**
             * 堆垛机状态判断
             */
            if (crnProtocol.getAlarm1() > 0) {
            if (crnProtocol.getAlarm() > 0) {
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo()>0) {
@@ -324,8 +324,8 @@
                vo.setWorkNo(crnProtocol.getTaskNo());
                vo.setCrnStatus(crnProtocol.getStatusType().desc);

                if (crnProtocol.getAlarm1() > 0) {
                    BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                if (crnProtocol.getAlarm() > 0) {
                    BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                    vo.setError(crnError == null ? "未知异常" : crnError.getErrName());
                }