From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 d49ca13..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,7 +4,9 @@
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;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsPlateStandardRequire;
@@ -123,18 +125,18 @@
// 鐗╂枡鍙�
String itemNumber=require.getBomLineCode();
long routId=0L;
- ApsStandardProcessRouteLine ret=ApsStandardProcessRouteLine.builder()
- .routeId(String.valueOf(routId))
- .routeTime(BigDecimal.ZERO)
- .build();
+ ApsStandardProcessRouteLine ret=new ApsStandardProcessRouteLine();
+ ret.setRouteId(String.valueOf(routId));
+ ret.setRouteTime(BigDecimal.ZERO);
+
// 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅
Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemNumber).stream().findFirst();
if (firstProcessRoute.isPresent()) {
ApsStandardProcessRouteHeader routeHeader = firstProcessRoute.get();
// 鏋勫缓宸ヨ壓璺嚎琛屽弬鏁板璞�
- ApsStandardProcessRouteLine routeLineParam = ApsStandardProcessRouteLine.builder()
- .routeId(routeHeader.getRouteId())
- .build();
+ ApsStandardProcessRouteLine routeLineParam =new ApsStandardProcessRouteLine();
+ routeLineParam.setRouteId(routeHeader.getRouteId());
+
// 鏌ヨ鏍囧噯宸ヨ壓璺嚎琛屼俊鎭�
List<ApsStandardProcessRouteLine> apsStandardProcessRouteLines = apsStandardProcessRouteLineMapper.selectApsStandardProcessRouteLineList(routeLineParam);
/*宸ヨ壓璺嚎Line 鎬诲伐鏃�*/
@@ -150,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 {
@@ -165,6 +171,7 @@
private void saveRequireError(ApsPlateStandardRequire require,String message) {
ApsPlateStandardRequireError data = ApsPlateStandardRequireError.builder()
+ .id(IdUtil.getSnowflakeNextId())
.requireId(require.getId())
.batchNumber(require.getBatchNumber())
.docNum(require.getDocNum())
--
Gitblit v1.9.3