From 45533a6272083948c6a19e453ca7fa5ed05b8c94 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 14 五月 2025 10:18:19 +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 | 5 ++++-
1 files changed, 4 insertions(+), 1 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 4d1b4ec..f3dfd22 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
@@ -166,7 +166,8 @@
Object routeHeaderObj = redisTemplate.opsForValue().get(key);
if (routeHeaderObj != null) {
totalRouteTime = (BigDecimal) routeHeaderObj;
- ret.setRouteTime(totalRouteTime);
+ ret.setRouteId("0");
+ ret.setRouteTime(totalRouteTime.multiply(netRequirement));
return ret;
} else {
// 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅
@@ -184,6 +185,8 @@
ret.setRouteId(routeHeader.getRouteId());
/*瀛樺偍鑷砇edis*/
redisTemplate.opsForValue().set(key, standardTime);
+ }else {
+ saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
}
return ret;
}
--
Gitblit v1.9.3