生产管理修改

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())
+                .frontOrders(frontWorkPlan != null ? frontWorkPlan.getOrders() : null)
-                .frontPpsName(processSetMap.get(frontWorkPlan.getPpsId()).getName())
+                .frontPpsName(frontWorkPlan != null ? processSetMap.get(frontWorkPlan.getPpsId()).getName() : null)
                 .wpId(prWorkPlan.getId())
                 .makeQty(prWorkOrder.getMakeQty())
                 .orders(prWorkPlan.getOrders())