From 888943d593f30248cd9183a00149edda60df261b Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 19 May 2026 16:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/service/impl/WorkOrderServiceImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index 100cacd65..0ab87afec 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -1382,7 +1382,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         }
                     }
                 }
-                planMap.put(order.getId(), workPlanList);
+                if(CollectionUtils.isNotEmpty(workPlanList)){
+                    planMap.put(order.getId(), workPlanList);
+                }
 
             }
 
@@ -2033,7 +2035,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         .eq(PersonAbilityEntity::getWorkCenterId,craft.getWorkCenterId())
                         .eq(PersonAbilityEntity::getCraftId,craft.getCaId())
                         .eq(PersonAbilityEntity::getProcessId,craft.getPpsId()));
-                personTime = Double.parseDouble(personAbility.getStandardTime()) * qty + personAbility.getPrepareTime().doubleValue();
+                personTime = Double.parseDouble(personAbility.getStandardTime()) * qty + (personAbility.getPrepareTime() == null ? 0 : personAbility.getPrepareTime().doubleValue());
             }
         }
         return Math.ceil(personTime);