|
|
|
@ -256,7 +256,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
|
|
|
|
|
|
|
// 1. 查询空闲状态的站点
|
|
|
|
// 1. 查询空闲状态的站点
|
|
|
|
|
|
|
|
|
|
|
|
List<StationVO> freeStationList = stationService.getStatusStationList(STATUS_FREE, true, null, CONVEYOR_LINE_RECEIVE_ONLY, false); |
|
|
|
List<StationVO> freeStationList = stationService.getStatusStationList(STATUS_FREE, true, null, null, false); |
|
|
|
// 2. 构建返回列表(默认添加输送线回库选项)
|
|
|
|
// 2. 构建返回列表(默认添加输送线回库选项)
|
|
|
|
List<BsWorkCenterVO> resultList = new ArrayList<>(); |
|
|
|
List<BsWorkCenterVO> resultList = new ArrayList<>(); |
|
|
|
BsWorkCenterVO conveyorVO = new BsWorkCenterVO(); |
|
|
|
BsWorkCenterVO conveyorVO = new BsWorkCenterVO(); |
|
|
|
@ -1234,7 +1234,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R getStationRegion() { |
|
|
|
public R getStationRegion() { |
|
|
|
// 1. 查询所有空闲站点
|
|
|
|
// 1. 查询所有空闲站点
|
|
|
|
List<StationVO> freeStationList = stationService.getStatusStationList(STATUS_FREE, false, null, CONVEYOR_LINE_RECEIVE_ONLY, false); |
|
|
|
List<StationVO> freeStationList = stationService.getStatusStationList(STATUS_FREE, false, null, null, false); |
|
|
|
|
|
|
|
|
|
|
|
// 2. 判空:无空闲站点则返回失败
|
|
|
|
// 2. 判空:无空闲站点则返回失败
|
|
|
|
if (freeStationList == null || freeStationList.size() == 0) { |
|
|
|
if (freeStationList == null || freeStationList.size() == 0) { |
|
|
|
|