修改速度计算

src/main/java/com/aps/service/impl/LanuchServiceImpl.java

@@ -557,10 +557,10 @@ public class LanuchServiceImpl implements LanuchService {
 
 
         prodProcessExec.setSpeed(
-                Optional.ofNullable(detail.getSingleOut())
-                        .filter(out -> detail.getRuntime() != null)
-                        .filter(out -> detail.getRuntime().compareTo(BigDecimal.ZERO) != 0)
-                        .map(out -> out.divide(detail.getRuntime(), 6, RoundingMode.HALF_UP))
+                Optional.ofNullable(detail.getRuntime())
+                        .filter(out -> detail.getSingleOut() != null)
+                        .filter(out -> detail.getSingleOut().compareTo(BigDecimal.ZERO) != 0)
+                        .map(out -> out.divide(detail.getSingleOut(), 6, RoundingMode.HALF_UP))
                         .map(BigDecimal::doubleValue)  // 关键转换
                         .orElse(0.0)
         );
@@ -762,12 +762,18 @@ public class LanuchServiceImpl implements LanuchService {
             prodEquipment.setEquipName(routingDetailEquip.getName());
             prodEquipment.setResourceId(routingDetailEquip.getType1());
 
-            double duration = routingDetailEquip.getDuration() != null ? routingDetailEquip.getDuration().doubleValue() : 0.0;
-            double outputQuantity = routingDetailEquip.getOutputQuantity() != null ? routingDetailEquip.getOutputQuantity().doubleValue() : 0.0;
-            double speed = (outputQuantity > 0) ? duration / outputQuantity : 0.0;
-            prodEquipment.setSpeed(speed);
-            // 从映射中获取execId，避免额外的数据库查询
-            // 修复：使用equals比较，并处理null值
+
+
+            prodEquipment.setSpeed(
+                    Optional.ofNullable(routingDetailEquip.getDuration())
+                            .filter(out -> routingDetailEquip.getOutputQuantity() != null)
+                            .filter(out -> routingDetailEquip.getOutputQuantity().compareTo(BigDecimal.ZERO) != 0)
+                            .map(out -> out.divide(routingDetailEquip.getOutputQuantity(), 6, RoundingMode.HALF_UP))
+                            .map(BigDecimal::doubleValue)  // 关键转换
+                            .orElse(0.0)
+            );
+
+
             String execId = processExecList.stream()
                     .filter(exec -> {
                         Long execRoutingDetailId = exec.getRoutingDetailId();