#

lsh

昨天 c5f18df79cd0bd98e31afc402886564b1cfeda5e

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

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasCrnErrorServiceImpl;
import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
@@ -70,6 +71,8 @@
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    @Autowired
    private TaskWrkLogServiceImpl taskWrkLogService;

    //agv任务完成
    @PostMapping("/toAgvTaskOver")
@@ -520,12 +523,17 @@
            basCrnpWmsParam.sync(basCrnp);

            basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
            basCrnpWmsParam.setCrnSts(crnProtocol.getStatus().intValue());

            try{
                BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
                BasCrnError basCrnError = basCrnErrorService.selectById(crnProtocol.getAlarm());
                basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }
            if (crnProtocol.getMode()!=3){
                basCrnpWmsParam.setCrnErr(999L);
                basCrnpWmsParam.setCrnErrM("非自动！！！");
            }
            basCrnpWmsParamList.add(basCrnpWmsParam);

@@ -543,12 +551,17 @@
            basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
            basRgvWmsParam.setSteNo(rgvSlave.getId());
            basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
            try{
                BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());

                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("非自动！！！");
            }
//            list.add(basRgvWmsParam);
            wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
@@ -561,5 +574,32 @@
        return R.ok(wcsStatusResponseModel);
    }

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

    //设备状态查询接口
    @PostMapping("/error")
    @Transactional
    public R errorRgv(@RequestHeader String appkey,
                      HttpServletRequest request) {
        List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
        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);
    }


}