#缓存队列bug fixed

Junjie

2024-08-31 84e1ce27f117d2becd5c868db31dfda2e08d0055

#缓存队列bug fixed

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java

@@ -286,13 +286,13 @@
    //生成入库任务
    @PostMapping("/createInTask")
    public R createInTask(@RequestBody CreateInTaskParam param) {
        return openService.createInTask(param);
        return openService.createInTask(param, null);
    }

    //生成出库任务
    @PostMapping("/createOutTask")
    public R createOutTask(@RequestBody CreateOutTaskParam param) {
        return openService.createOutTask(param);
        return openService.createOutTask(param, null);
    }

    //生成手动取放货任务

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/OpenService.java

@@ -9,9 +9,9 @@

public interface OpenService {

    R createInTask(CreateInTaskParam param);
    R createInTask(CreateInTaskParam param, CreateWcsTaskParam createWcsTaskParam);

    R createOutTask(CreateOutTaskParam param);
    R createOutTask(CreateOutTaskParam param, CreateWcsTaskParam createWcsTaskParam);

    HashMap<String, Object> executeWcsTaskCache(CreateWcsTaskParam param);


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java

@@ -59,7 +59,7 @@

    @Override
    @Transactional
    public R createInTask(CreateInTaskParam param) {
    public R createInTask(CreateInTaskParam param, CreateWcsTaskParam createWcsTaskParam) {
        //获取入库任务类型
        TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
                .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.IN))
@@ -173,12 +173,29 @@
        if (!result) {
            throw new CoolException("生成入库任务失败！");
        }

        if (createWcsTaskParam != null) {
            //转发agv
            if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
                try {
                    AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
                    getInRequestParam(agvTaskCreateParam, createWcsTaskParam);
                    String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
                    if (!httpRequest.equals("SUCCESS")){
                        throw new CoolException("转发AGV任务失败" + httpRequest);
                    }
                }catch (Exception e){
                    throw new CoolException("转发AGV任务出错" + e.getMessage());
                }
            }
        }

        return R.ok();
    }

    @Override
    @Transactional
    public R createOutTask(CreateOutTaskParam param) {
    public R createOutTask(CreateOutTaskParam param, CreateWcsTaskParam createWcsTaskParam) {
        //获取出库任务类型
        TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
                .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
@@ -221,12 +238,12 @@
                    .eq(BasConveyorPath::getTypeNo, taskCtg.getId())
                    .eq(BasConveyorPath::getHostId, hostId)
                    .eq(BasConveyorPath::getStnNo, param.getDestSite()));
            if(path == null) {
            if (path == null) {
                throw new CoolException("内置路径不存在");
            }
            Integer deviceNo = path.getDeviceNo();//获取提升机号
            BasLift basLift = basLiftService.getOne(new LambdaQueryWrapper<BasLift>().eq(BasLift::getLiftNo, deviceNo).eq(BasLift::getHostId, hostId));
            if(basLift == null) {
            if (basLift == null) {
                throw new CoolException("提升机对象不存在");
            }
            List<BasLiftStaDto> staList = JSON.parseArray(basLift.getSta(), BasLiftStaDto.class);
@@ -264,12 +281,12 @@
            }

            BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, basConveyorSta.getConveyorNo()));
            if(basConveyor == null) {
            if (basConveyor == null) {
                throw new CoolException("输送线不存在");
            }

            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
            if(devpThread == null) {
            if (devpThread == null) {
                throw new CoolException("输送线线程不存在");
            }

@@ -309,6 +326,22 @@
        if (!result) {
            throw new CoolException("生成出库任务失败！");
        }

        if (createWcsTaskParam != null) {
            if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
                try {
                    AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
                    getInRequestParam(agvTaskCreateParam, createWcsTaskParam);
                    String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
                    if (!httpRequest.equals("SUCCESS")){
                        throw new CoolException("转发AGV任务失败" + httpRequest);
                    }
                }catch (Exception e){
                    throw new CoolException("转发AGV任务出错" + e.getMessage());
                }
            }
        }

        return R.ok();
    }

@@ -329,43 +362,20 @@
            createInTaskParam.setEndSite(param.getToPos());
            R inTask = null;
            try {
                inTask = this.createInTask(createInTaskParam);
                inTask = this.createInTask(createInTaskParam, param);
                int code = (int) inTask.get("code");
                if (code == 200){
                    map.put("success", "1");
                    map.put("message", inTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());

                    if (!param.getFrmPos().equals("06YZ0001")){
                        try {
                            AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
                            getInRequestParam(agvTaskCreateParam,param);
                            String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
                            if (!httpRequest.equals("SUCCESS")){
                                map.put("success", "0");
                                map.put("message", httpRequest);
                                map.put("result", "");
                                map.put("requestPK", param.getRequestPK());
                                log.info("返回mes信息:"+ JSONObject.toJSONString(map));
                                return map;
                            }
                        }catch (Exception e){
                            map.put("success", "0");
                            map.put("message", "转发AGV任务出错");
                            map.put("result", "");
                            map.put("requestPK", param.getRequestPK());
                            log.info("返回mes信息:"+JSONObject.toJSONString(map));
                            return map;
                        }
                    }

                }else {
                    map.put("success", "0");
                    map.put("message", inTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                }

            }catch (Exception e){
                map.put("success", "0");
                map.put("message", e.getMessage());
@@ -385,7 +395,7 @@
            createOutTaskParam.setZpallet(param.getContNo());
            R outTask = null;
            try {
                outTask = this.createOutTask(createOutTaskParam);
                outTask = this.createOutTask(createOutTaskParam, param);

                int code = (int) outTask.get("code");
                if (code == 200){
@@ -393,30 +403,6 @@
                    map.put("message", outTask.get("msg"));
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());

                    if (!param.getFrmPos().equals("06YZ0001")){
                        try {
                            AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
                            getInRequestParam(agvTaskCreateParam,param);
                            String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
                            if (!httpRequest.equals("SUCCESS")){
                                map.put("success", "0");
                                map.put("message", httpRequest);
                                map.put("result", "");
                                map.put("requestPK", param.getRequestPK());
                                log.info("返回mes信息:"+ JSONObject.toJSONString(map));
                                return map;
                            }
                        }catch (Exception e){
                            map.put("success", "0");
                            map.put("message", "转发AGV任务出错");
                            map.put("result", "");
                            map.put("requestPK", param.getRequestPK());
                            log.info("返回mes信息:"+JSONObject.toJSONString(map));
                            return map;
                        }
                    }

                }else {
                    map.put("success", "0");
                    map.put("message", outTask.get("msg"));