#

luxiaotao1123

2020-08-20 5b17b77e1eec4980eeb06d6b3bdbde4d1ce190ca

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

@@ -99,7 +99,7 @@
                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                }
            } else {
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
            }
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setWarn(""); //  报警 todo
@@ -141,7 +141,7 @@
                    vo.setLocNo(wrkMast.getLocNo());    //  目标库位
                }
            } else {
                vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
                vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
            }
            list.add(vo);

@@ -155,11 +155,10 @@
        StringBuilder str = new StringBuilder();
        String s;
        int i = 0;
        while( (s = OutputQueue.CRN.poll()) != null && i <=10) {
        while((s = OutputQueue.CRN.poll()) != null && i <=10) {
            str.append("\n").append(s);
            i++;
        }
//        str = new StringBuilder("\n" + new Date().toLocaleString() + "【2020-5-29 13:14:22】扫描plcA 目标站--273283723728327636432343234323422732837237283276364323432343234227328372372832763643234323432342");
        return R.ok().add(str.toString());
    }