功能修改-sjx

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);