#

lsh

1 天以前 c5f18df79cd0bd98e31afc402886564b1cfeda5e

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

@@ -551,13 +551,14 @@
            basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
            basRgvWmsParam.setSteNo(rgvSlave.getId());
            basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
            try{
                BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());

                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            basRgvWmsParam.setSteErrM(rgvStatus.getAlarmM());
//            try{
//                BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());
//
//                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
//            } catch (Exception e){
//                basRgvWmsParam.setSteErrM("未知异常");
//            }
            if (rgvStatus.getMode()!=1){
                basRgvWmsParam.setSteErr(999L);
                basRgvWmsParam.setSteErrM("非自动！！！");
@@ -591,5 +592,14 @@
        return R.ok(taskWrkLogs);
    }

    //设备状态查询接口
    @PostMapping("/wrkNo/wmsTaskNo")
    @Transactional
    public R wrkNoWmsTaskNo(@RequestHeader String appkey,
                      HttpServletRequest request) {
        List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
        return R.ok(taskWrkLogs);
    }


}