Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

hongjli

2025-05-14 c357f8844e03627d0c3bea4bf2058e7c69ff3518

 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());
                /*存储至Redis*/
                redisTemplate.opsForValue().set(key, standardTime);
            }else {
                saveRequireError(require,"标准工艺路线不存在");
            }
            return ret;
        }