lsh#

1

昨天 945774c0ddc6bdae1d53cfbd74892efcf7d949a1

lsh#

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java

@@ -147,8 +147,9 @@
        String targetLoc = LocManageUtil.getTargetLoc(Long.parseLong(area));

        taskService.generateAGVTasks(waitPakin, targetLoc, sta, deviceSite.getDeviceCode(),loginUserId);

        basStation.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
        if (!basStation.getType().equals(0)){
            basStation.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
        }
        if (!basStationService.updateById(basStation)) {
            throw new CoolException("更新站点状态失败");
        }

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java

@@ -267,8 +267,9 @@
            if (!taskService.save(task)) {
                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("站点状态更新失败！！");
            }

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

@@ -843,7 +843,9 @@
//                if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
//                    throw new CoolException( "当前站点不是F.在库状态状态！！");
//                }
                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("站点状态更新失败！！");
                }
@@ -937,7 +939,9 @@
                        if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                            /**如果是普通站点，修改站点状态为出库预约*/
                            if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.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("站点预约失败！！");
                                }

 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("站点状态更新失败！！");
@@ -2181,7 +2183,9 @@
            /**判断是否光电站点，非光店站点需管控站点状态*/
            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("站点状态更新失败！！");
                    }