#

zjj

2024-07-13 93c192a2dded7c8fc6b64b556a4e263d390b45d1

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

@@ -115,9 +115,19 @@
                    return map;
                }
            }else {
                if (task.getTaskSts() == 1000 || task.getMemo().equals(agvTaskParam.getExtra().getValues().getSlotName())){
                    task.setTaskSts(1001L);
                    taskService.updateById(task);
                if (task.getTaskSts() == 1000 && task.getMemo().equals(agvTaskParam.getExtra().getValues().getSlotName())){
                    HashMap<String, String> mesMap = new HashMap<>();
                    mesMap.put("taskNo", agvTaskParam.getRobotTaskCode());
                    mesMap.put("contNo",agvTaskParam.getExtra().getValues().getCarrierCode());
                    boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",agvTaskParam.getExtra().getValues().getSlotName());
                    if (returnTask4){
                        task.setTaskSts(1001L);
                        taskService.updateById(task);
                        log.info("出库任务完成推送mes"+task.getWmsTaskNo());
                    }else {
                        log.error("出库任务完成推送mes失败"+task.getWmsTaskNo());
                    }

                }
            }
        }else {
@@ -125,6 +135,11 @@
            mesMap.put("taskNo", agvTaskParam.getRobotTaskCode());
            mesMap.put("contNo",agvTaskParam.getExtra().getValues().getCarrierCode());
            boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",agvTaskParam.getExtra().getValues().getSlotName());
            if (returnTask4){
                log.info("出库任务完成推送mes"+agvTaskParam.getRobotTaskCode());
            }else {
                log.error("出库任务完成推送mes失败"+agvTaskParam.getRobotTaskCode());
            }
        }

        map.put("code","0");
@@ -239,6 +254,7 @@
            map.put("message", "失败，请求参数为空");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            log.info("返回mes信息:"+JSONObject.toJSONString(map));
            return map;
        }
        if (Cools.isEmpty(param.getRequestPK()) || Cools.isEmpty(param.getContNo()) || Cools.isEmpty(param.getTrkPrty()) || Cools.isEmpty(param.getToPos())){
@@ -246,6 +262,7 @@
            map.put("message", "失败，请求参数为空");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            log.info("返回mes信息:"+JSONObject.toJSONString(map));
            return map;
        }

@@ -255,6 +272,7 @@
            map.put("message", "失败，存在相同编号的任务");
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
            log.info("返回mes信息:"+JSONObject.toJSONString(map));
            return map;
        }
        String sta = "06YZ";
@@ -270,6 +288,7 @@
                        map.put("message", httpRequest);
                        map.put("result", "");
                        map.put("requestPK", param.getRequestPK());
                        log.info("返回mes信息:"+JSONObject.toJSONString(map));
                        return map;
                    }
                }catch (Exception e){
@@ -277,6 +296,7 @@
                    map.put("message", "转发AGV任务出错");
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                    log.info("返回mes信息:"+JSONObject.toJSONString(map));
                    return map;
                }
            }
@@ -296,6 +316,7 @@
                map.put("message", "生成任务出错");
                map.put("result", "");
                map.put("requestPK", param.getRequestPK());
                log.info("返回mes信息:"+JSONObject.toJSONString(map));
                return map;
            }finally {
                int code = (int) inTask.get("code");
@@ -328,6 +349,7 @@
                map.put("message", "生成任务出错");
                map.put("result", "");
                map.put("requestPK", param.getRequestPK());
                log.info("返回mes信息:"+JSONObject.toJSONString(map));
                return map;
            }finally {
                int code = (int) outTask.get("code");
@@ -354,6 +376,7 @@
                    map.put("message", httpRequest);
                    map.put("result", "");
                    map.put("requestPK", param.getRequestPK());
                    log.info("返回mes信息:"+JSONObject.toJSONString(map));
                    return map;
                }
            }catch (Exception e){
@@ -361,6 +384,7 @@
                map.put("message", "转发AGV任务出错");
                map.put("result", "");
                map.put("requestPK", param.getRequestPK());
                log.info("返回mes信息:"+JSONObject.toJSONString(map));
                return map;
            }

@@ -370,6 +394,7 @@
            map.put("result", "");
            map.put("requestPK", param.getRequestPK());
        }
        log.info("返回mes信息:"+JSONObject.toJSONString(map));
        return map;
    }
    public static String getWMStoWCSLocNo(String loc){