From 88866e871805947fc17f7436588e3c52ab65744a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Thu, 2 Apr 2026 19:07:01 +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 | 5 +++-- 1 file changed, 3 insertions(+), 2 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 8e9d4d60..369c8b51 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 @@ -1462,7 +1462,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { } } else { List nextWorkPlanList = prWorkPlanService.lambdaQuery() - .select(PrWorkPlan::getStatus, PrWorkPlan::getNextWpId, PrWorkPlan::getWpId, PrWorkPlan::getMakeTeam) + .select(PrWorkPlan::getStatus, PrWorkPlan::getNextWpId, PrWorkPlan::getWpId, PrWorkPlan::getMakeTeam,PrWorkPlan::getSubsidiaryTeam) .eq(PrWorkPlan::getWpId, workPlan.getNextWpId()) .list(); @@ -1475,7 +1475,8 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { } else { List list = iCenterTeamService.list(new LambdaQueryWrapper() .select(CenterTeam::getWcId, CenterTeam::getTsId) - .eq(CenterTeam::getTsId, (workPlan.getMakeTeam()))); + .eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())) + .eq(workPlan==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))); if (list == null || list.size() == 0) { return R.fail(orderCardNo + "车间订单班次查询作业中心异常"); } else {