任务下发功能优化

skyouc

3 天以前 8b8c347b921846ed07b310bba2d7646333bf98cb

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -264,15 +264,10 @@
        if (tasks.isEmpty()) {
            return;
        }
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_PUB_TASK));
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
        if (!Objects.isNull(config) && !Objects.isNull(config.getVal())) {
            Integer val = Integer.parseInt(config.getVal());
            if (val > 1) {
                List<Task> tasks1 = tasks.stream().sorted(Comparator.comparing(Task::getCreateTime)).collect(Collectors.toList());
                Task task = tasks1.stream().findFirst().get();
                if (DateUtils.diffToSeconds(task.getCreateTime(), new Date()) < val) {
                    return;
                }
            if (Boolean.parseBoolean(config.getVal())) {
               return;
            }
        }
//        for (Task task : tasks) {
@@ -287,7 +282,7 @@
//            }
//        }
        /**下发普通站点任务，报错回滚，不再往下执行*/
        pubTaskToWcs(tasks);
        taskService.pubTaskToWcs(tasks);
    }

    /**
@@ -353,7 +348,7 @@
        }
        /**下发任务*/
        try {
            pubTaskToWcs(tasks);
            taskService.pubTaskToWcs(tasks);
        } catch (Exception e) {
            log.error("任务下发失败！！", e);
        }
@@ -388,165 +383,165 @@
     *
     * @param tasks
     */
    @Transactional(rollbackFor = Exception.class)
    public void pubTaskToWcs(List<Task> tasks) {
        WcsTaskParams taskParams = new WcsTaskParams();
        List<TaskItemParam> items = new ArrayList<>();
        tasks.forEach(task -> {
            TaskItemParam itemParam = new TaskItemParam();
            //任务类型，任务编码
            itemParam.setTaskType(RcsTaskType.getTypeDesc(task.getTaskType()))
                    .setSeqNum(task.getTaskCode());
            //主参数
            taskParams.setBatch(task.getBarcode());

            BasStation station = null;
            if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
                if (Objects.isNull(station)) {
                    throw new CoolException("站点不存在！！");
                }
            }

            /**判断是否光电站点，非光店站点需管控站点状态*/
            if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态更新失败！！");
                    }
                } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态更新失败！！");
                    }
                }
            }

            /**移库参数*/
            if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                itemParam.setOriLoc(task.getOrgLoc()).setDestLoc(task.getTargLoc());
            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
                /**全板入库参数*/
                itemParam.setDestLoc(task.getTargLoc())
                        .setOriSta(task.getOrgSite());
            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
                /**拣料/盘点入库参数*/
                itemParam.setDestLoc(task.getTargLoc())
                        .setOriSta(task.getTargSite());
            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)) {
                /**出库参数*/
                itemParam.setOriLoc(task.getOrgLoc())
                        .setDestSta(task.getTargSite());
            } else {
                /**站点间移库参数*/
                itemParam.setOriSta(task.getOrgSite()).setDestSta(task.getTargSite());

                BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
                if (Objects.isNull(curSta)) {
                    throw new CoolException("站点不存在！！");
                }
                if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                    if (!curSta.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
                        throw new CoolException("当前站点不是F.在库状态！！");
                    }
                }
                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                    if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                        throw new CoolException("目标站点不是O.空闲状态！！");
                    }
                }
            }
            items.add(itemParam);
        });
        taskParams.setTaskList(items);
        /**任务下发接口*/
        String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.pubTask;
        /**RCS基础配置链接*/
        log.info("任务下发，请求地址： {}， 请求参数： {}", pubTakUrl, JSONObject.toJSONString(taskParams));
        HttpHeaders headers = new HttpHeaders();
        headers.add("Content-Type", "application/json");
        headers.add("api-version", "v2.0");
        HttpEntity httpEntity = new HttpEntity(taskParams, headers);
        ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("任务下发后，响应结果： {}", exchange);
        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("任务下发失败！！");
        } else {
            try {
                ObjectMapper objectMapper = new ObjectMapper();
                objectMapper.coercionConfigDefaults()
                        .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
                CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
                if (result.getCode() == 200) {
                    tasks.forEach(task -> {

                        if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {

                            BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
                            if (Objects.isNull(curSta)) {
                                throw new CoolException("站点不存在！！");
                            }

                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
                                throw new CoolException("任务状态修改失败！！");
                            }
                            /**排除移库功能*/
                            if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                                /**如果是普通站点，修改站点状态为出库预约*/
                                if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                                    curSta.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
                                    if (!basStationService.updateById(curSta)) {
                                        throw new CoolException("站点预约失败！！");
                                    }
                                }
                            }
                        } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
                            BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
                            if (Objects.isNull(curSta)) {
                                throw new CoolException("站点不存在！！");
                            }

                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
                                throw new CoolException("任务状态修改失败！！");
                            }
                            /**如果是普通站点，修改站点状态为入库预约*/
                            if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
                                curSta.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
                                if (!basStationService.updateById(curSta)) {
                                    throw new CoolException("站点预约失败！！");
                                }
                            }
                        }
                    });
                } else {
                    log.error(JSONObject.toJSONString(result));
//                    throw new CoolException("任务下发失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
            }
        }

    }

//    @Transactional(rollbackFor = Exception.class)
//    public void pubTaskToWcs(List<Task> tasks) {
//        WcsTaskParams taskParams = new WcsTaskParams();
//        List<TaskItemParam> items = new ArrayList<>();
//        tasks.forEach(task -> {
//            TaskItemParam itemParam = new TaskItemParam();
//            //任务类型，任务编码
//            itemParam.setTaskType(RcsTaskType.getTypeDesc(task.getTaskType()))
//                    .setSeqNum(task.getTaskCode());
//            //主参数
//            taskParams.setBatch(task.getBarcode());
//
//            BasStation station = null;
//            if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//                station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
//                if (Objects.isNull(station)) {
//                    throw new CoolException("站点不存在！！");
//                }
//            }
//
//            /**判断是否光电站点，非光店站点需管控站点状态*/
//            if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
//                if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//                    station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
//                    if (!basStationService.updateById(station)) {
//                        throw new CoolException("站点状态更新失败！！");
//                    }
//                } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
//                    station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
//                    if (!basStationService.updateById(station)) {
//                        throw new CoolException("站点状态更新失败！！");
//                    }
//                }
//            }
//
//            /**移库参数*/
//            if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//                itemParam.setOriLoc(task.getOrgLoc()).setDestLoc(task.getTargLoc());
//            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
//                /**全板入库参数*/
//                itemParam.setDestLoc(task.getTargLoc())
//                        .setOriSta(task.getOrgSite());
//            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
//                /**拣料/盘点入库参数*/
//                itemParam.setDestLoc(task.getTargLoc())
//                        .setOriSta(task.getTargSite());
//            } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
//                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)) {
//                /**出库参数*/
//                itemParam.setOriLoc(task.getOrgLoc())
//                        .setDestSta(task.getTargSite());
//            } else {
//                /**站点间移库参数*/
//                itemParam.setOriSta(task.getOrgSite()).setDestSta(task.getTargSite());
//
//                BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
//                if (Objects.isNull(curSta)) {
//                    throw new CoolException("站点不存在！！");
//                }
//                if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
//                    if (!curSta.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
//                        throw new CoolException("当前站点不是F.在库状态！！");
//                    }
//                }
//                if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
//                    if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
//                        throw new CoolException("目标站点不是O.空闲状态！！");
//                    }
//                }
//            }
//            items.add(itemParam);
//        });
//        taskParams.setTaskList(items);
//        /**任务下发接口*/
//        String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.pubTask;
//        /**RCS基础配置链接*/
//        log.info("任务下发，请求地址： {}， 请求参数： {}", pubTakUrl, JSONObject.toJSONString(taskParams));
//        HttpHeaders headers = new HttpHeaders();
//        headers.add("Content-Type", "application/json");
//        headers.add("api-version", "v2.0");
//        HttpEntity httpEntity = new HttpEntity(taskParams, headers);
//        ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
//        log.info("任务下发后，响应结果： {}", exchange);
//        if (Objects.isNull(exchange.getBody())) {
//            throw new CoolException("任务下发失败！！");
//        } else {
//            try {
//                ObjectMapper objectMapper = new ObjectMapper();
//                objectMapper.coercionConfigDefaults()
//                        .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
//                CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
//                if (result.getCode() == 200) {
//                    tasks.forEach(task -> {
//
//                        if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//
//                            BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
//                            if (Objects.isNull(curSta)) {
//                                throw new CoolException("站点不存在！！");
//                            }
//
//                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
//                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
//                                throw new CoolException("任务状态修改失败！！");
//                            }
//                            /**排除移库功能*/
//                            if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//                                /**如果是普通站点，修改站点状态为出库预约*/
//                                if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
//                                    curSta.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
//                                    if (!basStationService.updateById(curSta)) {
//                                        throw new CoolException("站点预约失败！！");
//                                    }
//                                }
//                            }
//                        } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
//                                || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
//                            BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
//                            if (Objects.isNull(curSta)) {
//                                throw new CoolException("站点不存在！！");
//                            }
//
//                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
//                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
//                                throw new CoolException("任务状态修改失败！！");
//                            }
//                            /**如果是普通站点，修改站点状态为入库预约*/
//                            if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
//                                curSta.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
//                                if (!basStationService.updateById(curSta)) {
//                                    throw new CoolException("站点预约失败！！");
//                                }
//                            }
//                        }
//                    });
//                } else {
//                    log.error(JSONObject.toJSONString(result));
////                    throw new CoolException("任务下发失败！！");
//                }
//            } catch (JsonProcessingException e) {
//                throw new CoolException(e.getMessage());
//            }
//        }
//
//    }
//

    /**
     * @param
@@ -664,7 +659,6 @@
                    throw new CoolException("原始任务明细删除失败！！");
                }
            }


        });
    }