#

luxiaotao1123

2022-01-06 1e9c546bb09141c75559f0850a254d6f1d538005

#

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

@@ -26,7 +26,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
@@ -118,36 +117,20 @@
                continue;
            }
            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
//            if (crnProtocol.getTaskNo()>0) {
//                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
//                if (wrkMast != null) {
//                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
//                }
//            } else {
//
//            }
            vo.setStatusType(crnProtocol.modeType.desc);   //  模式状态
            if (crnProtocol.statusType == com.zy.core.enums.CrnStatusType.WAITING) {
                vo.setStatus("等待确认");
            } else {
                vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            }
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setLoading(crnProtocol.getLoaded()==1?"有物":"无物");  //  有物
            vo.setBay(crnProtocol.getBay());    //  列
            vo.setLev(crnProtocol.getLevel());  //  层
            vo.setLiftPos(crnProtocol.getLiftPosType().desc);

            vo.setForkOffset(crnProtocol.getForkPosType().desc);    // 货叉位置
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
            vo.setLiftPos(crnProtocol.getLiftPosType().desc);
            vo.setWalkPos(crnProtocol.getWalkPos()==1?"不在定位":"在定位");
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
            if (crnProtocol.getAlarm() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                vo.setAlarm1(crnError==null?"未知异常":crnError.getErrName());
                vo.setAlarm(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);
    }

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

@@ -29,23 +29,14 @@
    // 升降原点
    private String yOrigin = "-";

    // 伸位高低
    private String liftPos = "-";

    // 站台高低
    private String sitePos = "-";

    // 走行定位
    private String xLocation = "-";

    // 升降定位
    private String yLocation = "-";

    // 货叉位置
    private String forkOffset = "-";

//    // 载货台位置
//    private String liftPos = "-";
    // 载货台位置
    private String liftPos = "-";

    // 走行定位
    private String walkPos = "-";

    // 急停
    private String stop = "-";
@@ -69,15 +60,6 @@
    private String warnCode = "-";

    // 垂直故障码
    private String alarm1 = "-";

    // 水平故障码
    private String alarm2 = "-";

    // 叉牙故障码
    private String alarm3 = "-";

    // 状态故障码
    private String alarm4 = "-";
    private String alarm = "-";

}

 src/main/webapp/views/crn.html

@@ -90,13 +90,11 @@
                    <th>有物</th>
                    <th>列</th>
                    <th>层</th>
                    <th>伸位高低</th>
                    <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>
@@ -310,13 +308,11 @@
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        setVal(tr.children("td").eq(4), table[i-1].bay);
                        setVal(tr.children("td").eq(5), table[i-1].lev);
                        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].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);
                        setVal(tr.children("td").eq(6), table[i-1].forkOffset);
                        setVal(tr.children("td").eq(7), table[i-1].liftPos);
                        setVal(tr.children("td").eq(8), table[i-1].walkPos);
                        setVal(tr.children("td").eq(9), table[i-1].warnCode);
                        setVal(tr.children("td").eq(10), table[i-1].alarm);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -512,8 +508,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" +
                "       <td></td>\n" +