#

zjj

2024-03-29 a55e3a5cff9cf3d2067c4ba3668c1331f28b7ca0

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

@@ -107,6 +107,15 @@
        return rgvControl2(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "取消急停")
    @PostMapping("/operator/noStop")
    public R rgvNoStop(RgvOperatorParam param){
        RgvCommand command = new RgvCommand();
        command.setRgvNo(param.getRgvNo()); // 堆垛机编号
        command.setNoStop(true);
        return rgvControl2(command)?R.ok():R.error();
    }

    private boolean rgvControl2(RgvCommand command){
        if (command.getRgvNo() == null) {
            throw new CoolException("请选择RGV");
@@ -159,17 +168,12 @@
            vo.setStatusType(rgvProtocol.modeType.desc);   //  模式状态
            vo.setStatus(rgvProtocol.getStatusType().desc);     //  状态
            vo.setWorkNo1(rgvProtocol.getTaskNo1());  //  工位1任务号
            vo.setStatus1(rgvProtocol.getStatusType1().desc);  // 工位1状态
            vo.setLoading1(rgvProtocol.getLoaded1()==1?"有物":"无物");  // 工位1有物
            vo.setRgvPos(rgvProtocol.getRgvPos());
            vo.setRgvPos1(rgvProtocol.getRgvPosI());
            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"在定位":"不在定位");
            vo.setPakMk(rgvThread.isPakMk()?"无锁":"锁定");
//            vo.setWorkNo2(rgvProtocol.getTaskNo2());  //  工位2任务号
//            vo.setStatus2(rgvProtocol.getStatusType2().desc);  // 工位2状态
//            vo.setLoading2(rgvProtocol.getLoaded2()==1?"有物":"无物");  // 工位2有物

            vo.setWalkPos(rgvProtocol.getAlarm() == 0?"正常":"报警");
            vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
            vo.setStaNo(rgvProtocol.getSouSta().intValue());
            vo.setSourceStaNo(rgvProtocol.getEndSta().intValue());
            if (rgvProtocol.getAlarm() > 0) {
                BasRgvErr rgvErr = basRgvErrMapper.selectById(rgvProtocol.getAlarm());
                vo.setAlarm(rgvErr==null?"未知异常":rgvErr.getErrName());