From 54a4de8199be66687aa427c8d84e6012cf98278b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Thu, 2 Apr 2026 19:53:16 +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 --- .../service/impl/IOrderBoxServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 3a92b375..06a76ec6 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 @@ -253,10 +253,8 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { @Override public R> returnToWarehouseList() { log.info("【回库工位查询】开始查询空闲站点关联工位"); - // 1. 查询空闲状态的站点 - - List freeStationList = stationService.getStatusStationList(STATUS_FREE, true, null, null, false); + List freeStationList = stationService.getStatusStationList(STATUS_FREE, true, null, CONVEYOR_LINE_RECEIVE_ONLY, false); // 2. 构建返回列表（默认添加输送线回库选项） List resultList = new ArrayList<>(); BsWorkCenterVO conveyorVO = new BsWorkCenterVO(); @@ -1234,7 +1232,8 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { @Override public R getStationRegion() { // 1. 查询所有空闲站点 - List freeStationList = stationService.getStatusStationList(STATUS_FREE, false, null, null, false); + List freeStationList = stationService.getStatusStationList(STATUS_FREE, false, null, CONVEYOR_LINE_RECEIVE_ONLY, false); + // 2. 判空：无空闲站点则返回失败 if (freeStationList == null || freeStationList.size() == 0) { @@ -1447,7 +1446,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { Long workCenterId; if (workPlan.getStatus() < 3) { - if (workPlan.getMakeTeam() == null) { + if (workPlan.getMakeTeam() == null&&workPlan.getSubsidiaryTeam() == null) { return R.fail(orderCardNo + "车间订单班次异常"); } else { List list = iCenterTeamService.list(new LambdaQueryWrapper() @@ -1467,10 +1466,10 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { .list(); if (nextWorkPlanList == null || nextWorkPlanList.isEmpty()) { - return R.fail(orderCardNo + "车间订单异常"); + return R.fail(orderCardNo + "订单已结束不可配送"); } workPlan = nextWorkPlanList.get(0); - if (workPlan.getMakeTeam() == null) { + if (workPlan.getMakeTeam() == null&&workPlan.getSubsidiaryTeam() == null) { return R.fail(orderCardNo + "车间订单班次异常"); } else { List list = iCenterTeamService.list(new LambdaQueryWrapper()