|
|
|
@ -226,7 +226,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
// 查询站点信息(封装为方法,提升可读性)
|
|
|
|
// 查询站点信息(封装为方法,提升可读性)
|
|
|
|
Station targetStation = getStationByCode(stationCode); |
|
|
|
Station targetStation = getStationByCode(stationCode); |
|
|
|
// 查询有效任务列表
|
|
|
|
// 查询有效任务列表
|
|
|
|
List<Task> validTaskList = getValidTaskList(stationCode); |
|
|
|
List<Task> validTaskList = getValidTaskList(returnToWarehouseDto.getBoxBarcode()); |
|
|
|
// 校验站点状态
|
|
|
|
// 校验站点状态
|
|
|
|
checkStationStatus(targetStation); |
|
|
|
checkStationStatus(targetStation); |
|
|
|
// 校验终点信息
|
|
|
|
// 校验终点信息
|
|
|
|
@ -265,14 +265,14 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
/** |
|
|
|
/** |
|
|
|
* 查询有效任务列表(运行中状态,不存在则抛异常) |
|
|
|
* 查询有效任务列表(运行中状态,不存在则抛异常) |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private List<Task> getValidTaskList(String stationCode) { |
|
|
|
private List<Task> getValidTaskList(String boxBarcode) { |
|
|
|
LambdaQueryWrapper<Task> taskQuery = new LambdaQueryWrapper<Task>() |
|
|
|
LambdaQueryWrapper<Task> taskQuery = new LambdaQueryWrapper<Task>() |
|
|
|
.eq(Task::getBoxBarcode, stationCode) |
|
|
|
.eq(Task::getBoxBarcode, boxBarcode) |
|
|
|
.in(Task::getTaskStatus, RUNNING_STATUSES); // RUNNING_STATUSES建议抽取为常量
|
|
|
|
.in(Task::getTaskStatus, RUNNING_STATUSES); // RUNNING_STATUSES建议抽取为常量
|
|
|
|
List<Task> taskList = iTaskService.list(taskQuery); |
|
|
|
List<Task> taskList = iTaskService.list(taskQuery); |
|
|
|
|
|
|
|
|
|
|
|
if (taskList == null || taskList.isEmpty()) { |
|
|
|
if (taskList == null || taskList.isEmpty()) { |
|
|
|
log.warn("箱条码数据异常,站点编号:{}", stationCode); |
|
|
|
log.warn("箱条码数据异常,箱条码编号:{}", boxBarcode); |
|
|
|
throw new IllegalArgumentException("箱条码数据异常"); |
|
|
|
throw new IllegalArgumentException("箱条码数据异常"); |
|
|
|
} |
|
|
|
} |
|
|
|
return taskList; |
|
|
|
return taskList; |
|
|
|
|