站点预约问题修复

zc

昨天 08ddf90b4dea4a8de917bc6a76b1ad5c2b335d2e

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

@@ -240,7 +240,7 @@
    /**
     * 非光电站点任务下发
     */
    @Scheduled(cron = "0/5 * * * * ?  ")
    @Scheduled(cron = "0/25 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void pubTaskToWcs() {
        Long loginUserId = SystemAuthUtils.getLoginUserId();
@@ -388,17 +388,11 @@
            /**判断是否光电站点，非光店站点需管控站点状态*/
            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)) {
//                if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
//                    throw new CoolException( "当前站点不是F.在库状态状态！！");
//                }
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态更新失败！！");
                    }
                } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
                    if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                        throw new CoolException("目标站点不处O.空闲状态，无法预约出库。");
                    }
                    station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态更新失败！！");
@@ -512,7 +506,8 @@
                        }
                    });
                } else {
                    throw new CoolException("任务下发失败！！");
                    log.error(JSONObject.toJSONString(result));
//                    throw new CoolException("任务下发失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
@@ -529,7 +524,7 @@
     * @description 已完成任务加入历史档
     * @time 2025/4/3 12:54
     */
    @Scheduled(cron = "0 0/01 * * * ?  ")
    @Scheduled(cron = "0/15 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void taskLogUpdate() {
        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
@@ -551,15 +546,14 @@
        tasks.forEach(task -> {
            TaskLog taskLog = new TaskLog();
            BeanUtils.copyProperties(task, taskLog);
            taskLog.setTaskId(task.getId())
                    .setId(null);
            taskLog.setTaskId(task.getId()).setId(null);
            if (!taskLogService.save(taskLog)) {
                throw new CoolException("任务历史档保存失败！！");
            }
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));

            //入库单据明细上报
            if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {

            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                for (TaskItem taskItem : taskItems) {
                    if (Objects.isNull(taskItem.getOrderId())) {
                        continue;
@@ -583,7 +577,7 @@
                try {
                    reportStationStatus(task);
                } catch (Exception e) {
                    throw new RuntimeException(e);
                    throw new CoolException(e.getMessage());
                }
            }

@@ -635,10 +629,9 @@
        }

        LocSiteParams locSiteParams = new LocSiteParams();
        locSiteParams.setStatus(LocStsType.getLocSts(LocStsType.LOC_STS_TYPE_O.type))
        locSiteParams.setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
                .setType("site")
                .setCode(station.getStationName());

        /**WMS基础配置链接*/
        String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_SITE_STATUS;
        log.info("上报已完成订单：{}， 请求参数： {}", rcsUrl, JSONObject.toJSONString(locSiteParams));
@@ -649,6 +642,7 @@
        HttpEntity httpEntity = new HttpEntity(locSiteParams, headers);
        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("上报已完成订单，返回结果： {}", exchange);

        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("修改失败！！");
        } else {
@@ -661,7 +655,6 @@
                throw new CoolException(e.getMessage());
            }
        }

    }

}