#
zjj
2024-07-11 ab0ab891cc2eeae24fe621412749cd95731e6d98
#
2个文件已修改
22 ■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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");
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -78,6 +78,7 @@
                if (httpRequest){
                    task.setTaskSts(1000L);
                    taskService.updateById(task);
                    log.info("出库任务推送rgv"+task.getWmsTaskNo());
                }else {
                    log.error("出库任务推送rgv失败"+task.getWmsTaskNo());
                }