From 191b8ae5c768fbb97c7cdea87edde77d0a10e7da Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:41 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
index dcb1503..587aa42 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.Hashtable;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
@@ -151,10 +152,14 @@
if (line.getProductivityModel().equals(productivityModel_monopolize)) {
line.setRouteTime(line.getDesignCapacity().multiply(require.getNetRequirement()));
}
- // 绱姞璺嚎鏃堕棿鍒版�诲伐鏃朵腑
- totalRouteTime.add(line.getRouteTime());
+
});
+ // 绱姞璺嚎鏃堕棿鍒版�诲伐鏃朵腑
+ totalRouteTime = apsStandardProcessRouteLines.stream()
+ .map(ApsStandardProcessRouteLine::getRouteTime)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
}
+
ret.setRouteTime(totalRouteTime);
ret.setRouteId(routeHeader.getRouteId());
}else {
--
Gitblit v1.9.3