diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java index 0efae96b..198984b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java @@ -119,7 +119,7 @@ public class OrderBoxController extends BladeController { @PostMapping("/return-warehouse") @ApiOperationSupport(order = 5) @Operation(summary = "回库", description = "调用回库") - public R inventoryReturnToWarehouse(@RequestParam ReturnToWarehouseDto returnToWarehouseDto){ + public R inventoryReturnToWarehouse(@RequestBody ReturnToWarehouseDto returnToWarehouseDto){ return iOrderBoxService.inventoryReturnToWarehouse(returnToWarehouseDto); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index 5982708d..12ba6072 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -226,7 +226,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { // 查询站点信息(封装为方法,提升可读性) Station targetStation = getStationByCode(stationCode); // 查询有效任务列表 - List validTaskList = getValidTaskList(stationCode); + List validTaskList = getValidTaskList(returnToWarehouseDto.getBoxBarcode()); // 校验站点状态 checkStationStatus(targetStation); // 校验终点信息 @@ -265,14 +265,14 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { /** * 查询有效任务列表(运行中状态,不存在则抛异常) */ - private List getValidTaskList(String stationCode) { + private List getValidTaskList(String boxBarcode) { LambdaQueryWrapper taskQuery = new LambdaQueryWrapper() - .eq(Task::getBoxBarcode, stationCode) + .eq(Task::getBoxBarcode, boxBarcode) .in(Task::getTaskStatus, RUNNING_STATUSES); // RUNNING_STATUSES建议抽取为常量 List taskList = iTaskService.list(taskQuery); if (taskList == null || taskList.isEmpty()) { - log.warn("箱条码数据异常,站点编号:{}", stationCode); + log.warn("箱条码数据异常,箱条码编号:{}", boxBarcode); throw new IllegalArgumentException("箱条码数据异常"); } return taskList;