#

luxiaotao1123

2021-01-11 8e120d28b0c2c95c7bdc4b8c33a96e0eb875291a

#

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

@@ -140,7 +140,11 @@
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
//            vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"是":"否");       //  急停
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码
            vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
            vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
            vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
            vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
//            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码

        }
        return R.ok().add(list);

 src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java

@@ -68,4 +68,16 @@
    // 异常码
    private String warnCode = "-";

    // 垂直故障码
    private String alarm1;

    // 水平故障码
    private String alarm2;

    // 叉牙故障码
    private String alarm3;

    // 状态故障码
    private String alarm4;

}

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -223,22 +223,22 @@
    /**
     * 堆垛机垂直故障代码（数值显示）
     */
    private Integer alarm1;
    private Integer alarm1 = 0;

    /**
     * 堆垛机水平故障代码（数值显示）
     */
    private Integer alarm2;
    private Integer alarm2 = 0;;

    /**
     * 堆垛机货叉故障代码（数值显示）
     */
    private Integer alarm3;
    private Integer alarm3 = 0;;

    /**
     * 堆垛机状态故障代码（数值显示）
     */
    private Integer alarm4;
    private Integer alarm4 = 0;;

    /**
     * 异常1

 src/main/webapp/views/crn.html

@@ -73,10 +73,10 @@
                    <th>伸位高低</th>
                    <th>站台高低</th>
                    <th>货叉位置</th>
                    <th>走行定位</th>
                    <th>升降定位</th>
                    <th>急停</th>
                    <th>异常码</th>
                    <th>垂直故障码</th>
                    <th>水平故障码</th>
                    <th>叉牙故障码</th>
                    <th>状态故障码</th>
                </tr>
            </thead>
            <tbody>
@@ -290,10 +290,10 @@
                        setVal(tr.children("td").eq(6), table[i-1].liftPos);
                        setVal(tr.children("td").eq(7), table[i-1].sitePos);
                        setVal(tr.children("td").eq(8), table[i-1].forkOffset);
                        setVal(tr.children("td").eq(9), table[i-1].xlocation);
                        setVal(tr.children("td").eq(10), table[i-1].ylocation);
                        setVal(tr.children("td").eq(11), table[i-1].stop);
                        setVal(tr.children("td").eq(12), table[i-1].warnCode);
                        setVal(tr.children("td").eq(9), table[i-1].alarm1);
                        setVal(tr.children("td").eq(10), table[i-1].alarm2);
                        setVal(tr.children("td").eq(11), table[i-1].alarm3);
                        setVal(tr.children("td").eq(12), table[i-1].alarm4);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";