#

luxiaotao1123

2020-08-20 55a6266e7898db009b0790bf034020a4dcf4d790

#

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

@@ -9,7 +9,9 @@
import com.zy.asrs.domain.vo.CommandLogVo;
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -45,6 +47,9 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;


    @ManagerAuth(memo = "进行中的命令")
    @PostMapping("/command/ongoing")
@@ -108,6 +113,7 @@
            vo.setLev(crnProtocol.getLevel());  //  层
            vo.setForkOffset(crnProtocol.getForkPosType().desc);    //  货叉位置
            vo.setLiftPos(crnProtocol.getLiftPosType().desc);   //  载货台位置
            vo.setWorkNo(crnProtocol.getAlarm1());  //  异常码
            list.add(vo);
        }
        return R.ok().add(list);
@@ -131,6 +137,10 @@
            CrnMsgTableVo vo = new CrnMsgTableVo();
            vo.setCrnNo(crn.getId());   //  堆垛机号
            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
            if (null != crnError) {
                vo.setError(crnError.getErrorCode() + crnError.getErrName());
            }
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
@@ -344,10 +354,10 @@
                    throw new CoolException("堆垛机不在线");
                }
                // 只有出现指定异常才进行复位
                if (crnProtocol.getCrnError2().leftTakeNoneErr
                        || crnProtocol.getCrnError2().rightTakeNoneErr
                        || crnProtocol.getCrnError2().leftPutLoadErr
                        || crnProtocol.getCrnError2().rightPutLoadErr) {
                if (crnProtocol.getCrnError3().leftTakeNoneErr
                        || crnProtocol.getCrnError3().rightTakeNoneErr
                        || crnProtocol.getCrnError3().leftTakeThenLoadErr
                        || crnProtocol.getCrnError3().rightTakeThenLoadErr) {
                    CrnCommand command = new CrnCommand();
                    command.setCrnNo(param.getCrnNo()); // 堆垛机编号
                    command.setAckFinish((short) 1);  // 任务完成确认位

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

@@ -47,7 +47,7 @@
    // 状态
    private String status;

    // 报警码
    // 异常码
    private String warnCode;



 src/main/webapp/views/crn.html

@@ -48,6 +48,7 @@
                    <th>层</th>
                    <th>货叉位置</th>
                    <th>载货台位置</th>
                    <th>异常码</th>
                </tr>
            </thead>
            <tbody>
@@ -67,6 +68,7 @@
                <th>目标站</th>
                <th>源库位</th>
                <th>目标库位</th>
                <th>异常</th>
            </tr>
        </thead>
        <tbody>
@@ -254,6 +256,7 @@
                        setVal(tr.children("td").eq(7), table[i-1].lev);
                        setVal(tr.children("td").eq(8), table[i-1].forkOffset);
                        setVal(tr.children("td").eq(9), table[i-1].liftPos);
                        setVal(tr.children("td").eq(10), table[i-1].warnCode);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -287,6 +290,7 @@
                        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(6), table[i-1].error);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -452,6 +456,7 @@
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "     </tr>\n";
        }
        $('#crn-state-table tbody').after(html);
@@ -480,6 +485,7 @@
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "       <td></td>\n" +
                "     </tr>\n";
        }
        $('#crn-msg-table tbody').after(html);