#application-dev

zhou zhou

4 天以前 24bee1a669c3f01f4c3ce7c6f4f4e2e37fe3dfe2

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

@@ -364,16 +364,22 @@
        //主参数
        taskParams.setBatch(task.getBarcode());

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

        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 (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
        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.在库状态状态！！");
                }
//                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("站点状态更新失败！！");
@@ -446,7 +452,7 @@
        ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("任务下发后，响应结果： {}", exchange);
        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("任务下发失败！！");
            throw new CoolException("任务下发失败！！，返回参数为空！！！");
        } else {
            try {
                ObjectMapper objectMapper = new ObjectMapper();