From bc65a54cfec5507ec53cb389b09f7def6fff0f9b Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 20 五月 2025 16:42:32 +0800
Subject: [PATCH] 标准焊缝数据数据查询接口
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..b9b2ac3 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
@@ -7,8 +7,8 @@
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;
-import com.aps.core.domain.ApsPlateStandardRequireError;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
import com.aps.core.domain.ApsStandardProcessRouteHeader;
import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper;
import com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper;
@@ -166,10 +166,12 @@
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 {
- // 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅
+ saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
+ /*// 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅
Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemCode).stream().findFirst();
if (firstProcessRoute.isPresent()) {
ApsStandardProcessRouteHeader routeHeader = firstProcessRoute.get();
@@ -182,9 +184,11 @@
// 璁＄畻杩斿洖鐨勬暟鎹�
ret.setRouteTime(totalRouteTime);
ret.setRouteId(routeHeader.getRouteId());
- /*瀛樺偍鑷砇edis*/
+ *//*瀛樺偍鑷砇edis*//*
redisTemplate.opsForValue().set(key, standardTime);
- }
+ }else {
+ saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
+ }*/
return ret;
}
}
--
Gitblit v1.9.3