lsh#

1

21 小时以前 0f55777fd5411ca83e4f51092a70ce62228282fe

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

@@ -460,9 +460,8 @@
                    } else {
                        task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
                    }
                    String targSite = task.getTargSite();
                    BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, targSite));
                    basStation.setUseStatus("F");
                    BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
                    basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
                    basStation.setBarcode(task.getBarcode());
                    basStationService.updateById(basStation);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
@@ -477,9 +476,8 @@
                    task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)){
                    task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
                    String targSite = task.getTargSite();
                    BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, targSite));
                    basStation.setUseStatus("D");
                    BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
                    basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
                    basStation.setBarcode(task.getBarcode());
                    basStationService.updateById(basStation);
                } else {
@@ -843,7 +841,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("站点状态更新失败！！");
                }
@@ -851,7 +851,9 @@
                if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                    throw new CoolException("目标站点不处O.空闲状态，无法预约出库。");
                }
                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("站点状态更新失败！！");
                }
@@ -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("站点预约失败！！");
                                }
@@ -954,7 +958,9 @@
                        }
                        /**如果是普通站点，修改站点状态为入库预约*/
                        if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.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("站点预约失败！！");
                            }