lsh#

1

昨天 6e695903059e82c1c376bf2926ffb8b209c0dc3e

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -404,7 +404,9 @@
            if (Objects.isNull(station) || !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                throw new CoolException("站点不存在或站点不处于空库状态！！");
            }
            station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
            if (!station.getType().equals(0)){
                station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
            }

            if (!basStationService.updateById(station)) {
                 throw new CoolException("站点状态更新失败！！");
@@ -1356,7 +1358,9 @@
                if (null == basStation) {
                    throw new CoolException("站点状态错误！！");
                }
                basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
                if (!basStation.getType().equals(0)){
                    basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
                }
                if (!basStationService.updateById(basStation)) {
                    throw new CoolException("更新站点状态失败！！");
                }
@@ -2181,12 +2185,16 @@
            /**判断是否光电站点，非光店站点需管控站点状态*/
            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 (!station.getType().equals(0)){
                        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 (!station.getType().equals(0)){
                        station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
                    }
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态更新失败！！");
                    }