From c82d2f4606e288b328ca149a985aa04aaa5043a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Thu, 9 Apr 2026 17:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/service/impl/PdaLoadServiceImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
index 60b3aa8c..11a0f3a9 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
@@ -197,9 +197,13 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     public PdaProRelevantVO loadProTestWorkPlan(String cardNo) {
         WorkOrder prWorkOrder = this.checkPrWorkOrder(cardNo);
         WorkPlan prWorkPlan = this.getOne(Wrappers.lambdaQuery(WorkPlan.class).eq(WorkPlan::getId, prWorkOrder.getWpId()));
+        List<Long> ppsId = new ArrayList<>(List.of(prWorkPlan.getPpsId()));
         WorkPlan frontWorkPlan = this.getById(prWorkPlan.getFrontWpId());
+        if (frontWorkPlan != null) {
+            ppsId.add(frontWorkPlan.getPpsId());
+        }
         DsPartEntity part = partService.selectDsPartByPatCodeAndVersion(prWorkOrder.getPartCode(), null);
-        List<BsProcessSetEntity> processSets = bsProcessSetService.listByIds(List.of(prWorkPlan.getPpsId(), frontWorkPlan.getPpsId()));
+        List<BsProcessSetEntity> processSets = bsProcessSetService.listByIds(ppsId);
         // 将processSets根据主键ID转换为Map
         Map<Long, BsProcessSetEntity> processSetMap = processSets.stream().collect(Collectors.toMap(BsProcessSetEntity::getId, processSet -> processSet));
         BsTeamSetEntity teamSet = bsTeamSetService.getById(prWorkPlan.getSubsidiaryTeam() != null ? prWorkPlan.getSubsidiaryTeam() : prWorkPlan.getMakeTeam());
@@ -209,8 +213,8 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                 .batchNo(prWorkOrder.getBatchNo())
                 .partCode(prWorkOrder.getPartCode())
                 .partName(part != null ? part.getPartName() : null)
-                .frontOrders(frontWorkPlan.getOrders())
-                .frontPpsName(processSetMap.get(frontWorkPlan.getPpsId()).getName())
+                .frontOrders(frontWorkPlan != null ? frontWorkPlan.getOrders() : null)
+                .frontPpsName(frontWorkPlan != null ? processSetMap.get(frontWorkPlan.getPpsId()).getName() : null)
                 .wpId(prWorkPlan.getId())
                 .makeQty(prWorkOrder.getMakeQty())
                 .orders(prWorkPlan.getOrders())