luxiaotao1123
2021-01-16 433040dfff973bc8e502a00b2f1bee2e929fdf70
#堆垛机异常
4个文件已修改
163 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/CrnController.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/crn.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/CrnController.java
@@ -142,17 +142,29 @@
            if (crnProtocol.getPlatformLow()) {
                vo.setSitePos("站台高位");
            }
//            vo.setXOrigin(crnProtocol.getBay()==1?"是":"否");     //  走行原点
//            vo.setYOrigin(crnProtocol.getLevel()==1?"是":"否");     // 升降原点
            vo.setForkOffset(crnProtocol.getForkPosType().desc);    // 货叉位置
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
//            vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"是":"否");       //  急停
            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()));  //  异常码
            if (crnProtocol.getAlarm1() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                vo.setAlarm1(crnError==null?"未知异常":crnError.getErrName());
            }
            if (crnProtocol.getAlarm2() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm2());
                vo.setAlarm2(crnError==null?"未知异常":crnError.getErrName());
            }
            if (crnProtocol.getAlarm3() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm3());
                vo.setAlarm3(crnError==null?"未知异常":crnError.getErrName());
            }
            if (crnProtocol.getAlarm4() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm4());
                vo.setAlarm4(crnError==null?"未知异常":crnError.getErrName());
            }
//            vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
//            vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
//            vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
//            vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
        }
        return R.ok().add(list);
@@ -179,10 +191,6 @@
            }
            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
            if (null != crnError) {
                vo.setError(crnError.getErrName());
            }
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -69,15 +69,15 @@
    private String warnCode = "-";
    // 垂直故障码
    private String alarm1;
    private String alarm1 = "-";
    // 水平故障码
    private String alarm2;
    private String alarm2 = "-";
    // 叉牙故障码
    private String alarm3;
    private String alarm3 = "-";
    // 状态故障码
    private String alarm4;
    private String alarm4 = "-";
}
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -130,10 +130,100 @@
            crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18));   // 20
            crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20));  // 22
            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28));    // 30
            crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32));    // 34
            crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36));    // 38
            crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40));    // 42
            // 异常
            boolean[] err1 = siemensNet.getByteTransform().TransBool(result.Content, 28, 1);    // 30
            if (err1[0]) { crnProtocol.setAlarm1(1); }
            if (err1[1]) { crnProtocol.setAlarm1(2); }
            if (err1[2]) { crnProtocol.setAlarm1(3); }
            boolean[] err2 = siemensNet.getByteTransform().TransBool(result.Content, 29, 1);    // 31
            if (err2[0]) { crnProtocol.setAlarm1(4); }
            if (err2[1]) { crnProtocol.setAlarm1(5); }
            if (err2[2]) { crnProtocol.setAlarm1(6); }
            boolean[] err3 = siemensNet.getByteTransform().TransBool(result.Content, 30, 1);    // 32
            if (err3[6]) { crnProtocol.setAlarm1(7); }
            if (err3[7]) { crnProtocol.setAlarm1(8); }
            boolean[] err4 = siemensNet.getByteTransform().TransBool(result.Content, 31, 1);    // 33
            if (err4[1]) { crnProtocol.setAlarm1(9); }
            if (err4[5]) { crnProtocol.setAlarm1(10); }
            if (err4[6]) { crnProtocol.setAlarm1(11); }
            if (err4[7]) { crnProtocol.setAlarm1(12); }
            boolean[] err5 = siemensNet.getByteTransform().TransBool(result.Content, 32, 1);    // 34
            if (err5[0]) { crnProtocol.setAlarm2(13); }
            if (err5[2]) { crnProtocol.setAlarm2(14); }
            if (err5[3]) { crnProtocol.setAlarm2(15); }
            if (err5[5]) { crnProtocol.setAlarm2(16); }
            if (err5[6]) { crnProtocol.setAlarm2(17); }
            if (err5[7]) { crnProtocol.setAlarm2(18); }
            boolean[] err6 = siemensNet.getByteTransform().TransBool(result.Content, 33, 1);    // 35
            if (err6[1]) { crnProtocol.setAlarm2(19); }
            if (err6[2]) { crnProtocol.setAlarm2(20); }
            if (err6[3]) { crnProtocol.setAlarm2(21); }
            if (err6[4]) { crnProtocol.setAlarm2(22); }
            boolean[] err7 = siemensNet.getByteTransform().TransBool(result.Content, 34, 1);    // 36
            if (err7[4]) { crnProtocol.setAlarm2(23); }
            if (err7[5]) { crnProtocol.setAlarm2(24); }
            if (err7[6]) { crnProtocol.setAlarm2(25); }
            boolean[] err8 = siemensNet.getByteTransform().TransBool(result.Content, 36, 1);    // 38
            if (err8[0]) { crnProtocol.setAlarm3(26); }
            if (err8[1]) { crnProtocol.setAlarm3(27); }
            if (err8[2]) { crnProtocol.setAlarm3(28); }
            if (err8[3]) { crnProtocol.setAlarm3(29); }
            if (err8[4]) { crnProtocol.setAlarm3(30); }
            if (err8[5]) { crnProtocol.setAlarm3(31); }
            if (err8[6]) { crnProtocol.setAlarm3(32); }
            if (err8[7]) { crnProtocol.setAlarm3(33); }
            boolean[] err9 = siemensNet.getByteTransform().TransBool(result.Content, 37, 1);    // 39
            if (err9[0]) { crnProtocol.setAlarm3(34); }
            if (err9[1]) { crnProtocol.setAlarm3(35); }
            if (err9[2]) { crnProtocol.setAlarm3(36); }
            if (err9[3]) { crnProtocol.setAlarm3(37); }
            if (err9[4]) { crnProtocol.setAlarm3(38); }
            if (err9[5]) { crnProtocol.setAlarm3(39); }
            if (err9[6]) { crnProtocol.setAlarm3(40); }
            if (err9[7]) { crnProtocol.setAlarm3(41); }
            boolean[] err10 = siemensNet.getByteTransform().TransBool(result.Content, 38, 1);    // 40
            if (err10[0]) { crnProtocol.setAlarm3(42); }
            if (err10[1]) { crnProtocol.setAlarm3(43); }
            if (err10[2]) { crnProtocol.setAlarm3(44); }
            if (err10[3]) { crnProtocol.setAlarm3(45); }
            if (err10[4]) { crnProtocol.setAlarm3(46); }
            boolean[] err11 = siemensNet.getByteTransform().TransBool(result.Content, 39, 1);    // 41
            if (err11[0]) { crnProtocol.setAlarm3(47); }
            if (err11[1]) { crnProtocol.setAlarm3(48); }
            if (err11[2]) { crnProtocol.setAlarm3(49); }
            boolean[] err12 = siemensNet.getByteTransform().TransBool(result.Content, 40, 1);    // 42
            if (err12[0]) { crnProtocol.setAlarm4(50); }
            if (err12[1]) { crnProtocol.setAlarm4(51); }
            if (err12[2]) { crnProtocol.setAlarm4(52); }
            if (err12[3]) { crnProtocol.setAlarm4(53); }
            if (err12[4]) { crnProtocol.setAlarm4(54); }
            if (err12[5]) { crnProtocol.setAlarm4(55); }
            boolean[] err13 = siemensNet.getByteTransform().TransBool(result.Content, 41, 1);    // 43
            if (err13[0]) { crnProtocol.setAlarm4(56); }
            if (err13[1]) { crnProtocol.setAlarm4(57); }
            if (err13[2]) { crnProtocol.setAlarm4(58); }
            if (err13[3]) { crnProtocol.setAlarm4(59); }
            boolean[] err14 = siemensNet.getByteTransform().TransBool(result.Content, 42, 1);    // 44
            if (err14[0]) { crnProtocol.setAlarm4(60); }
            if (err14[1]) { crnProtocol.setAlarm4(61); }
            if (err14[2]) { crnProtocol.setAlarm4(62); }
            if (err14[3]) { crnProtocol.setAlarm4(63); }
            if (err14[4]) { crnProtocol.setAlarm4(64); }
            if (err14[5]) { crnProtocol.setAlarm4(65); }
            if (err14[6]) { crnProtocol.setAlarm4(66); }
            if (err14[7]) { crnProtocol.setAlarm4(67); }
            boolean[] err15 = siemensNet.getByteTransform().TransBool(result.Content, 43, 1);    // 45
            if (err15[1]) { crnProtocol.setAlarm4(68); }
            if (err15[2]) { crnProtocol.setAlarm4(69); }
            if (err15[3]) { crnProtocol.setAlarm4(70); }
            if (err15[4]) { crnProtocol.setAlarm4(71); }
            if (err15[5]) { crnProtocol.setAlarm4(72); }
            if (err15[6]) { crnProtocol.setAlarm4(73); }
//            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt32(result.Content, 28));    // 30
//            crnProtocol.setAlarm2(siemensNet.getByteTransform().TransInt32(result.Content, 32));    // 34
//            crnProtocol.setAlarm3(siemensNet.getByteTransform().TransInt32(result.Content, 36));    // 38
//            crnProtocol.setAlarm4(siemensNet.getByteTransform().TransInt32(result.Content, 40));    // 42
            boolean[] bool1 = siemensNet.getByteTransform().TransBool(result.Content, 60, 1);    // 62
            crnProtocol.setConnStatus(bool1[0]);
src/main/webapp/views/crn.html
@@ -75,10 +75,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>
@@ -98,7 +98,6 @@
                <th>目标站</th>
                <th>源库位</th>
                <th>目标库位</th>
                <th>异常</th>
                <th>走行速度(m/min)</th>
                <th>升降速度(m/min)</th>
                <th>叉牙速度(m/min)</th>
@@ -330,14 +329,13 @@
                        setVal(tr.children("td").eq(4), table[i-1].staNo);
                        setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
                        setVal(tr.children("td").eq(6), table[i-1].locNo);
                        setVal(tr.children("td").eq(7), table[i-1].error);
                        setVal(tr.children("td").eq(8), table[i-1].xspeed);
                        setVal(tr.children("td").eq(9), table[i-1].yspeed);
                        setVal(tr.children("td").eq(10), table[i-1].zspeed);
                        setVal(tr.children("td").eq(11), table[i-1].xdistance);
                        setVal(tr.children("td").eq(12), table[i-1].ydistance);
                        setVal(tr.children("td").eq(13), table[i-1].xduration);
                        setVal(tr.children("td").eq(14), table[i-1].yduration);
                        setVal(tr.children("td").eq(7), table[i-1].xspeed);
                        setVal(tr.children("td").eq(8), table[i-1].yspeed);
                        setVal(tr.children("td").eq(9), table[i-1].zspeed);
                        setVal(tr.children("td").eq(10), table[i-1].xdistance);
                        setVal(tr.children("td").eq(11), table[i-1].ydistance);
                        setVal(tr.children("td").eq(12), table[i-1].xduration);
                        setVal(tr.children("td").eq(13), table[i-1].yduration);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -527,7 +525,6 @@
        var html = "";
        for (var i = 0; i < line; i ++){
            html += " <tr>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +