From 51aeb12b0bd3030931b22c666b9c83e7ee51c800 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 17:18:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 25 +++----------------------
1 files changed, 3 insertions(+), 22 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..d0d3b21 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;
@@ -115,8 +116,6 @@
*/
@Override
public ApsStandardProcessRouteLine getRouteLineTotalTime(ApsPlateStandardRequire require) {
- // 瀹氫箟鐙崰鐢熶骇妯″紡甯搁噺
- String productivityModel_monopolize = "鐙崰";
// 鍒濆鍖栨�诲伐鏃朵负0
BigDecimal totalRouteTime = BigDecimal.ZERO;
//宸ュ巶
@@ -127,7 +126,6 @@
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()) {
@@ -135,26 +133,9 @@
// 鏋勫缓宸ヨ壓璺嚎琛屽弬鏁板璞�
ApsStandardProcessRouteLine routeLineParam =new ApsStandardProcessRouteLine();
routeLineParam.setRouteId(routeHeader.getRouteId());
-
// 鏌ヨ鏍囧噯宸ヨ壓璺嚎琛屼俊鎭�
- List<ApsStandardProcessRouteLine> apsStandardProcessRouteLines = apsStandardProcessRouteLineMapper.selectApsStandardProcessRouteLineList(routeLineParam);
- /*宸ヨ壓璺嚎Line 鎬诲伐鏃�*/
-
- if(apsStandardProcessRouteLines.isEmpty()){
- saveRequireError(require,"宸ュ簭涓嶅瓨鍦�");
- }else {
- // 閬嶅巻姣忎釜宸ヨ壓璺嚎琛�
- apsStandardProcessRouteLines.forEach(line -> {
- // 榛樿灏嗚璁′骇鑳借缃负璺嚎鏃堕棿
- line.setRouteTime(line.getDesignCapacity());
- // 濡傛灉鐢熶骇妯″紡涓虹嫭鍗狅紝鍒欒矾绾挎椂闂翠负璁捐浜ц兘涔樹互鍑�闇�姹傞噺
- if (line.getProductivityModel().equals(productivityModel_monopolize)) {
- line.setRouteTime(line.getDesignCapacity().multiply(require.getNetRequirement()));
- }
- // 绱姞璺嚎鏃堕棿鍒版�诲伐鏃朵腑
- totalRouteTime.add(line.getRouteTime());
- });
- }
+ BigDecimal standardTime = apsStandardProcessRouteLineMapper.selectTotalStandTime(routeHeader.getRouteId()).getStandardTime();
+ totalRouteTime =standardTime.multiply(require.getNetRequirement());
ret.setRouteTime(totalRouteTime);
ret.setRouteId(routeHeader.getRouteId());
}else {
--
Gitblit v1.9.3