#

zjj

2024-07-12 f456520492f2539be4772eb2c4f6aad3df08f05f

 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");
@@ -377,6 +392,9 @@
        int row = Integer.parseInt(loc.substring(6,8));
        int bay = Integer.parseInt(loc.substring(8,10));
        int lev = Integer.parseInt(loc.substring(10,12));
        if (row == 2){
            row = 3;
        }
        locNo = row +"-"+bay+"-"+lev;
        return locNo;
    }