物流改写

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<PrWorkPlan> 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<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>()
                             .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 {