From bec6c3109d8596cc790e64726fb51b797865d92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Mon, 30 Mar 2026 20:40:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=94=B9=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/logistics/service/impl/IOrderBoxServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 e0d71e19..284ba777 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 @@ -371,7 +371,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { // 5. 设置结束工位ID并处理不同回库类型 Long endWcId = returnToWarehouseDto.getEndWcId(); task.setWcId(endWcId); - if (!returnToWarehouseDto.getStationRegion().isEmpty()) { + if (returnToWarehouseDto.getStationRegion()!=null) { task.setStationRegion(returnToWarehouseDto.getStationRegion()); } if (endWcId == 0) { @@ -870,8 +870,10 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { // 异常处理：回滚任务 taskService.removeById(task); List stationList = stationService.list(new LambdaQueryWrapper().eq(Station::getId, task.getStationId())); - stationList.get(0).setStationStatus(STATUS_FREE); - stationService.updateById(stationList.get(0)); + if (stationList!=null&&stationList.size()!=0) { + stationList.get(0).setStationStatus(STATUS_FREE); + stationService.updateById(stationList.get(0)); + } log.error("【AGV调度】任务{}调度异常，已回滚", task.getId(), e); return R.fail("AGV小车调用异常：" + e.getMessage()); }