#缓存队列bug fixed

Junjie

2024-09-03 01caa61052be94abef9d84f63f97ea427cd1e043

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

@@ -148,32 +148,6 @@
            priority = param.getPriority();
        }

        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
        task.setOriginSite(param.getOriginSite());
        task.setOriginLoc(null);
        task.setDestSite(destSite);
        task.setDestLoc(param.getDestLoc());
        task.setZpallet(param.getBarcode());
        task.setIoTime(new Date());
        task.setStartTime(new Date());
        task.setStatus(1);
        task.setMemo("");
        task.setShuttleNo(null);//等待主线程分配小车
        task.setRecordLoc("Y");//记录库存信息
        task.setHostId(hostId);//临时控制只允许host为1
        task.setMemo(param.getEndSite());

        boolean result = taskService.save(task);
        if (!result) {
            throw new CoolException("生成入库任务失败！");
        }

        if (createWcsTaskParam != null) {
            //转发agv
            if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
@@ -183,6 +157,32 @@
                    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);
                    }

                    Task task = new Task();
                    task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
                    task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
                    task.setWmsTaskNo(param.getTaskNo());
                    task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
                    task.setTaskCtg(taskCtg.getId());
                    task.setPriority(priority);
                    task.setOriginSite(param.getOriginSite());
                    task.setOriginLoc(null);
                    task.setDestSite(destSite);
                    task.setDestLoc(param.getDestLoc());
                    task.setZpallet(param.getBarcode());
                    task.setIoTime(new Date());
                    task.setStartTime(new Date());
                    task.setStatus(1);
                    task.setMemo("");
                    task.setShuttleNo(null);//等待主线程分配小车
                    task.setRecordLoc("Y");//记录库存信息
                    task.setHostId(hostId);//临时控制只允许host为1
                    task.setMemo(param.getEndSite());

                    boolean result = taskService.save(task);
                    if (!result) {
                        throw new CoolException("生成入库任务失败！");
                    }
                }catch (Exception e){
                    throw new CoolException("转发AGV任务出错" + e.getMessage());
@@ -325,21 +325,6 @@
        boolean result = taskService.save(task);
        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();
@@ -505,6 +490,13 @@
                    map.put("requestPK", param.getRequestPK());
                    log.info("返回mes信息:"+JSONObject.toJSONString(map));
                    return map;
                }else {
                    map.put("success", "1");
                    map.put("message", "success");
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                    log.info("返回mes信息:"+JSONObject.toJSONString(map));
                    return map;
                }
            }catch (Exception e){
                map.put("success", "0");